Tofino compiled output with SPGW fix

Change-Id: I4974e464c654eb3f6cf5392eaa52cae22d167f0b
diff --git a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/context.json b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/context.json
index 6de94c1..71f34b0 100644
--- a/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/context.json
+++ b/pipelines/fabric-pro/src/main/resources/p4c-out/tofino/fabric/montana/context.json
@@ -1,5 +1,5 @@
 {
-  "build_date": "02/01/18 21:22:14",
+  "build_date": "02/04/18 01:26:22",
   "compiler_version": "6.0.0-alpha.4",
   "program_name": "main",
   "learn_quanta": [],
@@ -46,7 +46,7 @@
           "phv_number": 2,
           "records": [
             {
-              "position_offset": 80,
+              "position_offset": 78,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -63,7 +63,7 @@
           "phv_number": 3,
           "records": [
             {
-              "position_offset": 68,
+              "position_offset": 66,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -131,7 +131,7 @@
           "phv_number": 66,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 3,
               "field_lsb": 0,
@@ -142,7 +142,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 92,
+              "position_offset": 90,
               "field_name": "mpls.tc",
               "field_msb": 7,
               "field_lsb": 0,
@@ -153,7 +153,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 89,
+              "position_offset": 87,
               "field_name": "mpls.bos",
               "field_msb": 7,
               "field_lsb": 0,
@@ -187,7 +187,7 @@
           "phv_number": 68,
           "records": [
             {
-              "position_offset": 86,
+              "position_offset": 84,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -204,7 +204,7 @@
           "phv_number": 69,
           "records": [
             {
-              "position_offset": 93,
+              "position_offset": 91,
               "field_name": "mpls.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -329,7 +329,7 @@
               "pov_headers": [
                 {
                   "bit_index": 5,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -348,7 +348,7 @@
               "pov_headers": [
                 {
                   "bit_index": 6,
-                  "position_offset": 88,
+                  "position_offset": 86,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -367,7 +367,7 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 94,
+                  "position_offset": 92,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -403,7 +403,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 97,
+                  "position_offset": 95,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -422,7 +422,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 124,
+                  "position_offset": 122,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -441,7 +441,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 133,
+                  "position_offset": 131,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -455,23 +455,6 @@
           "records": [
             {
               "position_offset": 62,
-              "field_name": "ig_intr_md_for_tm.mcast_grp_a",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "records": [
-            {
-              "position_offset": 64,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -485,10 +468,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 130,
+          "phv_number": 129,
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -524,10 +507,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 131,
+          "phv_number": 130,
           "records": [
             {
-              "position_offset": 138,
+              "position_offset": 136,
               "field_name": "vlan_tag.pri",
               "field_msb": 15,
               "field_lsb": 0,
@@ -538,7 +521,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 134,
+              "position_offset": 132,
               "field_name": "vlan_tag.cfi",
               "field_msb": 15,
               "field_lsb": 0,
@@ -549,7 +532,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 140,
+              "position_offset": 138,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -563,10 +546,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 132,
+          "phv_number": 131,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 19,
               "field_lsb": 4,
@@ -580,7 +563,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 133,
+          "phv_number": 132,
           "records": [
             {
               "position_offset": 58,
@@ -597,7 +580,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 133,
           "records": [
             {
               "position_offset": 31,
@@ -614,7 +597,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 134,
           "records": [
             {
               "position_offset": 18,
@@ -631,10 +614,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 135,
           "records": [
             {
-              "position_offset": 136,
+              "position_offset": 134,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -648,7 +631,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 137,
+          "phv_number": 136,
           "records": [
             {
               "position_offset": 12,
@@ -665,7 +648,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 138,
+          "phv_number": 137,
           "records": [
             {
               "position_offset": 20,
@@ -682,7 +665,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 139,
+          "phv_number": 138,
           "records": [
             {
               "position_offset": 29,
@@ -699,7 +682,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "records": [
             {
               "position_offset": 37,
@@ -719,7 +702,7 @@
           "phv_number": 260,
           "records": [
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -747,7 +730,7 @@
           "phv_number": 261,
           "records": [
             {
-              "position_offset": 98,
+              "position_offset": 96,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -786,7 +769,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "ipv4.version",
               "field_msb": 7,
               "field_lsb": 0,
@@ -797,7 +780,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 78,
+              "position_offset": 76,
               "field_name": "ipv4.ihl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -825,7 +808,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "ipv4.diffserv",
               "field_msb": 7,
               "field_lsb": 0,
@@ -842,7 +825,7 @@
           "phv_number": 294,
           "records": [
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -870,7 +853,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -881,7 +864,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -892,7 +875,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -903,7 +886,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -914,7 +897,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 131,
+              "position_offset": 129,
               "field_name": "udp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -953,7 +936,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -964,7 +947,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "udp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1003,7 +986,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 72,
+              "position_offset": 70,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1014,7 +997,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 74,
+              "position_offset": 72,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1031,7 +1014,7 @@
           "phv_number": 329,
           "records": [
             {
-              "position_offset": 84,
+              "position_offset": 82,
               "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1048,7 +1031,7 @@
           "phv_number": 330,
           "records": [
             {
-              "position_offset": 76,
+              "position_offset": 74,
               "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1065,7 +1048,7 @@
           "phv_number": 331,
           "records": [
             {
-              "position_offset": 108,
+              "position_offset": 106,
               "field_name": "tcp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1076,7 +1059,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 129,
+              "position_offset": 127,
               "field_name": "udp.len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1104,7 +1087,7 @@
           "phv_number": 338,
           "records": [
             {
-              "position_offset": 122,
+              "position_offset": 120,
               "field_name": "tcp.window",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1115,7 +1098,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 125,
+              "position_offset": 123,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1132,7 +1115,7 @@
           "phv_number": 339,
           "records": [
             {
-              "position_offset": 102,
+              "position_offset": 100,
               "field_name": "tcp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -1149,7 +1132,7 @@
           "phv_number": 340,
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 15,
               "field_lsb": 0,
@@ -2198,7 +2181,7 @@
           "phv_number": 2,
           "records": [
             {
-              "position_offset": 80,
+              "position_offset": 78,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2215,7 +2198,7 @@
           "phv_number": 3,
           "records": [
             {
-              "position_offset": 68,
+              "position_offset": 66,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2283,7 +2266,7 @@
           "phv_number": 66,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 3,
               "field_lsb": 0,
@@ -2294,7 +2277,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 92,
+              "position_offset": 90,
               "field_name": "mpls.tc",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2305,7 +2288,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 89,
+              "position_offset": 87,
               "field_name": "mpls.bos",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2339,7 +2322,7 @@
           "phv_number": 68,
           "records": [
             {
-              "position_offset": 86,
+              "position_offset": 84,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2356,7 +2339,7 @@
           "phv_number": 69,
           "records": [
             {
-              "position_offset": 93,
+              "position_offset": 91,
               "field_name": "mpls.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2481,7 +2464,7 @@
               "pov_headers": [
                 {
                   "bit_index": 5,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -2500,7 +2483,7 @@
               "pov_headers": [
                 {
                   "bit_index": 6,
-                  "position_offset": 88,
+                  "position_offset": 86,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -2519,7 +2502,7 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 94,
+                  "position_offset": 92,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -2555,7 +2538,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 97,
+                  "position_offset": 95,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -2574,7 +2557,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 124,
+                  "position_offset": 122,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -2593,7 +2576,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 133,
+                  "position_offset": 131,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -2607,23 +2590,6 @@
           "records": [
             {
               "position_offset": 62,
-              "field_name": "ig_intr_md_for_tm.mcast_grp_a",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "records": [
-            {
-              "position_offset": 64,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -2637,10 +2603,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 130,
+          "phv_number": 129,
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -2676,10 +2642,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 131,
+          "phv_number": 130,
           "records": [
             {
-              "position_offset": 138,
+              "position_offset": 136,
               "field_name": "vlan_tag.pri",
               "field_msb": 15,
               "field_lsb": 0,
@@ -2690,7 +2656,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 134,
+              "position_offset": 132,
               "field_name": "vlan_tag.cfi",
               "field_msb": 15,
               "field_lsb": 0,
@@ -2701,7 +2667,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 140,
+              "position_offset": 138,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -2715,10 +2681,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 132,
+          "phv_number": 131,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 19,
               "field_lsb": 4,
@@ -2732,7 +2698,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 133,
+          "phv_number": 132,
           "records": [
             {
               "position_offset": 58,
@@ -2749,7 +2715,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 133,
           "records": [
             {
               "position_offset": 31,
@@ -2766,7 +2732,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 134,
           "records": [
             {
               "position_offset": 18,
@@ -2783,10 +2749,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 135,
           "records": [
             {
-              "position_offset": 136,
+              "position_offset": 134,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -2800,7 +2766,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 137,
+          "phv_number": 136,
           "records": [
             {
               "position_offset": 12,
@@ -2817,7 +2783,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 138,
+          "phv_number": 137,
           "records": [
             {
               "position_offset": 20,
@@ -2834,7 +2800,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 139,
+          "phv_number": 138,
           "records": [
             {
               "position_offset": 29,
@@ -2851,7 +2817,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "records": [
             {
               "position_offset": 37,
@@ -2871,7 +2837,7 @@
           "phv_number": 260,
           "records": [
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2899,7 +2865,7 @@
           "phv_number": 261,
           "records": [
             {
-              "position_offset": 98,
+              "position_offset": 96,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -2938,7 +2904,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "ipv4.version",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2949,7 +2915,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 78,
+              "position_offset": 76,
               "field_name": "ipv4.ihl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2977,7 +2943,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "ipv4.diffserv",
               "field_msb": 7,
               "field_lsb": 0,
@@ -2994,7 +2960,7 @@
           "phv_number": 294,
           "records": [
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -3022,7 +2988,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3033,7 +2999,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3044,7 +3010,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3055,7 +3021,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3066,7 +3032,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 131,
+              "position_offset": 129,
               "field_name": "udp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3105,7 +3071,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3116,7 +3082,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "udp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3155,7 +3121,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 72,
+              "position_offset": 70,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3166,7 +3132,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 74,
+              "position_offset": 72,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3183,7 +3149,7 @@
           "phv_number": 329,
           "records": [
             {
-              "position_offset": 84,
+              "position_offset": 82,
               "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3200,7 +3166,7 @@
           "phv_number": 330,
           "records": [
             {
-              "position_offset": 76,
+              "position_offset": 74,
               "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3217,7 +3183,7 @@
           "phv_number": 331,
           "records": [
             {
-              "position_offset": 108,
+              "position_offset": 106,
               "field_name": "tcp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3228,7 +3194,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 129,
+              "position_offset": 127,
               "field_name": "udp.len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3256,7 +3222,7 @@
           "phv_number": 338,
           "records": [
             {
-              "position_offset": 122,
+              "position_offset": 120,
               "field_name": "tcp.window",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3267,7 +3233,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 125,
+              "position_offset": 123,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3284,7 +3250,7 @@
           "phv_number": 339,
           "records": [
             {
-              "position_offset": 102,
+              "position_offset": 100,
               "field_name": "tcp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -3301,7 +3267,7 @@
           "phv_number": 340,
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4350,7 +4316,7 @@
           "phv_number": 2,
           "records": [
             {
-              "position_offset": 80,
+              "position_offset": 78,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4367,7 +4333,7 @@
           "phv_number": 3,
           "records": [
             {
-              "position_offset": 68,
+              "position_offset": 66,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -4435,7 +4401,7 @@
           "phv_number": 66,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 3,
               "field_lsb": 0,
@@ -4446,7 +4412,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 92,
+              "position_offset": 90,
               "field_name": "mpls.tc",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4457,7 +4423,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 89,
+              "position_offset": 87,
               "field_name": "mpls.bos",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4491,7 +4457,7 @@
           "phv_number": 68,
           "records": [
             {
-              "position_offset": 86,
+              "position_offset": 84,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4508,7 +4474,7 @@
           "phv_number": 69,
           "records": [
             {
-              "position_offset": 93,
+              "position_offset": 91,
               "field_name": "mpls.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -4633,7 +4599,7 @@
               "pov_headers": [
                 {
                   "bit_index": 5,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -4652,7 +4618,7 @@
               "pov_headers": [
                 {
                   "bit_index": 6,
-                  "position_offset": 88,
+                  "position_offset": 86,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -4671,7 +4637,7 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 94,
+                  "position_offset": 92,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -4707,7 +4673,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 97,
+                  "position_offset": 95,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -4726,7 +4692,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 124,
+                  "position_offset": 122,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -4745,7 +4711,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 133,
+                  "position_offset": 131,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -4759,23 +4725,6 @@
           "records": [
             {
               "position_offset": 62,
-              "field_name": "ig_intr_md_for_tm.mcast_grp_a",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "records": [
-            {
-              "position_offset": 64,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4789,10 +4738,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 130,
+          "phv_number": 129,
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4828,10 +4777,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 131,
+          "phv_number": 130,
           "records": [
             {
-              "position_offset": 138,
+              "position_offset": 136,
               "field_name": "vlan_tag.pri",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4842,7 +4791,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 134,
+              "position_offset": 132,
               "field_name": "vlan_tag.cfi",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4853,7 +4802,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 140,
+              "position_offset": 138,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4867,10 +4816,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 132,
+          "phv_number": 131,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 19,
               "field_lsb": 4,
@@ -4884,7 +4833,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 133,
+          "phv_number": 132,
           "records": [
             {
               "position_offset": 58,
@@ -4901,7 +4850,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 133,
           "records": [
             {
               "position_offset": 31,
@@ -4918,7 +4867,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 134,
           "records": [
             {
               "position_offset": 18,
@@ -4935,10 +4884,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 135,
           "records": [
             {
-              "position_offset": 136,
+              "position_offset": 134,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -4952,7 +4901,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 137,
+          "phv_number": 136,
           "records": [
             {
               "position_offset": 12,
@@ -4969,7 +4918,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 138,
+          "phv_number": 137,
           "records": [
             {
               "position_offset": 20,
@@ -4986,7 +4935,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 139,
+          "phv_number": 138,
           "records": [
             {
               "position_offset": 29,
@@ -5003,7 +4952,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "records": [
             {
               "position_offset": 37,
@@ -5023,7 +4972,7 @@
           "phv_number": 260,
           "records": [
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5051,7 +5000,7 @@
           "phv_number": 261,
           "records": [
             {
-              "position_offset": 98,
+              "position_offset": 96,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -5090,7 +5039,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "ipv4.version",
               "field_msb": 7,
               "field_lsb": 0,
@@ -5101,7 +5050,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 78,
+              "position_offset": 76,
               "field_name": "ipv4.ihl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -5129,7 +5078,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "ipv4.diffserv",
               "field_msb": 7,
               "field_lsb": 0,
@@ -5146,7 +5095,7 @@
           "phv_number": 294,
           "records": [
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -5174,7 +5123,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5185,7 +5134,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5196,7 +5145,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5207,7 +5156,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5218,7 +5167,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 131,
+              "position_offset": 129,
               "field_name": "udp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5257,7 +5206,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5268,7 +5217,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "udp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5307,7 +5256,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 72,
+              "position_offset": 70,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5318,7 +5267,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 74,
+              "position_offset": 72,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5335,7 +5284,7 @@
           "phv_number": 329,
           "records": [
             {
-              "position_offset": 84,
+              "position_offset": 82,
               "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5352,7 +5301,7 @@
           "phv_number": 330,
           "records": [
             {
-              "position_offset": 76,
+              "position_offset": 74,
               "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5369,7 +5318,7 @@
           "phv_number": 331,
           "records": [
             {
-              "position_offset": 108,
+              "position_offset": 106,
               "field_name": "tcp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5380,7 +5329,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 129,
+              "position_offset": 127,
               "field_name": "udp.len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5408,7 +5357,7 @@
           "phv_number": 338,
           "records": [
             {
-              "position_offset": 122,
+              "position_offset": 120,
               "field_name": "tcp.window",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5419,7 +5368,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 125,
+              "position_offset": 123,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5436,7 +5385,7 @@
           "phv_number": 339,
           "records": [
             {
-              "position_offset": 102,
+              "position_offset": 100,
               "field_name": "tcp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -5453,7 +5402,7 @@
           "phv_number": 340,
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 15,
               "field_lsb": 0,
@@ -6502,7 +6451,7 @@
           "phv_number": 2,
           "records": [
             {
-              "position_offset": 80,
+              "position_offset": 78,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6519,7 +6468,7 @@
           "phv_number": 3,
           "records": [
             {
-              "position_offset": 68,
+              "position_offset": 66,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -6587,7 +6536,7 @@
           "phv_number": 66,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 3,
               "field_lsb": 0,
@@ -6598,7 +6547,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 92,
+              "position_offset": 90,
               "field_name": "mpls.tc",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6609,7 +6558,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 89,
+              "position_offset": 87,
               "field_name": "mpls.bos",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6643,7 +6592,7 @@
           "phv_number": 68,
           "records": [
             {
-              "position_offset": 86,
+              "position_offset": 84,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6660,7 +6609,7 @@
           "phv_number": 69,
           "records": [
             {
-              "position_offset": 93,
+              "position_offset": 91,
               "field_name": "mpls.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -6785,7 +6734,7 @@
               "pov_headers": [
                 {
                   "bit_index": 5,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -6804,7 +6753,7 @@
               "pov_headers": [
                 {
                   "bit_index": 6,
-                  "position_offset": 88,
+                  "position_offset": 86,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -6823,7 +6772,7 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 94,
+                  "position_offset": 92,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -6859,7 +6808,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 97,
+                  "position_offset": 95,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -6878,7 +6827,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 124,
+                  "position_offset": 122,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -6897,7 +6846,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 133,
+                  "position_offset": 131,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -6911,23 +6860,6 @@
           "records": [
             {
               "position_offset": 62,
-              "field_name": "ig_intr_md_for_tm.mcast_grp_a",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "records": [
-            {
-              "position_offset": 64,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -6941,10 +6873,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 130,
+          "phv_number": 129,
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -6980,10 +6912,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 131,
+          "phv_number": 130,
           "records": [
             {
-              "position_offset": 138,
+              "position_offset": 136,
               "field_name": "vlan_tag.pri",
               "field_msb": 15,
               "field_lsb": 0,
@@ -6994,7 +6926,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 134,
+              "position_offset": 132,
               "field_name": "vlan_tag.cfi",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7005,7 +6937,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 140,
+              "position_offset": 138,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7019,10 +6951,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 132,
+          "phv_number": 131,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 19,
               "field_lsb": 4,
@@ -7036,7 +6968,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 133,
+          "phv_number": 132,
           "records": [
             {
               "position_offset": 58,
@@ -7053,7 +6985,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 133,
           "records": [
             {
               "position_offset": 31,
@@ -7070,7 +7002,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 134,
           "records": [
             {
               "position_offset": 18,
@@ -7087,10 +7019,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 135,
           "records": [
             {
-              "position_offset": 136,
+              "position_offset": 134,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7104,7 +7036,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 137,
+          "phv_number": 136,
           "records": [
             {
               "position_offset": 12,
@@ -7121,7 +7053,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 138,
+          "phv_number": 137,
           "records": [
             {
               "position_offset": 20,
@@ -7138,7 +7070,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 139,
+          "phv_number": 138,
           "records": [
             {
               "position_offset": 29,
@@ -7155,7 +7087,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "records": [
             {
               "position_offset": 37,
@@ -7175,7 +7107,7 @@
           "phv_number": 260,
           "records": [
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -7203,7 +7135,7 @@
           "phv_number": 261,
           "records": [
             {
-              "position_offset": 98,
+              "position_offset": 96,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -7242,7 +7174,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "ipv4.version",
               "field_msb": 7,
               "field_lsb": 0,
@@ -7253,7 +7185,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 78,
+              "position_offset": 76,
               "field_name": "ipv4.ihl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -7281,7 +7213,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "ipv4.diffserv",
               "field_msb": 7,
               "field_lsb": 0,
@@ -7298,7 +7230,7 @@
           "phv_number": 294,
           "records": [
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -7326,7 +7258,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7337,7 +7269,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7348,7 +7280,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7359,7 +7291,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7370,7 +7302,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 131,
+              "position_offset": 129,
               "field_name": "udp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7409,7 +7341,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7420,7 +7352,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "udp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7459,7 +7391,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 72,
+              "position_offset": 70,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7470,7 +7402,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 74,
+              "position_offset": 72,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7487,7 +7419,7 @@
           "phv_number": 329,
           "records": [
             {
-              "position_offset": 84,
+              "position_offset": 82,
               "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7504,7 +7436,7 @@
           "phv_number": 330,
           "records": [
             {
-              "position_offset": 76,
+              "position_offset": 74,
               "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7521,7 +7453,7 @@
           "phv_number": 331,
           "records": [
             {
-              "position_offset": 108,
+              "position_offset": 106,
               "field_name": "tcp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7532,7 +7464,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 129,
+              "position_offset": 127,
               "field_name": "udp.len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7560,7 +7492,7 @@
           "phv_number": 338,
           "records": [
             {
-              "position_offset": 122,
+              "position_offset": 120,
               "field_name": "tcp.window",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7571,7 +7503,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 125,
+              "position_offset": 123,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7588,7 +7520,7 @@
           "phv_number": 339,
           "records": [
             {
-              "position_offset": 102,
+              "position_offset": 100,
               "field_name": "tcp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -7605,7 +7537,7 @@
           "phv_number": 340,
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 15,
               "field_lsb": 0,
@@ -8654,7 +8586,7 @@
           "phv_number": 2,
           "records": [
             {
-              "position_offset": 80,
+              "position_offset": 78,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8671,7 +8603,7 @@
           "phv_number": 3,
           "records": [
             {
-              "position_offset": 68,
+              "position_offset": 66,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -8739,7 +8671,7 @@
           "phv_number": 66,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 3,
               "field_lsb": 0,
@@ -8750,7 +8682,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 92,
+              "position_offset": 90,
               "field_name": "mpls.tc",
               "field_msb": 7,
               "field_lsb": 0,
@@ -8761,7 +8693,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 89,
+              "position_offset": 87,
               "field_name": "mpls.bos",
               "field_msb": 7,
               "field_lsb": 0,
@@ -8795,7 +8727,7 @@
           "phv_number": 68,
           "records": [
             {
-              "position_offset": 86,
+              "position_offset": 84,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -8812,7 +8744,7 @@
           "phv_number": 69,
           "records": [
             {
-              "position_offset": 93,
+              "position_offset": 91,
               "field_name": "mpls.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -8937,7 +8869,7 @@
               "pov_headers": [
                 {
                   "bit_index": 5,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -8956,7 +8888,7 @@
               "pov_headers": [
                 {
                   "bit_index": 6,
-                  "position_offset": 88,
+                  "position_offset": 86,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -8975,7 +8907,7 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 94,
+                  "position_offset": 92,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -9011,7 +8943,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 97,
+                  "position_offset": 95,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -9030,7 +8962,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 124,
+                  "position_offset": 122,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -9049,7 +8981,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 133,
+                  "position_offset": 131,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -9063,23 +8995,6 @@
           "records": [
             {
               "position_offset": 62,
-              "field_name": "ig_intr_md_for_tm.mcast_grp_a",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "records": [
-            {
-              "position_offset": 64,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9093,10 +9008,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 130,
+          "phv_number": 129,
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9132,10 +9047,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 131,
+          "phv_number": 130,
           "records": [
             {
-              "position_offset": 138,
+              "position_offset": 136,
               "field_name": "vlan_tag.pri",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9146,7 +9061,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 134,
+              "position_offset": 132,
               "field_name": "vlan_tag.cfi",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9157,7 +9072,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 140,
+              "position_offset": 138,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9171,10 +9086,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 132,
+          "phv_number": 131,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 19,
               "field_lsb": 4,
@@ -9188,7 +9103,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 133,
+          "phv_number": 132,
           "records": [
             {
               "position_offset": 58,
@@ -9205,7 +9120,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 133,
           "records": [
             {
               "position_offset": 31,
@@ -9222,7 +9137,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 134,
           "records": [
             {
               "position_offset": 18,
@@ -9239,10 +9154,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 135,
           "records": [
             {
-              "position_offset": 136,
+              "position_offset": 134,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9256,7 +9171,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 137,
+          "phv_number": 136,
           "records": [
             {
               "position_offset": 12,
@@ -9273,7 +9188,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 138,
+          "phv_number": 137,
           "records": [
             {
               "position_offset": 20,
@@ -9290,7 +9205,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 139,
+          "phv_number": 138,
           "records": [
             {
               "position_offset": 29,
@@ -9307,7 +9222,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "records": [
             {
               "position_offset": 37,
@@ -9327,7 +9242,7 @@
           "phv_number": 260,
           "records": [
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9355,7 +9270,7 @@
           "phv_number": 261,
           "records": [
             {
-              "position_offset": 98,
+              "position_offset": 96,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -9394,7 +9309,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "ipv4.version",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9405,7 +9320,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 78,
+              "position_offset": 76,
               "field_name": "ipv4.ihl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9433,7 +9348,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "ipv4.diffserv",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9450,7 +9365,7 @@
           "phv_number": 294,
           "records": [
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -9478,7 +9393,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9489,7 +9404,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9500,7 +9415,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9511,7 +9426,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9522,7 +9437,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 131,
+              "position_offset": 129,
               "field_name": "udp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9561,7 +9476,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9572,7 +9487,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "udp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9611,7 +9526,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 72,
+              "position_offset": 70,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9622,7 +9537,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 74,
+              "position_offset": 72,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9639,7 +9554,7 @@
           "phv_number": 329,
           "records": [
             {
-              "position_offset": 84,
+              "position_offset": 82,
               "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9656,7 +9571,7 @@
           "phv_number": 330,
           "records": [
             {
-              "position_offset": 76,
+              "position_offset": 74,
               "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9673,7 +9588,7 @@
           "phv_number": 331,
           "records": [
             {
-              "position_offset": 108,
+              "position_offset": 106,
               "field_name": "tcp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9684,7 +9599,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 129,
+              "position_offset": 127,
               "field_name": "udp.len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9712,7 +9627,7 @@
           "phv_number": 338,
           "records": [
             {
-              "position_offset": 122,
+              "position_offset": 120,
               "field_name": "tcp.window",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9723,7 +9638,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 125,
+              "position_offset": 123,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9740,7 +9655,7 @@
           "phv_number": 339,
           "records": [
             {
-              "position_offset": 102,
+              "position_offset": 100,
               "field_name": "tcp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -9757,7 +9672,7 @@
           "phv_number": 340,
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 15,
               "field_lsb": 0,
@@ -10806,7 +10721,7 @@
           "phv_number": 2,
           "records": [
             {
-              "position_offset": 80,
+              "position_offset": 78,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10823,7 +10738,7 @@
           "phv_number": 3,
           "records": [
             {
-              "position_offset": 68,
+              "position_offset": 66,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -10891,7 +10806,7 @@
           "phv_number": 66,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 3,
               "field_lsb": 0,
@@ -10902,7 +10817,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 92,
+              "position_offset": 90,
               "field_name": "mpls.tc",
               "field_msb": 7,
               "field_lsb": 0,
@@ -10913,7 +10828,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 89,
+              "position_offset": 87,
               "field_name": "mpls.bos",
               "field_msb": 7,
               "field_lsb": 0,
@@ -10947,7 +10862,7 @@
           "phv_number": 68,
           "records": [
             {
-              "position_offset": 86,
+              "position_offset": 84,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -10964,7 +10879,7 @@
           "phv_number": 69,
           "records": [
             {
-              "position_offset": 93,
+              "position_offset": 91,
               "field_name": "mpls.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11089,7 +11004,7 @@
               "pov_headers": [
                 {
                   "bit_index": 5,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -11108,7 +11023,7 @@
               "pov_headers": [
                 {
                   "bit_index": 6,
-                  "position_offset": 88,
+                  "position_offset": 86,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -11127,7 +11042,7 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 94,
+                  "position_offset": 92,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -11163,7 +11078,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 97,
+                  "position_offset": 95,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -11182,7 +11097,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 124,
+                  "position_offset": 122,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -11201,7 +11116,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 133,
+                  "position_offset": 131,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -11215,23 +11130,6 @@
           "records": [
             {
               "position_offset": 62,
-              "field_name": "ig_intr_md_for_tm.mcast_grp_a",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "records": [
-            {
-              "position_offset": 64,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11245,10 +11143,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 130,
+          "phv_number": 129,
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11284,10 +11182,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 131,
+          "phv_number": 130,
           "records": [
             {
-              "position_offset": 138,
+              "position_offset": 136,
               "field_name": "vlan_tag.pri",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11298,7 +11196,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 134,
+              "position_offset": 132,
               "field_name": "vlan_tag.cfi",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11309,7 +11207,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 140,
+              "position_offset": 138,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11323,10 +11221,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 132,
+          "phv_number": 131,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 19,
               "field_lsb": 4,
@@ -11340,7 +11238,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 133,
+          "phv_number": 132,
           "records": [
             {
               "position_offset": 58,
@@ -11357,7 +11255,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 133,
           "records": [
             {
               "position_offset": 31,
@@ -11374,7 +11272,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 134,
           "records": [
             {
               "position_offset": 18,
@@ -11391,10 +11289,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 135,
           "records": [
             {
-              "position_offset": 136,
+              "position_offset": 134,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11408,7 +11306,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 137,
+          "phv_number": 136,
           "records": [
             {
               "position_offset": 12,
@@ -11425,7 +11323,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 138,
+          "phv_number": 137,
           "records": [
             {
               "position_offset": 20,
@@ -11442,7 +11340,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 139,
+          "phv_number": 138,
           "records": [
             {
               "position_offset": 29,
@@ -11459,7 +11357,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "records": [
             {
               "position_offset": 37,
@@ -11479,7 +11377,7 @@
           "phv_number": 260,
           "records": [
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -11507,7 +11405,7 @@
           "phv_number": 261,
           "records": [
             {
-              "position_offset": 98,
+              "position_offset": 96,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -11546,7 +11444,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "ipv4.version",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11557,7 +11455,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 78,
+              "position_offset": 76,
               "field_name": "ipv4.ihl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11585,7 +11483,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "ipv4.diffserv",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11602,7 +11500,7 @@
           "phv_number": 294,
           "records": [
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -11630,7 +11528,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11641,7 +11539,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11652,7 +11550,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11663,7 +11561,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11674,7 +11572,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 131,
+              "position_offset": 129,
               "field_name": "udp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11713,7 +11611,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11724,7 +11622,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "udp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11763,7 +11661,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 72,
+              "position_offset": 70,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11774,7 +11672,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 74,
+              "position_offset": 72,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11791,7 +11689,7 @@
           "phv_number": 329,
           "records": [
             {
-              "position_offset": 84,
+              "position_offset": 82,
               "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11808,7 +11706,7 @@
           "phv_number": 330,
           "records": [
             {
-              "position_offset": 76,
+              "position_offset": 74,
               "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11825,7 +11723,7 @@
           "phv_number": 331,
           "records": [
             {
-              "position_offset": 108,
+              "position_offset": 106,
               "field_name": "tcp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11836,7 +11734,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 129,
+              "position_offset": 127,
               "field_name": "udp.len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11864,7 +11762,7 @@
           "phv_number": 338,
           "records": [
             {
-              "position_offset": 122,
+              "position_offset": 120,
               "field_name": "tcp.window",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11875,7 +11773,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 125,
+              "position_offset": 123,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11892,7 +11790,7 @@
           "phv_number": 339,
           "records": [
             {
-              "position_offset": 102,
+              "position_offset": 100,
               "field_name": "tcp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -11909,7 +11807,7 @@
           "phv_number": 340,
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 15,
               "field_lsb": 0,
@@ -12958,7 +12856,7 @@
           "phv_number": 2,
           "records": [
             {
-              "position_offset": 80,
+              "position_offset": 78,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -12975,7 +12873,7 @@
           "phv_number": 3,
           "records": [
             {
-              "position_offset": 68,
+              "position_offset": 66,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13043,7 +12941,7 @@
           "phv_number": 66,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 3,
               "field_lsb": 0,
@@ -13054,7 +12952,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 92,
+              "position_offset": 90,
               "field_name": "mpls.tc",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13065,7 +12963,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 89,
+              "position_offset": 87,
               "field_name": "mpls.bos",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13099,7 +12997,7 @@
           "phv_number": 68,
           "records": [
             {
-              "position_offset": 86,
+              "position_offset": 84,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13116,7 +13014,7 @@
           "phv_number": 69,
           "records": [
             {
-              "position_offset": 93,
+              "position_offset": 91,
               "field_name": "mpls.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13241,7 +13139,7 @@
               "pov_headers": [
                 {
                   "bit_index": 5,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -13260,7 +13158,7 @@
               "pov_headers": [
                 {
                   "bit_index": 6,
-                  "position_offset": 88,
+                  "position_offset": 86,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -13279,7 +13177,7 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 94,
+                  "position_offset": 92,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -13315,7 +13213,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 97,
+                  "position_offset": 95,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -13334,7 +13232,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 124,
+                  "position_offset": 122,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -13353,7 +13251,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 133,
+                  "position_offset": 131,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -13367,23 +13265,6 @@
           "records": [
             {
               "position_offset": 62,
-              "field_name": "ig_intr_md_for_tm.mcast_grp_a",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "records": [
-            {
-              "position_offset": 64,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13397,10 +13278,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 130,
+          "phv_number": 129,
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13436,10 +13317,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 131,
+          "phv_number": 130,
           "records": [
             {
-              "position_offset": 138,
+              "position_offset": 136,
               "field_name": "vlan_tag.pri",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13450,7 +13331,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 134,
+              "position_offset": 132,
               "field_name": "vlan_tag.cfi",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13461,7 +13342,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 140,
+              "position_offset": 138,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13475,10 +13356,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 132,
+          "phv_number": 131,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 19,
               "field_lsb": 4,
@@ -13492,7 +13373,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 133,
+          "phv_number": 132,
           "records": [
             {
               "position_offset": 58,
@@ -13509,7 +13390,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 133,
           "records": [
             {
               "position_offset": 31,
@@ -13526,7 +13407,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 134,
           "records": [
             {
               "position_offset": 18,
@@ -13543,10 +13424,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 135,
           "records": [
             {
-              "position_offset": 136,
+              "position_offset": 134,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13560,7 +13441,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 137,
+          "phv_number": 136,
           "records": [
             {
               "position_offset": 12,
@@ -13577,7 +13458,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 138,
+          "phv_number": 137,
           "records": [
             {
               "position_offset": 20,
@@ -13594,7 +13475,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 139,
+          "phv_number": 138,
           "records": [
             {
               "position_offset": 29,
@@ -13611,7 +13492,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "records": [
             {
               "position_offset": 37,
@@ -13631,7 +13512,7 @@
           "phv_number": 260,
           "records": [
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13659,7 +13540,7 @@
           "phv_number": 261,
           "records": [
             {
-              "position_offset": 98,
+              "position_offset": 96,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -13698,7 +13579,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "ipv4.version",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13709,7 +13590,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 78,
+              "position_offset": 76,
               "field_name": "ipv4.ihl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13737,7 +13618,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "ipv4.diffserv",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13754,7 +13635,7 @@
           "phv_number": 294,
           "records": [
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -13782,7 +13663,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13793,7 +13674,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13804,7 +13685,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13815,7 +13696,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13826,7 +13707,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 131,
+              "position_offset": 129,
               "field_name": "udp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13865,7 +13746,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13876,7 +13757,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "udp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13915,7 +13796,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 72,
+              "position_offset": 70,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13926,7 +13807,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 74,
+              "position_offset": 72,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13943,7 +13824,7 @@
           "phv_number": 329,
           "records": [
             {
-              "position_offset": 84,
+              "position_offset": 82,
               "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13960,7 +13841,7 @@
           "phv_number": 330,
           "records": [
             {
-              "position_offset": 76,
+              "position_offset": 74,
               "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13977,7 +13858,7 @@
           "phv_number": 331,
           "records": [
             {
-              "position_offset": 108,
+              "position_offset": 106,
               "field_name": "tcp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -13988,7 +13869,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 129,
+              "position_offset": 127,
               "field_name": "udp.len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14016,7 +13897,7 @@
           "phv_number": 338,
           "records": [
             {
-              "position_offset": 122,
+              "position_offset": 120,
               "field_name": "tcp.window",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14027,7 +13908,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 125,
+              "position_offset": 123,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14044,7 +13925,7 @@
           "phv_number": 339,
           "records": [
             {
-              "position_offset": 102,
+              "position_offset": 100,
               "field_name": "tcp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -14061,7 +13942,7 @@
           "phv_number": 340,
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 15,
               "field_lsb": 0,
@@ -15110,7 +14991,7 @@
           "phv_number": 2,
           "records": [
             {
-              "position_offset": 80,
+              "position_offset": 78,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15127,7 +15008,7 @@
           "phv_number": 3,
           "records": [
             {
-              "position_offset": 68,
+              "position_offset": 66,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15195,7 +15076,7 @@
           "phv_number": 66,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 3,
               "field_lsb": 0,
@@ -15206,7 +15087,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 92,
+              "position_offset": 90,
               "field_name": "mpls.tc",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15217,7 +15098,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 89,
+              "position_offset": 87,
               "field_name": "mpls.bos",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15251,7 +15132,7 @@
           "phv_number": 68,
           "records": [
             {
-              "position_offset": 86,
+              "position_offset": 84,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15268,7 +15149,7 @@
           "phv_number": 69,
           "records": [
             {
-              "position_offset": 93,
+              "position_offset": 91,
               "field_name": "mpls.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15393,7 +15274,7 @@
               "pov_headers": [
                 {
                   "bit_index": 5,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -15412,7 +15293,7 @@
               "pov_headers": [
                 {
                   "bit_index": 6,
-                  "position_offset": 88,
+                  "position_offset": 86,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -15431,7 +15312,7 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 94,
+                  "position_offset": 92,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -15467,7 +15348,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 97,
+                  "position_offset": 95,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -15486,7 +15367,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 124,
+                  "position_offset": 122,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -15505,7 +15386,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 133,
+                  "position_offset": 131,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -15519,23 +15400,6 @@
           "records": [
             {
               "position_offset": 62,
-              "field_name": "ig_intr_md_for_tm.mcast_grp_a",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "records": [
-            {
-              "position_offset": 64,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -15549,10 +15413,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 130,
+          "phv_number": 129,
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -15588,10 +15452,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 131,
+          "phv_number": 130,
           "records": [
             {
-              "position_offset": 138,
+              "position_offset": 136,
               "field_name": "vlan_tag.pri",
               "field_msb": 15,
               "field_lsb": 0,
@@ -15602,7 +15466,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 134,
+              "position_offset": 132,
               "field_name": "vlan_tag.cfi",
               "field_msb": 15,
               "field_lsb": 0,
@@ -15613,7 +15477,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 140,
+              "position_offset": 138,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -15627,10 +15491,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 132,
+          "phv_number": 131,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 19,
               "field_lsb": 4,
@@ -15644,7 +15508,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 133,
+          "phv_number": 132,
           "records": [
             {
               "position_offset": 58,
@@ -15661,7 +15525,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 133,
           "records": [
             {
               "position_offset": 31,
@@ -15678,7 +15542,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 134,
           "records": [
             {
               "position_offset": 18,
@@ -15695,10 +15559,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 135,
           "records": [
             {
-              "position_offset": 136,
+              "position_offset": 134,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -15712,7 +15576,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 137,
+          "phv_number": 136,
           "records": [
             {
               "position_offset": 12,
@@ -15729,7 +15593,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 138,
+          "phv_number": 137,
           "records": [
             {
               "position_offset": 20,
@@ -15746,7 +15610,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 139,
+          "phv_number": 138,
           "records": [
             {
               "position_offset": 29,
@@ -15763,7 +15627,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "records": [
             {
               "position_offset": 37,
@@ -15783,7 +15647,7 @@
           "phv_number": 260,
           "records": [
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15811,7 +15675,7 @@
           "phv_number": 261,
           "records": [
             {
-              "position_offset": 98,
+              "position_offset": 96,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -15850,7 +15714,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "ipv4.version",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15861,7 +15725,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 78,
+              "position_offset": 76,
               "field_name": "ipv4.ihl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15889,7 +15753,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "ipv4.diffserv",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15906,7 +15770,7 @@
           "phv_number": 294,
           "records": [
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -15934,7 +15798,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -15945,7 +15809,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -15956,7 +15820,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -15967,7 +15831,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -15978,7 +15842,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 131,
+              "position_offset": 129,
               "field_name": "udp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16017,7 +15881,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16028,7 +15892,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "udp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16067,7 +15931,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 72,
+              "position_offset": 70,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16078,7 +15942,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 74,
+              "position_offset": 72,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16095,7 +15959,7 @@
           "phv_number": 329,
           "records": [
             {
-              "position_offset": 84,
+              "position_offset": 82,
               "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16112,7 +15976,7 @@
           "phv_number": 330,
           "records": [
             {
-              "position_offset": 76,
+              "position_offset": 74,
               "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16129,7 +15993,7 @@
           "phv_number": 331,
           "records": [
             {
-              "position_offset": 108,
+              "position_offset": 106,
               "field_name": "tcp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16140,7 +16004,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 129,
+              "position_offset": 127,
               "field_name": "udp.len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16168,7 +16032,7 @@
           "phv_number": 338,
           "records": [
             {
-              "position_offset": 122,
+              "position_offset": 120,
               "field_name": "tcp.window",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16179,7 +16043,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 125,
+              "position_offset": 123,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16196,7 +16060,7 @@
           "phv_number": 339,
           "records": [
             {
-              "position_offset": 102,
+              "position_offset": 100,
               "field_name": "tcp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -16213,7 +16077,7 @@
           "phv_number": 340,
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17262,7 +17126,7 @@
           "phv_number": 2,
           "records": [
             {
-              "position_offset": 80,
+              "position_offset": 78,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17279,7 +17143,7 @@
           "phv_number": 3,
           "records": [
             {
-              "position_offset": 68,
+              "position_offset": 66,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17347,7 +17211,7 @@
           "phv_number": 66,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 3,
               "field_lsb": 0,
@@ -17358,7 +17222,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 92,
+              "position_offset": 90,
               "field_name": "mpls.tc",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17369,7 +17233,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 89,
+              "position_offset": 87,
               "field_name": "mpls.bos",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17403,7 +17267,7 @@
           "phv_number": 68,
           "records": [
             {
-              "position_offset": 86,
+              "position_offset": 84,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17420,7 +17284,7 @@
           "phv_number": 69,
           "records": [
             {
-              "position_offset": 93,
+              "position_offset": 91,
               "field_name": "mpls.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -17545,7 +17409,7 @@
               "pov_headers": [
                 {
                   "bit_index": 5,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -17564,7 +17428,7 @@
               "pov_headers": [
                 {
                   "bit_index": 6,
-                  "position_offset": 88,
+                  "position_offset": 86,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -17583,7 +17447,7 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 94,
+                  "position_offset": 92,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -17619,7 +17483,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 97,
+                  "position_offset": 95,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -17638,7 +17502,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 124,
+                  "position_offset": 122,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -17657,7 +17521,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 133,
+                  "position_offset": 131,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -17671,23 +17535,6 @@
           "records": [
             {
               "position_offset": 62,
-              "field_name": "ig_intr_md_for_tm.mcast_grp_a",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "records": [
-            {
-              "position_offset": 64,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17701,10 +17548,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 130,
+          "phv_number": 129,
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17740,10 +17587,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 131,
+          "phv_number": 130,
           "records": [
             {
-              "position_offset": 138,
+              "position_offset": 136,
               "field_name": "vlan_tag.pri",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17754,7 +17601,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 134,
+              "position_offset": 132,
               "field_name": "vlan_tag.cfi",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17765,7 +17612,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 140,
+              "position_offset": 138,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17779,10 +17626,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 132,
+          "phv_number": 131,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 19,
               "field_lsb": 4,
@@ -17796,7 +17643,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 133,
+          "phv_number": 132,
           "records": [
             {
               "position_offset": 58,
@@ -17813,7 +17660,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 133,
           "records": [
             {
               "position_offset": 31,
@@ -17830,7 +17677,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 134,
           "records": [
             {
               "position_offset": 18,
@@ -17847,10 +17694,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 135,
           "records": [
             {
-              "position_offset": 136,
+              "position_offset": 134,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -17864,7 +17711,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 137,
+          "phv_number": 136,
           "records": [
             {
               "position_offset": 12,
@@ -17881,7 +17728,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 138,
+          "phv_number": 137,
           "records": [
             {
               "position_offset": 20,
@@ -17898,7 +17745,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 139,
+          "phv_number": 138,
           "records": [
             {
               "position_offset": 29,
@@ -17915,7 +17762,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "records": [
             {
               "position_offset": 37,
@@ -17935,7 +17782,7 @@
           "phv_number": 260,
           "records": [
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -17963,7 +17810,7 @@
           "phv_number": 261,
           "records": [
             {
-              "position_offset": 98,
+              "position_offset": 96,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -18002,7 +17849,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "ipv4.version",
               "field_msb": 7,
               "field_lsb": 0,
@@ -18013,7 +17860,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 78,
+              "position_offset": 76,
               "field_name": "ipv4.ihl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -18041,7 +17888,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "ipv4.diffserv",
               "field_msb": 7,
               "field_lsb": 0,
@@ -18058,7 +17905,7 @@
           "phv_number": 294,
           "records": [
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -18086,7 +17933,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18097,7 +17944,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18108,7 +17955,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18119,7 +17966,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18130,7 +17977,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 131,
+              "position_offset": 129,
               "field_name": "udp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18169,7 +18016,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18180,7 +18027,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "udp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18219,7 +18066,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 72,
+              "position_offset": 70,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18230,7 +18077,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 74,
+              "position_offset": 72,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18247,7 +18094,7 @@
           "phv_number": 329,
           "records": [
             {
-              "position_offset": 84,
+              "position_offset": 82,
               "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18264,7 +18111,7 @@
           "phv_number": 330,
           "records": [
             {
-              "position_offset": 76,
+              "position_offset": 74,
               "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18281,7 +18128,7 @@
           "phv_number": 331,
           "records": [
             {
-              "position_offset": 108,
+              "position_offset": 106,
               "field_name": "tcp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18292,7 +18139,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 129,
+              "position_offset": 127,
               "field_name": "udp.len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18320,7 +18167,7 @@
           "phv_number": 338,
           "records": [
             {
-              "position_offset": 122,
+              "position_offset": 120,
               "field_name": "tcp.window",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18331,7 +18178,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 125,
+              "position_offset": 123,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18348,7 +18195,7 @@
           "phv_number": 339,
           "records": [
             {
-              "position_offset": 102,
+              "position_offset": 100,
               "field_name": "tcp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -18365,7 +18212,7 @@
           "phv_number": 340,
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 15,
               "field_lsb": 0,
@@ -19414,7 +19261,7 @@
           "phv_number": 2,
           "records": [
             {
-              "position_offset": 80,
+              "position_offset": 78,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19431,7 +19278,7 @@
           "phv_number": 3,
           "records": [
             {
-              "position_offset": 68,
+              "position_offset": 66,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -19499,7 +19346,7 @@
           "phv_number": 66,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 3,
               "field_lsb": 0,
@@ -19510,7 +19357,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 92,
+              "position_offset": 90,
               "field_name": "mpls.tc",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19521,7 +19368,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 89,
+              "position_offset": 87,
               "field_name": "mpls.bos",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19555,7 +19402,7 @@
           "phv_number": 68,
           "records": [
             {
-              "position_offset": 86,
+              "position_offset": 84,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19572,7 +19419,7 @@
           "phv_number": 69,
           "records": [
             {
-              "position_offset": 93,
+              "position_offset": 91,
               "field_name": "mpls.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -19697,7 +19544,7 @@
               "pov_headers": [
                 {
                   "bit_index": 5,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -19716,7 +19563,7 @@
               "pov_headers": [
                 {
                   "bit_index": 6,
-                  "position_offset": 88,
+                  "position_offset": 86,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -19735,7 +19582,7 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 94,
+                  "position_offset": 92,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -19771,7 +19618,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 97,
+                  "position_offset": 95,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -19790,7 +19637,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 124,
+                  "position_offset": 122,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -19809,7 +19656,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 133,
+                  "position_offset": 131,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -19823,23 +19670,6 @@
           "records": [
             {
               "position_offset": 62,
-              "field_name": "ig_intr_md_for_tm.mcast_grp_a",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "records": [
-            {
-              "position_offset": 64,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -19853,10 +19683,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 130,
+          "phv_number": 129,
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -19892,10 +19722,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 131,
+          "phv_number": 130,
           "records": [
             {
-              "position_offset": 138,
+              "position_offset": 136,
               "field_name": "vlan_tag.pri",
               "field_msb": 15,
               "field_lsb": 0,
@@ -19906,7 +19736,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 134,
+              "position_offset": 132,
               "field_name": "vlan_tag.cfi",
               "field_msb": 15,
               "field_lsb": 0,
@@ -19917,7 +19747,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 140,
+              "position_offset": 138,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -19931,10 +19761,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 132,
+          "phv_number": 131,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 19,
               "field_lsb": 4,
@@ -19948,7 +19778,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 133,
+          "phv_number": 132,
           "records": [
             {
               "position_offset": 58,
@@ -19965,7 +19795,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 133,
           "records": [
             {
               "position_offset": 31,
@@ -19982,7 +19812,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 134,
           "records": [
             {
               "position_offset": 18,
@@ -19999,10 +19829,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 135,
           "records": [
             {
-              "position_offset": 136,
+              "position_offset": 134,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20016,7 +19846,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 137,
+          "phv_number": 136,
           "records": [
             {
               "position_offset": 12,
@@ -20033,7 +19863,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 138,
+          "phv_number": 137,
           "records": [
             {
               "position_offset": 20,
@@ -20050,7 +19880,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 139,
+          "phv_number": 138,
           "records": [
             {
               "position_offset": 29,
@@ -20067,7 +19897,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "records": [
             {
               "position_offset": 37,
@@ -20087,7 +19917,7 @@
           "phv_number": 260,
           "records": [
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -20115,7 +19945,7 @@
           "phv_number": 261,
           "records": [
             {
-              "position_offset": 98,
+              "position_offset": 96,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -20154,7 +19984,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "ipv4.version",
               "field_msb": 7,
               "field_lsb": 0,
@@ -20165,7 +19995,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 78,
+              "position_offset": 76,
               "field_name": "ipv4.ihl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -20193,7 +20023,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "ipv4.diffserv",
               "field_msb": 7,
               "field_lsb": 0,
@@ -20210,7 +20040,7 @@
           "phv_number": 294,
           "records": [
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -20238,7 +20068,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20249,7 +20079,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20260,7 +20090,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20271,7 +20101,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20282,7 +20112,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 131,
+              "position_offset": 129,
               "field_name": "udp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20321,7 +20151,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20332,7 +20162,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "udp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20371,7 +20201,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 72,
+              "position_offset": 70,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20382,7 +20212,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 74,
+              "position_offset": 72,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20399,7 +20229,7 @@
           "phv_number": 329,
           "records": [
             {
-              "position_offset": 84,
+              "position_offset": 82,
               "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20416,7 +20246,7 @@
           "phv_number": 330,
           "records": [
             {
-              "position_offset": 76,
+              "position_offset": 74,
               "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20433,7 +20263,7 @@
           "phv_number": 331,
           "records": [
             {
-              "position_offset": 108,
+              "position_offset": 106,
               "field_name": "tcp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20444,7 +20274,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 129,
+              "position_offset": 127,
               "field_name": "udp.len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20472,7 +20302,7 @@
           "phv_number": 338,
           "records": [
             {
-              "position_offset": 122,
+              "position_offset": 120,
               "field_name": "tcp.window",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20483,7 +20313,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 125,
+              "position_offset": 123,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20500,7 +20330,7 @@
           "phv_number": 339,
           "records": [
             {
-              "position_offset": 102,
+              "position_offset": 100,
               "field_name": "tcp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -20517,7 +20347,7 @@
           "phv_number": 340,
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 15,
               "field_lsb": 0,
@@ -21566,7 +21396,7 @@
           "phv_number": 2,
           "records": [
             {
-              "position_offset": 80,
+              "position_offset": 78,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21583,7 +21413,7 @@
           "phv_number": 3,
           "records": [
             {
-              "position_offset": 68,
+              "position_offset": 66,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -21651,7 +21481,7 @@
           "phv_number": 66,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 3,
               "field_lsb": 0,
@@ -21662,7 +21492,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 92,
+              "position_offset": 90,
               "field_name": "mpls.tc",
               "field_msb": 7,
               "field_lsb": 0,
@@ -21673,7 +21503,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 89,
+              "position_offset": 87,
               "field_name": "mpls.bos",
               "field_msb": 7,
               "field_lsb": 0,
@@ -21707,7 +21537,7 @@
           "phv_number": 68,
           "records": [
             {
-              "position_offset": 86,
+              "position_offset": 84,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -21724,7 +21554,7 @@
           "phv_number": 69,
           "records": [
             {
-              "position_offset": 93,
+              "position_offset": 91,
               "field_name": "mpls.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -21849,7 +21679,7 @@
               "pov_headers": [
                 {
                   "bit_index": 5,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -21868,7 +21698,7 @@
               "pov_headers": [
                 {
                   "bit_index": 6,
-                  "position_offset": 88,
+                  "position_offset": 86,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -21887,7 +21717,7 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 94,
+                  "position_offset": 92,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -21923,7 +21753,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 97,
+                  "position_offset": 95,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -21942,7 +21772,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 124,
+                  "position_offset": 122,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -21961,7 +21791,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 133,
+                  "position_offset": 131,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -21975,23 +21805,6 @@
           "records": [
             {
               "position_offset": 62,
-              "field_name": "ig_intr_md_for_tm.mcast_grp_a",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "records": [
-            {
-              "position_offset": 64,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22005,10 +21818,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 130,
+          "phv_number": 129,
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22044,10 +21857,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 131,
+          "phv_number": 130,
           "records": [
             {
-              "position_offset": 138,
+              "position_offset": 136,
               "field_name": "vlan_tag.pri",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22058,7 +21871,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 134,
+              "position_offset": 132,
               "field_name": "vlan_tag.cfi",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22069,7 +21882,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 140,
+              "position_offset": 138,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22083,10 +21896,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 132,
+          "phv_number": 131,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 19,
               "field_lsb": 4,
@@ -22100,7 +21913,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 133,
+          "phv_number": 132,
           "records": [
             {
               "position_offset": 58,
@@ -22117,7 +21930,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 133,
           "records": [
             {
               "position_offset": 31,
@@ -22134,7 +21947,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 134,
           "records": [
             {
               "position_offset": 18,
@@ -22151,10 +21964,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 135,
           "records": [
             {
-              "position_offset": 136,
+              "position_offset": 134,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22168,7 +21981,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 137,
+          "phv_number": 136,
           "records": [
             {
               "position_offset": 12,
@@ -22185,7 +21998,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 138,
+          "phv_number": 137,
           "records": [
             {
               "position_offset": 20,
@@ -22202,7 +22015,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 139,
+          "phv_number": 138,
           "records": [
             {
               "position_offset": 29,
@@ -22219,7 +22032,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "records": [
             {
               "position_offset": 37,
@@ -22239,7 +22052,7 @@
           "phv_number": 260,
           "records": [
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22267,7 +22080,7 @@
           "phv_number": 261,
           "records": [
             {
-              "position_offset": 98,
+              "position_offset": 96,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -22306,7 +22119,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "ipv4.version",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22317,7 +22130,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 78,
+              "position_offset": 76,
               "field_name": "ipv4.ihl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22345,7 +22158,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "ipv4.diffserv",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22362,7 +22175,7 @@
           "phv_number": 294,
           "records": [
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -22390,7 +22203,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22401,7 +22214,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22412,7 +22225,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22423,7 +22236,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22434,7 +22247,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 131,
+              "position_offset": 129,
               "field_name": "udp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22473,7 +22286,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22484,7 +22297,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "udp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22523,7 +22336,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 72,
+              "position_offset": 70,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22534,7 +22347,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 74,
+              "position_offset": 72,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22551,7 +22364,7 @@
           "phv_number": 329,
           "records": [
             {
-              "position_offset": 84,
+              "position_offset": 82,
               "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22568,7 +22381,7 @@
           "phv_number": 330,
           "records": [
             {
-              "position_offset": 76,
+              "position_offset": 74,
               "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22585,7 +22398,7 @@
           "phv_number": 331,
           "records": [
             {
-              "position_offset": 108,
+              "position_offset": 106,
               "field_name": "tcp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22596,7 +22409,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 129,
+              "position_offset": 127,
               "field_name": "udp.len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22624,7 +22437,7 @@
           "phv_number": 338,
           "records": [
             {
-              "position_offset": 122,
+              "position_offset": 120,
               "field_name": "tcp.window",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22635,7 +22448,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 125,
+              "position_offset": 123,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22652,7 +22465,7 @@
           "phv_number": 339,
           "records": [
             {
-              "position_offset": 102,
+              "position_offset": 100,
               "field_name": "tcp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -22669,7 +22482,7 @@
           "phv_number": 340,
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 15,
               "field_lsb": 0,
@@ -23718,7 +23531,7 @@
           "phv_number": 2,
           "records": [
             {
-              "position_offset": 80,
+              "position_offset": 78,
               "field_name": "ipv4.src_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23735,7 +23548,7 @@
           "phv_number": 3,
           "records": [
             {
-              "position_offset": 68,
+              "position_offset": 66,
               "field_name": "ipv4.dst_addr",
               "field_msb": 31,
               "field_lsb": 0,
@@ -23803,7 +23616,7 @@
           "phv_number": 66,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 3,
               "field_lsb": 0,
@@ -23814,7 +23627,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 92,
+              "position_offset": 90,
               "field_name": "mpls.tc",
               "field_msb": 7,
               "field_lsb": 0,
@@ -23825,7 +23638,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 89,
+              "position_offset": 87,
               "field_name": "mpls.bos",
               "field_msb": 7,
               "field_lsb": 0,
@@ -23859,7 +23672,7 @@
           "phv_number": 68,
           "records": [
             {
-              "position_offset": 86,
+              "position_offset": 84,
               "field_name": "ipv4.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -23876,7 +23689,7 @@
           "phv_number": 69,
           "records": [
             {
-              "position_offset": 93,
+              "position_offset": 91,
               "field_name": "mpls.ttl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24001,7 +23814,7 @@
               "pov_headers": [
                 {
                   "bit_index": 5,
-                  "position_offset": 66,
+                  "position_offset": 64,
                   "header_name": "ipv4",
                   "hidden": false
                 }
@@ -24020,7 +23833,7 @@
               "pov_headers": [
                 {
                   "bit_index": 6,
-                  "position_offset": 88,
+                  "position_offset": 86,
                   "header_name": "mpls",
                   "hidden": false
                 }
@@ -24039,7 +23852,7 @@
               "pov_headers": [
                 {
                   "bit_index": 7,
-                  "position_offset": 94,
+                  "position_offset": 92,
                   "header_name": "packet_out",
                   "hidden": false
                 }
@@ -24075,7 +23888,7 @@
               "pov_headers": [
                 {
                   "bit_index": 0,
-                  "position_offset": 97,
+                  "position_offset": 95,
                   "header_name": "tcp",
                   "hidden": false
                 }
@@ -24094,7 +23907,7 @@
               "pov_headers": [
                 {
                   "bit_index": 1,
-                  "position_offset": 124,
+                  "position_offset": 122,
                   "header_name": "udp",
                   "hidden": false
                 }
@@ -24113,7 +23926,7 @@
               "pov_headers": [
                 {
                   "bit_index": 2,
-                  "position_offset": 133,
+                  "position_offset": 131,
                   "header_name": "vlan_tag",
                   "hidden": false
                 }
@@ -24127,23 +23940,6 @@
           "records": [
             {
               "position_offset": 62,
-              "field_name": "ig_intr_md_for_tm.mcast_grp_a",
-              "field_msb": 15,
-              "field_lsb": 0,
-              "field_width": 2,
-              "phv_msb": 15,
-              "phv_lsb": 0,
-              "is_compiler_generated": false,
-              "is_pov": false
-            }
-          ],
-          "word_bit_width": 16
-        },
-        {
-          "phv_number": 129,
-          "records": [
-            {
-              "position_offset": 64,
               "field_name": "ig_intr_md_for_tm.ucast_egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24157,10 +23953,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 130,
+          "phv_number": 129,
           "records": [
             {
-              "position_offset": 95,
+              "position_offset": 93,
               "field_name": "packet_out.egress_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24196,10 +23992,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 131,
+          "phv_number": 130,
           "records": [
             {
-              "position_offset": 138,
+              "position_offset": 136,
               "field_name": "vlan_tag.pri",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24210,7 +24006,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 134,
+              "position_offset": 132,
               "field_name": "vlan_tag.cfi",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24221,7 +24017,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 140,
+              "position_offset": 138,
               "field_name": "vlan_tag.vlan_id",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24235,10 +24031,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 132,
+          "phv_number": 131,
           "records": [
             {
-              "position_offset": 90,
+              "position_offset": 88,
               "field_name": "mpls.label",
               "field_msb": 19,
               "field_lsb": 4,
@@ -24252,7 +24048,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 133,
+          "phv_number": 132,
           "records": [
             {
               "position_offset": 58,
@@ -24269,7 +24065,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 134,
+          "phv_number": 133,
           "records": [
             {
               "position_offset": 31,
@@ -24286,7 +24082,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 135,
+          "phv_number": 134,
           "records": [
             {
               "position_offset": 18,
@@ -24303,10 +24099,10 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 136,
+          "phv_number": 135,
           "records": [
             {
-              "position_offset": 136,
+              "position_offset": 134,
               "field_name": "vlan_tag.ether_type",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24320,7 +24116,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 137,
+          "phv_number": 136,
           "records": [
             {
               "position_offset": 12,
@@ -24337,7 +24133,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 138,
+          "phv_number": 137,
           "records": [
             {
               "position_offset": 20,
@@ -24354,7 +24150,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 139,
+          "phv_number": 138,
           "records": [
             {
               "position_offset": 29,
@@ -24371,7 +24167,7 @@
           "word_bit_width": 16
         },
         {
-          "phv_number": 140,
+          "phv_number": 139,
           "records": [
             {
               "position_offset": 37,
@@ -24391,7 +24187,7 @@
           "phv_number": 260,
           "records": [
             {
-              "position_offset": 114,
+              "position_offset": 112,
               "field_name": "tcp.seq_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -24419,7 +24215,7 @@
           "phv_number": 261,
           "records": [
             {
-              "position_offset": 98,
+              "position_offset": 96,
               "field_name": "tcp.ack_no",
               "field_msb": 31,
               "field_lsb": 0,
@@ -24458,7 +24254,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 87,
+              "position_offset": 85,
               "field_name": "ipv4.version",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24469,7 +24265,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 78,
+              "position_offset": 76,
               "field_name": "ipv4.ihl",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24497,7 +24293,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 67,
+              "position_offset": 65,
               "field_name": "ipv4.diffserv",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24514,7 +24310,7 @@
           "phv_number": 294,
           "records": [
             {
-              "position_offset": 79,
+              "position_offset": 77,
               "field_name": "ipv4.protocol",
               "field_msb": 7,
               "field_lsb": 0,
@@ -24542,7 +24338,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 106,
+              "position_offset": 104,
               "field_name": "tcp.data_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24553,7 +24349,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 112,
+              "position_offset": 110,
               "field_name": "tcp.res",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24564,7 +24360,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 110,
+              "position_offset": 108,
               "field_name": "tcp.ecn",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24575,7 +24371,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 104,
+              "position_offset": 102,
               "field_name": "tcp.ctrl",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24586,7 +24382,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 131,
+              "position_offset": 129,
               "field_name": "udp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24625,7 +24421,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 118,
+              "position_offset": 116,
               "field_name": "tcp.src_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24636,7 +24432,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 127,
+              "position_offset": 125,
               "field_name": "udp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24675,7 +24471,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 72,
+              "position_offset": 70,
               "field_name": "ipv4.flags",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24686,7 +24482,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 74,
+              "position_offset": 72,
               "field_name": "ipv4.frag_offset",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24703,7 +24499,7 @@
           "phv_number": 329,
           "records": [
             {
-              "position_offset": 84,
+              "position_offset": 82,
               "field_name": "ipv4.total_len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24720,7 +24516,7 @@
           "phv_number": 330,
           "records": [
             {
-              "position_offset": 76,
+              "position_offset": 74,
               "field_name": "ipv4.identification",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24737,7 +24533,7 @@
           "phv_number": 331,
           "records": [
             {
-              "position_offset": 108,
+              "position_offset": 106,
               "field_name": "tcp.dst_port",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24748,7 +24544,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 129,
+              "position_offset": 127,
               "field_name": "udp.len",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24776,7 +24572,7 @@
           "phv_number": 338,
           "records": [
             {
-              "position_offset": 122,
+              "position_offset": 120,
               "field_name": "tcp.window",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24787,7 +24583,7 @@
               "is_pov": false
             },
             {
-              "position_offset": 125,
+              "position_offset": 123,
               "field_name": "udp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24804,7 +24600,7 @@
           "phv_number": 339,
           "records": [
             {
-              "position_offset": 102,
+              "position_offset": 100,
               "field_name": "tcp.checksum",
               "field_msb": 15,
               "field_lsb": 0,
@@ -24821,7 +24617,7 @@
           "phv_number": 340,
           "records": [
             {
-              "position_offset": 120,
+              "position_offset": 118,
               "field_name": "tcp.urgent_ptr",
               "field_msb": 15,
               "field_lsb": 0,
@@ -26083,8 +25879,8 @@
               "name": "ModifyFieldPrimitive",
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
-                { "type": "phv", "name": "H2" },
-                { "type": "phv", "name": "H1" }
+                { "type": "phv", "name": "H1" },
+                { "type": "phv", "name": "H0" }
               ]
             },
             {
@@ -26515,7 +26311,7 @@
             {
               "name": "ModifyFieldPrimitive",
               "dest": { "type": "phv", "name": "vlan_tag.ether_type" },
-              "src": [ { "type": "phv", "name": "H7" } ]
+              "src": [ { "type": "phv", "name": "H6" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
@@ -26532,7 +26328,7 @@
             },
             {
               "name": "ModifyFieldPrimitive",
-              "dest": { "type": "phv", "name": "H3" },
+              "dest": { "type": "phv", "name": "H2" },
               "src": [ { "type": "immediate", "name": "$data0" } ]
             }
           ]
@@ -26567,7 +26363,7 @@
               "dest": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "immediate", "name": "new_vlan_id" },
-                { "type": "phv", "name": "H3" }
+                { "type": "phv", "name": "H2" }
               ]
             }
           ]
@@ -26595,7 +26391,7 @@
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.drop_ctl" },
               "src": [
                 { "type": "immmediate", "name": "1" },
-                { "type": "phv", "name": "H2" }
+                { "type": "phv", "name": "H1" }
               ]
             }
           ]
@@ -29790,7 +29586,7 @@
               "dest": { "type": "phv", "name": "fabric_metadata.fwd_type" },
               "src": [
                 { "type": "immediate", "name": "fwd_type" },
-                { "type": "phv", "name": "H2" }
+                { "type": "phv", "name": "H1" }
               ]
             }
           ]
@@ -30048,8 +29844,8 @@
               ],
               "memory_resource_allocation": {
                 "memory_type": "sram",
-                "memory_units_and_vpns": [ { "memory_units": [ 2 ], "vpns": [ 0 ] } ],
-                "spare_bank_memory_unit": 2
+                "memory_units_and_vpns": [ { "memory_units": [ 14 ], "vpns": [ 0 ] } ],
+                "spare_bank_memory_unit": 14
               },
               "action_format": [
                 {
@@ -30204,12 +30000,12 @@
           "memory_resource_allocation": {
             "memory_type": "sram",
             "memory_units_and_vpns": [
-              { "memory_units": [ 6 ], "vpns": [ 0 ] },
-              { "memory_units": [ 7 ], "vpns": [ 1 ] }
+              { "memory_units": [ 54 ], "vpns": [ 0 ] },
+              { "memory_units": [ 55 ], "vpns": [ 1 ] }
             ],
-            "spare_bank_memory_unit": 7
+            "spare_bank_memory_unit": 55
           },
-          "stats_alu_index": 0
+          "stats_alu_index": 2
         }
       ],
       "how_referenced": "direct",
@@ -30622,7 +30418,7 @@
                 "action_handle": 536870926,
                 "table_name": "tbl_act_9",
                 "next_table": 0,
-                "next_table_full": 68,
+                "next_table_full": 66,
                 "vliw_instruction": 0,
                 "vliw_instruction_full": 65,
                 "immediate_fields": []
@@ -30632,7 +30428,7 @@
                 "action_handle": 536870925,
                 "table_name": "tbl_act_9",
                 "next_table": 0,
-                "next_table_full": 68,
+                "next_table_full": 66,
                 "vliw_instruction": 1,
                 "vliw_instruction_full": 66,
                 "immediate_fields": [
@@ -30646,7 +30442,7 @@
                 ]
               }
             ],
-            "result_physical_buses": [ 14 ],
+            "result_physical_buses": [ 12, 14 ],
             "pack_format": [
               {
                 "memory_word_width": 128,
@@ -31017,7 +30813,7 @@
                   "hash_select_bit_hi": 40,
                   "hash_select_bit_lo": 40,
                   "number_select_bits": 0,
-                  "memory_units_and_vpns": [ { "memory_units": [ 88 ], "vpns": [ 2 ] } ]
+                  "memory_units_and_vpns": [ { "memory_units": [ 74 ], "vpns": [ 2 ] } ]
                 }
               }
             ]
@@ -31138,7 +30934,7 @@
             "stage_number": 4,
             "size": 1,
             "stage_table_type": "match_with_no_key",
-            "logical_table_id": 4,
+            "logical_table_id": 2,
             "has_attached_gateway": true,
             "memory_resource_allocation": null,
             "default_next_table": 255,
@@ -31227,7 +31023,7 @@
             "stage_number": 4,
             "size": 512,
             "stage_table_type": "ternary_match",
-            "logical_table_id": 2,
+            "logical_table_id": 3,
             "has_attached_gateway": true,
             "pack_format": [
               {
@@ -31291,11 +31087,11 @@
             ],
             "memory_resource_allocation": {
               "memory_type": "tcam",
-              "memory_units_and_vpns": [ { "memory_units": [ 5 ], "vpns": [ 0 ] } ],
-              "spare_bank_memory_unit": 5
+              "memory_units_and_vpns": [ { "memory_units": [ 2 ], "vpns": [ 0 ] } ],
+              "spare_bank_memory_unit": 2
             },
             "default_next_table": 0,
-            "result_physical_buses": [ 10 ],
+            "result_physical_buses": [ 4 ],
             "ternary_indirection_stage_table": {
               "stage_number": 4,
               "stage_table_type": "ternary_indirection",
@@ -31382,8 +31178,8 @@
               ],
               "memory_resource_allocation": {
                 "memory_type": "sram",
-                "memory_units_and_vpns": [ { "memory_units": [ 14 ], "vpns": [ 0 ] } ],
-                "spare_bank_memory_unit": 14
+                "memory_units_and_vpns": [ { "memory_units": [ 2 ], "vpns": [ 0 ] } ],
+                "spare_bank_memory_unit": 2
               },
               "action_format": [
                 {
@@ -31515,7 +31311,7 @@
           "stage_number": 4,
           "size": 2048,
           "stage_table_type": "statistics",
-          "logical_table_id": 2,
+          "logical_table_id": 3,
           "pack_format": [
             {
               "table_word_width": 128,
@@ -31545,407 +31341,6 @@
     {
       "direction": "ingress",
       "handle": 16777227,
-      "name": "forwarding.multicast_v4",
-      "table_type": "match",
-      "size": 512,
-      "match_attributes": {
-        "stage_tables": [
-          {
-            "stage_number": 4,
-            "size": 512,
-            "stage_table_type": "ternary_match",
-            "logical_table_id": 3,
-            "has_attached_gateway": true,
-            "pack_format": [
-              {
-                "table_word_width": 141,
-                "memory_word_width": 47,
-                "entries_per_table_word": 1,
-                "number_memory_units_per_table_word": 3,
-                "entries": [
-                  {
-                    "entry_number": 0,
-                    "fields": [
-                      {
-                        "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": "vlan_tag.vlan_id",
-                        "lsb_mem_word_offset": 17,
-                        "lsb_mem_word_idx": 2,
-                        "msb_mem_word_idx": 2,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 8
-                      },
-                      {
-                        "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": "ipv4.dst_addr",
-                        "lsb_mem_word_offset": 33,
-                        "lsb_mem_word_idx": 1,
-                        "msb_mem_word_idx": 1,
-                        "source": "spec",
-                        "start_bit": 24,
-                        "field_width": 8
-                      },
-                      {
-                        "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": 8,
-                        "field_width": 16
-                      },
-                      {
-                        "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": 8,
-                        "field_width": 4
-                      },
-                      {
-                        "field_name": "ipv4.dst_addr",
-                        "lsb_mem_word_offset": 25,
-                        "lsb_mem_word_idx": 0,
-                        "msb_mem_word_idx": 0,
-                        "source": "spec",
-                        "start_bit": 0,
-                        "field_width": 8
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "memory_resource_allocation": {
-              "memory_type": "tcam",
-              "memory_units_and_vpns": [ { "memory_units": [ 2, 3, 4 ], "vpns": [ 0 ] } ],
-              "spare_bank_memory_unit": 4
-            },
-            "default_next_table": 0,
-            "result_physical_buses": [ 4, 6, 8 ],
-            "ternary_indirection_stage_table": {
-              "stage_number": 4,
-              "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": [ 26 ], "vpns": [ 0 ] } ],
-                "spare_bank_memory_unit": 26
-              },
-              "action_format": [
-                {
-                  "action_name": "NoAction",
-                  "action_handle": 536870931,
-                  "table_name": "forwarding_acl",
-                  "next_table": 0,
-                  "next_table_full": 80,
-                  "vliw_instruction": 0,
-                  "vliw_instruction_full": 65,
-                  "immediate_fields": []
-                },
-                {
-                  "action_name": "forwarding.set_next_id",
-                  "action_handle": 536870930,
-                  "table_name": "forwarding_acl",
-                  "next_table": 0,
-                  "next_table_full": 80,
-                  "vliw_instruction": 1,
-                  "vliw_instruction_full": 70,
-                  "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.multicast_v4_counter"
-        }
-      ],
-      "stateful_table_refs": [],
-      "actions": [
-        {
-          "name": "NoAction",
-          "handle": 536870931,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "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": 536870930,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "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",
-              "dest": { "type": "phv", "name": "fabric_metadata.next_id" },
-              "src": [ { "type": "immediate", "name": "next_id" } ]
-            }
-          ]
-        }
-      ],
-      "default_action_handle": 536870931,
-      "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": "ipv4.dst_addr",
-          "position": 1,
-          "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.multicast_v4_counter",
-      "table_type": "statistics",
-      "size": 0,
-      "stage_tables": [
-        {
-          "stage_number": 4,
-          "size": 2048,
-          "stage_table_type": "statistics",
-          "logical_table_id": 3,
-          "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": 16777228,
       "name": "forwarding.acl",
       "table_type": "match",
       "size": 256,
@@ -32440,7 +31835,7 @@
               "action_format": [
                 {
                   "action_name": "nop",
-                  "action_handle": 536870935,
+                  "action_handle": 536870933,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 96,
@@ -32450,7 +31845,7 @@
                 },
                 {
                   "action_name": "forwarding.set_next_id",
-                  "action_handle": 536870932,
+                  "action_handle": 536870930,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 96,
@@ -32468,7 +31863,7 @@
                 },
                 {
                   "action_name": "forwarding.duplicate_to_controller",
-                  "action_handle": 536870933,
+                  "action_handle": 536870931,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 96,
@@ -32487,7 +31882,7 @@
                 },
                 {
                   "action_name": "forwarding.drop",
-                  "action_handle": 536870934,
+                  "action_handle": 536870932,
                   "table_name": "next_simple",
                   "next_table": 0,
                   "next_table_full": 96,
@@ -32507,7 +31902,7 @@
       "statistics_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 67108872,
+          "handle": 67108871,
           "name": "forwarding.acl_counter"
         }
       ],
@@ -32515,7 +31910,7 @@
       "actions": [
         {
           "name": "nop",
-          "handle": 536870935,
+          "handle": 536870933,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -32534,7 +31929,7 @@
         },
         {
           "name": "forwarding.set_next_id",
-          "handle": 536870932,
+          "handle": 536870930,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -32566,7 +31961,7 @@
         },
         {
           "name": "forwarding.duplicate_to_controller",
-          "handle": 536870933,
+          "handle": 536870931,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -32587,14 +31982,14 @@
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
                 { "type": "immediate", "name": "$constant0" },
-                { "type": "phv", "name": "H1" }
+                { "type": "phv", "name": "H0" }
               ]
             }
           ]
         },
         {
           "name": "forwarding.drop",
-          "handle": 536870934,
+          "handle": 536870932,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -32615,13 +32010,13 @@
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.drop_ctl" },
               "src": [
                 { "type": "immmediate", "name": "1" },
-                { "type": "phv", "name": "H2" }
+                { "type": "phv", "name": "H1" }
               ]
             }
           ]
         }
       ],
-      "default_action_handle": 536870935,
+      "default_action_handle": 536870933,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -32764,7 +32159,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 67108872,
+      "handle": 67108871,
       "name": "forwarding.acl_counter",
       "table_type": "statistics",
       "size": 0,
@@ -32802,7 +32197,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777229,
+      "handle": 16777228,
       "name": "next.simple",
       "table_type": "match",
       "size": 3072,
@@ -32818,12 +32213,12 @@
       "statistics_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 67108873,
+          "handle": 67108872,
           "name": "next.simple_counter"
         }
       ],
       "stateful_table_refs": [],
-      "default_action_handle": 536870940,
+      "default_action_handle": 536870938,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -34335,7 +33730,7 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870940,
+                "action_handle": 536870938,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 114,
@@ -34345,7 +33740,7 @@
               },
               {
                 "action_name": "next.output",
-                "action_handle": 536870936,
+                "action_handle": 536870934,
                 "table_name": "next_hashed",
                 "next_table": 1,
                 "next_table_full": 114,
@@ -34355,7 +33750,7 @@
               },
               {
                 "action_name": "next.set_vlan_output",
-                "action_handle": 536870937,
+                "action_handle": 536870935,
                 "table_name": "next_hashed",
                 "next_table": 2,
                 "next_table_full": 114,
@@ -34365,7 +33760,7 @@
               },
               {
                 "action_name": "next.l3_routing",
-                "action_handle": 536870938,
+                "action_handle": 536870936,
                 "table_name": "next_hashed",
                 "next_table": 3,
                 "next_table_full": 114,
@@ -34375,7 +33770,7 @@
               },
               {
                 "action_name": "next.mpls_routing_v4",
-                "action_handle": 536870939,
+                "action_handle": 536870937,
                 "table_name": "next_hashed",
                 "next_table": 4,
                 "next_table_full": 114,
@@ -34827,7 +34222,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870940,
+          "handle": 536870938,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -34845,7 +34240,7 @@
         },
         {
           "name": "next.output",
-          "handle": 536870936,
+          "handle": 536870934,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -34872,14 +34267,14 @@
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
                 { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
+                { "type": "phv", "name": "H0" }
               ]
             }
           ]
         },
         {
           "name": "next.set_vlan_output",
-          "handle": 536870937,
+          "handle": 536870935,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -34912,7 +34307,7 @@
               "dest": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "H3" }
+                { "type": "phv", "name": "H2" }
               ]
             },
             {
@@ -34928,14 +34323,14 @@
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
                 { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
+                { "type": "phv", "name": "H0" }
               ]
             }
           ]
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870938,
+          "handle": 536870936,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -34964,7 +34359,7 @@
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
                 { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
+                { "type": "phv", "name": "H0" }
               ]
             },
             {
@@ -34991,7 +34386,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870939,
+          "handle": 536870937,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -35026,7 +34421,7 @@
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
                 { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
+                { "type": "phv", "name": "H0" }
               ]
             },
             {
@@ -35083,7 +34478,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 67108873,
+      "handle": 67108872,
       "name": "next.simple_counter",
       "table_type": "statistics",
       "size": 0,
@@ -35154,7 +34549,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870940
+              "action_handle": 536870938
             },
             {
               "memory_word_width": 128,
@@ -35195,7 +34590,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870936
+              "action_handle": 536870934
             },
             {
               "memory_word_width": 128,
@@ -35254,7 +34649,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870937
+              "action_handle": 536870935
             },
             {
               "memory_word_width": 128,
@@ -35331,7 +34726,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870938
+              "action_handle": 536870936
             },
             {
               "memory_word_width": 128,
@@ -35408,7 +34803,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870939
+              "action_handle": 536870937
             }
           ],
           "memory_resource_allocation": {
@@ -35425,7 +34820,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870940,
+          "handle": 536870938,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -35443,7 +34838,7 @@
         },
         {
           "name": "next.output",
-          "handle": 536870936,
+          "handle": 536870934,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -35470,14 +34865,14 @@
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
                 { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
+                { "type": "phv", "name": "H0" }
               ]
             }
           ]
         },
         {
           "name": "next.set_vlan_output",
-          "handle": 536870937,
+          "handle": 536870935,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -35510,7 +34905,7 @@
               "dest": { "type": "phv", "name": "vlan_tag.vlan_id" },
               "src": [
                 { "type": "action_param", "name": "new_vlan_id" },
-                { "type": "phv", "name": "H3" }
+                { "type": "phv", "name": "H2" }
               ]
             },
             {
@@ -35526,14 +34921,14 @@
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
                 { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
+                { "type": "phv", "name": "H0" }
               ]
             }
           ]
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870938,
+          "handle": 536870936,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -35562,7 +34957,7 @@
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
                 { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
+                { "type": "phv", "name": "H0" }
               ]
             },
             {
@@ -35589,7 +34984,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870939,
+          "handle": 536870937,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -35624,7 +35019,7 @@
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
                 { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
+                { "type": "phv", "name": "H0" }
               ]
             },
             {
@@ -35682,7 +35077,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777230,
+      "handle": 16777229,
       "name": "tbl_act_2",
       "table_type": "match",
       "size": 1,
@@ -35709,7 +35104,7 @@
             "action_format": [
               {
                 "action_name": "act_2",
-                "action_handle": 536870941,
+                "action_handle": 536870939,
                 "table_name": "next_hashed",
                 "next_table": 0,
                 "next_table_full": 114,
@@ -35727,7 +35122,7 @@
       "actions": [
         {
           "name": "act_2",
-          "handle": 536870941,
+          "handle": 536870939,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -35755,7 +35150,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870941,
+      "default_action_handle": 536870939,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -35771,7 +35166,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777231,
+      "handle": 16777230,
       "name": "next.hashed",
       "table_type": "match",
       "size": 3072,
@@ -35793,14 +35188,14 @@
       "statistics_table_refs": [
         {
           "how_referenced": "direct",
-          "handle": 67108874,
+          "handle": 67108873,
           "name": "next.hashed_counter"
         }
       ],
       "stateful_table_refs": [],
       "default_selector_mask": 0,
       "default_selector_value": 0,
-      "default_action_handle": 536870945,
+      "default_action_handle": 536870943,
       "action_profile": "next.ecmp_selector",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -37452,7 +36847,7 @@
             "action_format": [
               {
                 "action_name": "NoAction",
-                "action_handle": 536870945,
+                "action_handle": 536870943,
                 "table_name": "tbl_act_13",
                 "next_table": 0,
                 "next_table_full": 128,
@@ -37462,7 +36857,7 @@
               },
               {
                 "action_name": "next.l3_routing",
-                "action_handle": 536870942,
+                "action_handle": 536870940,
                 "table_name": "tbl_act_13",
                 "next_table": 0,
                 "next_table_full": 128,
@@ -37472,7 +36867,7 @@
               },
               {
                 "action_name": "next.mpls_routing_v4",
-                "action_handle": 536870943,
+                "action_handle": 536870941,
                 "table_name": "tbl_act_13",
                 "next_table": 0,
                 "next_table_full": 128,
@@ -37482,7 +36877,7 @@
               },
               {
                 "action_name": "next.mpls_routing_v6",
-                "action_handle": 536870944,
+                "action_handle": 536870942,
                 "table_name": "tbl_act_13",
                 "next_table": 0,
                 "next_table_full": 128,
@@ -37943,7 +37338,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870945,
+          "handle": 536870943,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -37961,7 +37356,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870942,
+          "handle": 536870940,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -37990,7 +37385,7 @@
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
                 { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
+                { "type": "phv", "name": "H0" }
               ]
             },
             {
@@ -38017,7 +37412,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870943,
+          "handle": 536870941,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -38052,7 +37447,7 @@
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
                 { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
+                { "type": "phv", "name": "H0" }
               ]
             },
             {
@@ -38107,7 +37502,7 @@
         },
         {
           "name": "next.mpls_routing_v6",
-          "handle": 536870944,
+          "handle": 536870942,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -38142,7 +37537,7 @@
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
                 { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
+                { "type": "phv", "name": "H0" }
               ]
             },
             {
@@ -38264,7 +37659,7 @@
                   ]
                 }
               ],
-              "action_handle": 536870945
+              "action_handle": 536870943
             },
             {
               "memory_word_width": 128,
@@ -38350,255 +37745,255 @@
                   ]
                 }
               ],
+              "action_handle": 536870940
+            },
+            {
+              "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": 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": 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": 0,
+                      "field_name": "$constant1"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 4,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 4,
+                      "field_name": "label"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 9,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "port_num"
+                    },
+                    {
+                      "start_bit": 4,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "label"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 64,
+                      "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": 80,
+                      "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": 24,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 8,
+                      "field_name": "--padding_8_31--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 7,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 41,
+                      "field_name": "--padding_41_47--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 96,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 1,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_96_191--"
+                    }
+                  ]
+                }
+              ],
+              "action_handle": 536870941
+            },
+            {
+              "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": 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": 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": 0,
+                      "field_name": "$constant1"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 4,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 4,
+                      "field_name": "label"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 9,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 32,
+                      "field_name": "port_num"
+                    },
+                    {
+                      "start_bit": 4,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 48,
+                      "field_name": "label"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 16,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "spec",
+                      "lsb_mem_word_offset": 64,
+                      "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": 80,
+                      "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": 24,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 8,
+                      "field_name": "--padding_8_31--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 7,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 0,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 41,
+                      "field_name": "--padding_41_47--"
+                    },
+                    {
+                      "start_bit": 0,
+                      "field_width": 96,
+                      "lsb_mem_word_idx": 0,
+                      "msb_mem_word_idx": 1,
+                      "source": "zero",
+                      "lsb_mem_word_offset": 96,
+                      "field_name": "--padding_96_191--"
+                    }
+                  ]
+                }
+              ],
               "action_handle": 536870942
-            },
-            {
-              "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": 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": 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": 0,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 4,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 4,
-                      "field_name": "label"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 9,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "port_num"
-                    },
-                    {
-                      "start_bit": 4,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "label"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 64,
-                      "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": 80,
-                      "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": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 8,
-                      "field_name": "--padding_8_31--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 7,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 41,
-                      "field_name": "--padding_41_47--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 96,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 1,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_96_191--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870943
-            },
-            {
-              "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": 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": 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": 0,
-                      "field_name": "$constant1"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 4,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 4,
-                      "field_name": "label"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 9,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "port_num"
-                    },
-                    {
-                      "start_bit": 4,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 48,
-                      "field_name": "label"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 16,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 64,
-                      "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": 80,
-                      "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": 24,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 8,
-                      "field_name": "--padding_8_31--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 7,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 41,
-                      "field_name": "--padding_41_47--"
-                    },
-                    {
-                      "start_bit": 0,
-                      "field_width": 96,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 1,
-                      "source": "zero",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "--padding_96_191--"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870944
             }
           ],
           "memory_resource_allocation": {
@@ -38611,7 +38006,7 @@
       "actions": [
         {
           "name": "NoAction",
-          "handle": 536870945,
+          "handle": 536870943,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -38629,7 +38024,7 @@
         },
         {
           "name": "next.l3_routing",
-          "handle": 536870942,
+          "handle": 536870940,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -38658,7 +38053,7 @@
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
                 { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
+                { "type": "phv", "name": "H0" }
               ]
             },
             {
@@ -38685,7 +38080,7 @@
         },
         {
           "name": "next.mpls_routing_v4",
-          "handle": 536870943,
+          "handle": 536870941,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -38720,7 +38115,7 @@
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
                 { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
+                { "type": "phv", "name": "H0" }
               ]
             },
             {
@@ -38775,7 +38170,7 @@
         },
         {
           "name": "next.mpls_routing_v6",
-          "handle": 536870944,
+          "handle": 536870942,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -38810,7 +38205,7 @@
               "dest": { "type": "phv", "name": "ig_intr_md_for_tm.ucast_egress_port" },
               "src": [
                 { "type": "action_param", "name": "port_num" },
-                { "type": "phv", "name": "H1" }
+                { "type": "phv", "name": "H0" }
               ]
             },
             {
@@ -38868,7 +38263,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 67108874,
+      "handle": 67108873,
       "name": "next.hashed_counter",
       "table_type": "statistics",
       "size": 0,
@@ -38907,7 +38302,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777232,
+      "handle": 16777231,
       "name": "tbl_act_5",
       "table_type": "match",
       "size": 1,
@@ -38930,11 +38325,11 @@
                 "number_memory_units_per_table_word": 0
               }
             ],
-            "result_physical_buses": [ 1 ],
+            "result_physical_buses": [ 0 ],
             "action_format": [
               {
                 "action_name": "act_5",
-                "action_handle": 536870946,
+                "action_handle": 536870944,
                 "table_name": "tbl_act_11",
                 "next_table": 0,
                 "next_table_full": 129,
@@ -38952,7 +38347,7 @@
       "actions": [
         {
           "name": "act_5",
-          "handle": 536870946,
+          "handle": 536870944,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -38971,7 +38366,7 @@
             {
               "name": "ModifyFieldPrimitive",
               "dest": { "type": "phv", "name": "ethernet.ether_type" },
-              "src": [ { "type": "phv", "name": "H8" } ]
+              "src": [ { "type": "phv", "name": "H7" } ]
             },
             {
               "name": "ModifyFieldPrimitive",
@@ -38984,7 +38379,7 @@
           ]
         }
       ],
-      "default_action_handle": 536870946,
+      "default_action_handle": 536870944,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -39000,7 +38395,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 16777233,
+      "handle": 16777232,
       "name": "tbl_act_3",
       "table_type": "match",
       "size": 512,
@@ -39023,14 +38418,14 @@
                 "number_memory_units_per_table_word": 0
               }
             ],
-            "result_physical_buses": [ 0 ],
+            "result_physical_buses": [ 1 ],
             "action_format": [
               {
                 "action_name": "act_3",
-                "action_handle": 536870947,
-                "table_name": "next_broadcast",
+                "action_handle": 536870945,
+                "table_name": "--END_OF_PIPELINE--",
                 "next_table": 0,
-                "next_table_full": 130,
+                "next_table_full": 255,
                 "vliw_instruction": 0,
                 "vliw_instruction_full": 65,
                 "immediate_fields": []
@@ -39045,7 +38440,7 @@
       "actions": [
         {
           "name": "act_3",
-          "handle": 536870947,
+          "handle": 536870945,
           "indirect_resources": [],
           "allowed_as_default_action": true,
           "disallowed_as_default_action_reason": "",
@@ -39063,7 +38458,7 @@
           "primitives": []
         }
       ],
-      "default_action_handle": 536870947,
+      "default_action_handle": 536870945,
       "action_profile": "",
       "default_next_table_mask": 0,
       "ap_bind_indirect_res_to_match": [],
@@ -39077,7 +38472,7 @@
       "statistics_table_refs": [
         {
           "how_referenced": "indirect",
-          "handle": 67108875,
+          "handle": 67108874,
           "name": "port_counters_control.egress_port_counter"
         }
       ],
@@ -39085,7 +38480,7 @@
     },
     {
       "direction": "ingress",
-      "handle": 67108875,
+      "handle": 67108874,
       "name": "port_counters_control.egress_port_counter",
       "table_type": "statistics",
       "size": 511,
@@ -39106,12 +38501,12 @@
           "memory_resource_allocation": {
             "memory_type": "sram",
             "memory_units_and_vpns": [
-              { "memory_units": [ 54 ], "vpns": [ 0 ] },
-              { "memory_units": [ 55 ], "vpns": [ 1 ] }
+              { "memory_units": [ 78 ], "vpns": [ 0 ] },
+              { "memory_units": [ 79 ], "vpns": [ 1 ] }
             ],
-            "spare_bank_memory_unit": 55
+            "spare_bank_memory_unit": 79
           },
-          "stats_alu_index": 2
+          "stats_alu_index": 3
         }
       ],
       "how_referenced": "indirect",
@@ -39120,2482 +38515,6 @@
       "byte_counter_resolution": 36,
       "packet_counter_resolution": 28,
       "statistics_type": "packets_and_bytes"
-    },
-    {
-      "direction": "ingress",
-      "handle": 16777234,
-      "name": "next.broadcast",
-      "table_type": "match",
-      "size": 3072,
-      "action_data_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 33554435,
-          "name": "next_broadcast$action"
-        }
-      ],
-      "selection_table_refs": [],
-      "meter_table_refs": [],
-      "statistics_table_refs": [
-        {
-          "how_referenced": "direct",
-          "handle": 67108876,
-          "name": "next.broadcast_counter"
-        }
-      ],
-      "stateful_table_refs": [],
-      "default_action_handle": 536870949,
-      "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": 8,
-            "size": 3072,
-            "stage_table_type": "hash_match",
-            "logical_table_id": 2,
-            "has_attached_gateway": false,
-            "hash_functions": [
-              {
-                "hash_bits": [
-                  {
-                    "hash_bit": 0,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 1,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 2,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 3,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 4,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 5,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 6,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 7,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 8,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 9,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 10,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 11,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 12,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 13,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 14,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 15,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 16,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 17,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 18,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 19,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 20,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 0,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 21,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 1,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 22,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 2,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 23,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 3,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 24,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 4,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 25,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 5,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 26,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 28,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 6,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 27,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 23,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 7,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 28,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 16,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 21,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 29,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 30,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 31,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 8,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 10,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 11,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 13,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 14,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  },
-                  {
-                    "hash_bit": 29,
-                    "seed": 0,
-                    "bits_to_xor": [
-                      {
-                        "field_bit": 17,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 18,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 19,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 20,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 22,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 24,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 25,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 26,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 27,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 9,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 12,
-                        "field_name": "fabric_metadata.next_id"
-                      },
-                      {
-                        "field_bit": 15,
-                        "field_name": "fabric_metadata.next_id"
-                      }
-                    ]
-                  }
-                ]
-              }
-            ],
-            "action_format": [
-              {
-                "action_name": "NoAction",
-                "action_handle": 536870949,
-                "table_name": "--END_OF_PIPELINE--",
-                "next_table": 0,
-                "next_table_full": 255,
-                "vliw_instruction": 0,
-                "vliw_instruction_full": 65,
-                "immediate_fields": []
-              },
-              {
-                "action_name": "next.set_mcast_group",
-                "action_handle": 536870948,
-                "table_name": "--END_OF_PIPELINE--",
-                "next_table": 0,
-                "next_table_full": 255,
-                "vliw_instruction": 1,
-                "vliw_instruction_full": 66,
-                "immediate_fields": [
-                  {
-                    "param_name": "gid",
-                    "param_type": "parameter",
-                    "param_shift": 0,
-                    "dest_start": 16,
-                    "dest_width": 16
-                  },
-                  {
-                    "param_name": "smac",
-                    "param_type": "parameter",
-                    "param_shift": 0,
-                    "dest_start": 0,
-                    "dest_width": 16
-                  }
-                ]
-              }
-            ],
-            "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": 8,
-                "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": 1,
-                            "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": 1,
-                            "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": "fabric_metadata.next_id",
-                            "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": "fabric_metadata.next_id",
-                            "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": "fabric_metadata.next_id",
-                            "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": 1,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 33,
-                            "field_name": "--padding_33_33--",
-                            "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": 8,
-                "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": 1,
-                            "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": 1,
-                            "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": "fabric_metadata.next_id",
-                            "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": "fabric_metadata.next_id",
-                            "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": "fabric_metadata.next_id",
-                            "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": 1,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 33,
-                            "field_name": "--padding_33_33--",
-                            "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": 8,
-                "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": 1,
-                            "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": 1,
-                            "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": "fabric_metadata.next_id",
-                            "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": "fabric_metadata.next_id",
-                            "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": "fabric_metadata.next_id",
-                            "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": 1,
-                            "lsb_mem_word_idx": 0,
-                            "msb_mem_word_idx": 0,
-                            "source": "zero",
-                            "lsb_mem_word_offset": 33,
-                            "field_name": "--padding_33_33--",
-                            "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": 536870949,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "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.set_mcast_group",
-          "handle": 536870948,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            { "name": "gid", "start_bit": 0, "position": 0, "bit_width": 16 },
-            { "name": "smac", "start_bit": 16, "position": 1, "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",
-              "dest": { "type": "phv", "name": "ig_intr_md_for_tm.mcast_grp_a" },
-              "src": [ { "type": "immediate", "name": "gid" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dest": { "type": "phv", "name": "ethernet.src_addr.0-15" },
-              "src": [ { "type": "immediate", "name": "smac.0-15" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dest": { "type": "phv", "name": "ethernet.src_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "smac.16-47" } ]
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "direction": "ingress",
-      "handle": 67108876,
-      "name": "next.broadcast_counter",
-      "table_type": "statistics",
-      "size": 0,
-      "stage_tables": [
-        {
-          "stage_number": 8,
-          "size": 4096,
-          "stage_table_type": "statistics",
-          "logical_table_id": 2,
-          "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": 33554435,
-      "name": "next_broadcast$action",
-      "table_type": "action",
-      "size": 4096,
-      "stage_tables": [
-        {
-          "stage_number": 8,
-          "size": 4096,
-          "stage_table_type": "action_data",
-          "logical_table_id": 2,
-          "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": 536870949
-            },
-            {
-              "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": 16,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 96,
-                      "field_name": "smac"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 2,
-                  "fields": [
-                    {
-                      "start_bit": 16,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 64,
-                      "field_name": "smac"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 1,
-                  "fields": [
-                    {
-                      "start_bit": 16,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 32,
-                      "field_name": "smac"
-                    }
-                  ]
-                },
-                {
-                  "entry_number": 0,
-                  "fields": [
-                    {
-                      "start_bit": 16,
-                      "field_width": 32,
-                      "lsb_mem_word_idx": 0,
-                      "msb_mem_word_idx": 0,
-                      "source": "spec",
-                      "lsb_mem_word_offset": 0,
-                      "field_name": "smac"
-                    }
-                  ]
-                }
-              ],
-              "action_handle": 536870948
-            }
-          ],
-          "memory_resource_allocation": {
-            "memory_type": "sram",
-            "memory_units_and_vpns": [ { "memory_units": [ 90 ], "vpns": [ 0 ] } ],
-            "spare_bank_memory_unit": 90
-          }
-        }
-      ],
-      "actions": [
-        {
-          "name": "NoAction",
-          "handle": 536870949,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "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.set_mcast_group",
-          "handle": 536870948,
-          "indirect_resources": [],
-          "allowed_as_default_action": true,
-          "disallowed_as_default_action_reason": "",
-          "p4_parameters": [
-            { "name": "gid", "start_bit": 0, "position": 0, "bit_width": 16 },
-            { "name": "smac", "start_bit": 16, "position": 1, "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",
-              "dest": { "type": "phv", "name": "ig_intr_md_for_tm.mcast_grp_a" },
-              "src": [ { "type": "immediate", "name": "gid" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dest": { "type": "phv", "name": "ethernet.src_addr.0-15" },
-              "src": [ { "type": "immediate", "name": "smac.0-15" } ]
-            },
-            {
-              "name": "ModifyFieldPrimitive",
-              "dest": { "type": "phv", "name": "ethernet.src_addr.16-47" },
-              "src": [ { "type": "action_param", "name": "smac.16-47" } ]
-            }
-          ]
-        }
-      ],
-      "how_referenced": "direct"
     }
   ],
   "configuration_cache": [
@@ -41637,7 +38556,7 @@
     {
       "fully_qualified_name": "mau[2].dp.match_input_xbar_din_power_ctl",
       "name": "stage_2_match_input_xbar_din_power_ctl",
-      "value": "0000000000000000000000000000000000000080000000010000000000000000000000280000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000080000000010000000000000000000000140000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[2].dp.xbar_hash.hash.parity_group_mask",
@@ -41647,7 +38566,7 @@
     {
       "fully_qualified_name": "mau[3].dp.match_input_xbar_din_power_ctl",
       "name": "stage_3_match_input_xbar_din_power_ctl",
-      "value": "0000000100000000000000000000000000000000000000000000000000000000000000200000001200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000100000000000000000000000000000000000000000000000000000000000000100000000900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[3].dp.xbar_hash.hash.parity_group_mask",
@@ -41657,7 +38576,7 @@
     {
       "fully_qualified_name": "mau[4].dp.match_input_xbar_din_power_ctl",
       "name": "stage_4_match_input_xbar_din_power_ctl",
-      "value": "00000009000000000000000000000000000000040000000000000000000000000000001c0000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "00000009000000000000000000000000000000040000000000000000000000000000000e0000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[4].dp.xbar_hash.hash.parity_group_mask",
@@ -41667,7 +38586,7 @@
     {
       "fully_qualified_name": "mau[5].dp.match_input_xbar_din_power_ctl",
       "name": "stage_5_match_input_xbar_din_power_ctl",
-      "value": "0000000f00000000000000000000000000000043000000000000000000000000000000680000001e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000f00000000000000000000000000000043000000000000000000000000000000340000000f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[6].dp.match_input_xbar_din_power_ctl",
@@ -41682,7 +38601,7 @@
     {
       "fully_qualified_name": "mau[7].dp.match_input_xbar_din_power_ctl",
       "name": "stage_7_match_input_xbar_din_power_ctl",
-      "value": "0000001c000000000000000000000000000000c0000000000000000000000000000000400000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000001c000000000000000000000000000000c0000000000000000000000000000000200000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[7].dp.xbar_hash.hash.parity_group_mask",
@@ -41692,7 +38611,7 @@
     {
       "fully_qualified_name": "mau[8].dp.match_input_xbar_din_power_ctl",
       "name": "stage_8_match_input_xbar_din_power_ctl",
-      "value": "0000001000000000000000000000000000000000000000010000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      "value": "0000000000000000000000000000000000000000000000010000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     },
     {
       "fully_qualified_name": "mau[8].dp.xbar_hash.hash.parity_group_mask",