Workaround to counter-issue as suggested by Antonin

Manually modified via makefile context.json

Change-Id: Ibed9e0691bf1d552db28470da57955e8f3ca802a
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/mau.context.json b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/mau.context.json
index 91ad565..f4b8f76 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/mau.context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/context/mau.context.json
@@ -1,13 +1,74 @@
 {
   "ProgramInfo": {
     "ProgramName": "ecmp", 
-    "BuildDate": "Tue Sep 12 11:16:12 2017", 
+    "BuildDate": "Wed Sep 13 00:59:57 2017", 
     "CompilerVersion": "5.1.0"
   }, 
   "HashJsonNode": {
-    "TableCount": 1, 
+    "TableCount": 3, 
     "ProxyTables": {}, 
     "AllTables": {
+      "ingress_port_count_table": {
+        "2": [
+          {
+            "0": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "1": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "2": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "3": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "4": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "5": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "6": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "7": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "8": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ]
+          }
+        ], 
+        "Handle": 16777217
+      }, 
       "ecmp_group_table": {
         "1": [
           {
@@ -1939,9 +2000,70 @@
           }
         ], 
         "Handle": 16777221
+      }, 
+      "egress_port_count_table": {
+        "2": [
+          {
+            "0": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "1": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "2": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "3": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "4": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "5": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "6": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "7": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "8": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ]
+          }
+        ], 
+        "Handle": 16777218
       }
     }, 
-    "HashFieldCount": 1
+    "HashFieldCount": 3
   }, 
   "EntryFormatNode": {
     "ExmEntryFormat": {
@@ -4832,7 +4954,7 @@
       "PhvDetails": [
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -4912,6 +5034,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -4922,7 +5069,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -4937,31 +5084,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -4971,10 +5093,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -5007,17 +5129,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -5147,6 +5269,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -5167,21 +5314,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -5212,24 +5344,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -5239,67 +5371,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -5355,6 +5432,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -5402,6 +5499,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -5412,7 +5534,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -5427,7 +5549,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -5478,7 +5600,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -5493,22 +5615,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -5542,20 +5649,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -5567,16 +5674,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -5614,7 +5721,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -5629,7 +5736,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -5644,7 +5751,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -5679,7 +5786,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -5734,7 +5841,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -5759,7 +5866,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -5774,7 +5881,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -5789,7 +5896,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -5829,7 +5936,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -5844,7 +5951,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -5869,7 +5976,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -5894,7 +6001,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -5909,7 +6016,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -5924,7 +6031,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -5939,7 +6046,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -5954,7 +6061,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -5979,7 +6086,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -5992,9 +6099,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -6061,111 +6273,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -6175,7 +6282,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -6255,6 +6362,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -6265,7 +6397,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -6280,31 +6412,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -6314,10 +6421,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -6350,17 +6457,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -6490,6 +6597,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -6510,21 +6642,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -6555,24 +6672,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -6582,67 +6699,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -6698,6 +6760,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -6745,6 +6827,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -6755,7 +6862,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -6770,7 +6877,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -6821,7 +6928,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -6836,22 +6943,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -6885,20 +6977,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -6910,16 +7002,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -6957,7 +7049,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -6972,7 +7064,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -6987,7 +7079,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -7022,7 +7114,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -7077,7 +7169,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -7102,7 +7194,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -7117,7 +7209,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -7132,7 +7224,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -7172,7 +7264,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -7187,7 +7279,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -7212,7 +7304,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -7237,7 +7329,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -7252,7 +7344,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -7267,7 +7359,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -7282,7 +7374,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -7297,7 +7389,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -7322,7 +7414,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -7335,9 +7427,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -7404,111 +7601,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -7518,7 +7610,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -7598,6 +7690,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -7608,7 +7725,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -7623,31 +7740,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -7657,10 +7749,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -7693,17 +7785,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -7833,6 +7925,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -7853,21 +7970,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -7898,24 +8000,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -7925,67 +8027,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -8041,6 +8088,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -8088,6 +8155,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -8098,7 +8190,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -8113,7 +8205,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -8164,7 +8256,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -8179,22 +8271,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -8228,20 +8305,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -8253,16 +8330,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -8300,7 +8377,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -8315,7 +8392,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -8330,7 +8407,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -8365,7 +8442,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -8420,7 +8497,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -8445,7 +8522,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -8460,7 +8537,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -8475,7 +8552,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -8515,7 +8592,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -8530,7 +8607,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -8555,7 +8632,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -8580,7 +8657,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -8595,7 +8672,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -8610,7 +8687,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -8625,7 +8702,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -8640,7 +8717,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -8665,7 +8742,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -8678,9 +8755,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -8747,111 +8929,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -8861,7 +8938,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -8941,6 +9018,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -8951,7 +9053,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -8966,31 +9068,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -9000,10 +9077,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -9036,17 +9113,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -9176,6 +9253,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -9196,21 +9298,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -9241,24 +9328,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -9268,67 +9355,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -9384,6 +9416,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -9431,6 +9483,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -9441,7 +9518,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -9456,7 +9533,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -9507,7 +9584,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -9522,22 +9599,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -9571,20 +9633,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -9596,16 +9658,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -9643,7 +9705,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -9658,7 +9720,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -9673,7 +9735,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -9708,7 +9770,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -9763,7 +9825,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -9788,7 +9850,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -9803,7 +9865,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -9818,7 +9880,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -9858,7 +9920,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -9873,7 +9935,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -9898,7 +9960,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -9923,7 +9985,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -9938,7 +10000,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -9953,7 +10015,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -9968,7 +10030,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -9983,7 +10045,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -10008,7 +10070,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -10021,9 +10083,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -10090,111 +10257,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -10204,7 +10266,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -10284,6 +10346,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -10294,7 +10381,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -10309,31 +10396,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -10343,10 +10405,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -10379,17 +10441,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -10519,6 +10581,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -10539,21 +10626,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -10584,24 +10656,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -10611,67 +10683,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -10727,6 +10744,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -10774,6 +10811,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -10784,7 +10846,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -10799,7 +10861,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -10850,7 +10912,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -10865,22 +10927,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -10914,20 +10961,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -10939,16 +10986,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -10986,7 +11033,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -11001,7 +11048,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -11016,7 +11063,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -11051,7 +11098,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -11106,7 +11153,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -11131,7 +11178,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -11146,7 +11193,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -11161,7 +11208,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -11201,7 +11248,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -11216,7 +11263,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -11241,7 +11288,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -11266,7 +11313,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -11281,7 +11328,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -11296,7 +11343,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -11311,7 +11358,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -11326,7 +11373,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -11351,7 +11398,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -11364,9 +11411,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -11433,111 +11585,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -11547,7 +11594,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -11627,6 +11674,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -11637,7 +11709,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -11652,31 +11724,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -11686,10 +11733,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -11722,17 +11769,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -11862,6 +11909,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -11882,21 +11954,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -11927,24 +11984,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -11954,67 +12011,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -12070,6 +12072,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -12117,6 +12139,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -12127,7 +12174,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -12142,7 +12189,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -12193,7 +12240,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -12208,22 +12255,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -12257,20 +12289,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -12282,16 +12314,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -12329,7 +12361,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -12344,7 +12376,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -12359,7 +12391,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -12394,7 +12426,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -12449,7 +12481,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -12474,7 +12506,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -12489,7 +12521,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -12504,7 +12536,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -12544,7 +12576,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -12559,7 +12591,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -12584,7 +12616,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -12609,7 +12641,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -12624,7 +12656,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -12639,7 +12671,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -12654,7 +12686,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -12669,7 +12701,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -12694,7 +12726,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -12707,9 +12739,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -12776,111 +12913,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -12890,7 +12922,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -12970,6 +13002,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -12980,7 +13037,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -12995,31 +13052,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -13029,10 +13061,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -13065,17 +13097,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -13205,6 +13237,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -13225,21 +13282,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -13270,24 +13312,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -13297,67 +13339,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -13413,6 +13400,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -13460,6 +13467,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -13470,7 +13502,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -13485,7 +13517,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -13536,7 +13568,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -13551,22 +13583,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -13600,20 +13617,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -13625,16 +13642,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -13672,7 +13689,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -13687,7 +13704,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -13702,7 +13719,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -13737,7 +13754,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -13792,7 +13809,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -13817,7 +13834,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -13832,7 +13849,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -13847,7 +13864,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -13887,7 +13904,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -13902,7 +13919,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -13927,7 +13944,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -13952,7 +13969,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -13967,7 +13984,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -13982,7 +13999,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -13997,7 +14014,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -14012,7 +14029,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -14037,7 +14054,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -14050,9 +14067,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -14119,111 +14241,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -14233,7 +14250,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -14313,6 +14330,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -14323,7 +14365,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -14338,31 +14380,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -14372,10 +14389,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -14408,17 +14425,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -14548,6 +14565,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -14568,21 +14610,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -14613,24 +14640,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -14640,67 +14667,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -14756,6 +14728,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -14803,6 +14795,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -14813,7 +14830,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -14828,7 +14845,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -14879,7 +14896,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -14894,22 +14911,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -14943,20 +14945,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -14968,16 +14970,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -15015,7 +15017,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -15030,7 +15032,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -15045,7 +15047,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -15080,7 +15082,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -15135,7 +15137,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -15160,7 +15162,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -15175,7 +15177,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -15190,7 +15192,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -15230,7 +15232,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -15245,7 +15247,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -15270,7 +15272,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -15295,7 +15297,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -15310,7 +15312,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -15325,7 +15327,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -15340,7 +15342,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -15355,7 +15357,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -15380,7 +15382,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -15393,9 +15395,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -15462,111 +15569,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -15576,7 +15578,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -15656,6 +15658,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -15666,7 +15693,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -15681,31 +15708,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -15715,10 +15717,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -15751,17 +15753,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -15891,6 +15893,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -15911,21 +15938,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -15956,24 +15968,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -15983,67 +15995,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -16099,6 +16056,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -16146,6 +16123,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -16156,7 +16158,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -16171,7 +16173,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -16222,7 +16224,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -16237,22 +16239,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -16286,20 +16273,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -16311,16 +16298,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -16358,7 +16345,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -16373,7 +16360,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -16388,7 +16375,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -16423,7 +16410,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -16478,7 +16465,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -16503,7 +16490,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -16518,7 +16505,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -16533,7 +16520,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -16573,7 +16560,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -16588,7 +16575,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -16613,7 +16600,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -16638,7 +16625,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -16653,7 +16640,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -16668,7 +16655,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -16683,7 +16670,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -16698,7 +16685,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -16723,7 +16710,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -16736,9 +16723,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -16805,111 +16897,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -16919,7 +16906,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -16999,6 +16986,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -17009,7 +17021,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -17024,31 +17036,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -17058,10 +17045,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -17094,17 +17081,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -17234,6 +17221,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -17254,21 +17266,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -17299,24 +17296,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -17326,67 +17323,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -17442,6 +17384,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -17489,6 +17451,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -17499,7 +17486,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -17514,7 +17501,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -17565,7 +17552,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -17580,22 +17567,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -17629,20 +17601,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -17654,16 +17626,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -17701,7 +17673,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -17716,7 +17688,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -17731,7 +17703,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -17766,7 +17738,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -17821,7 +17793,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -17846,7 +17818,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -17861,7 +17833,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -17876,7 +17848,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -17916,7 +17888,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -17931,7 +17903,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -17956,7 +17928,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -17981,7 +17953,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -17996,7 +17968,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -18011,7 +17983,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -18026,7 +17998,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -18041,7 +18013,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -18066,7 +18038,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -18079,9 +18051,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -18148,111 +18225,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -18262,7 +18234,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -18342,6 +18314,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -18352,7 +18349,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -18367,31 +18364,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -18401,10 +18373,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -18437,17 +18409,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -18577,6 +18549,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -18597,21 +18594,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -18642,24 +18624,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -18669,67 +18651,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -18785,6 +18712,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -18832,6 +18779,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -18842,7 +18814,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -18857,7 +18829,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -18908,7 +18880,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -18923,22 +18895,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -18972,20 +18929,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -18997,16 +18954,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -19044,7 +19001,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -19059,7 +19016,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -19074,7 +19031,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -19109,7 +19066,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -19164,7 +19121,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -19189,7 +19146,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -19204,7 +19161,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -19219,7 +19176,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -19259,7 +19216,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -19274,7 +19231,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -19299,7 +19256,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -19324,7 +19281,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -19339,7 +19296,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -19354,7 +19311,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -19369,7 +19326,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -19384,7 +19341,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -19409,7 +19366,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -19422,9 +19379,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -19491,111 +19553,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -19605,7 +19562,7 @@
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 59, 
+          "TOTALSTAGEPHVS": 56, 
           "TOTALPHVRECORDS": 95, 
           "Phvs": [
             {
@@ -19685,6 +19642,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 24, 
+                      "POSITIONOFFSET": 33
+                    }, 
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 23, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 76
+                    }
+                  ], 
+                  "PHVNUMBER": 3
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 31, 
@@ -19695,7 +19677,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 3
+                  "PHVNUMBER": 4
                 }, 
                 {
                   "PHVRECORD": [
@@ -19710,31 +19692,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 4
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_srcPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 66
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 55
-                    }
-                  ], 
                   "PHVNUMBER": 5
                 }, 
                 {
@@ -19744,10 +19701,10 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_group_id", 
+                      "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 36
+                      "POSITIONOFFSET": 5
                     }
                   ], 
                   "PHVNUMBER": 134
@@ -19780,17 +19737,17 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ecmp_metadata_selector", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 324
+                  "PHVNUMBER": 136
                 }, 
                 {
                   "PHVRECORD": [
@@ -19920,6 +19877,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 33
+                    }
+                  ], 
+                  "PHVNUMBER": 132
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -19940,21 +19922,6 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 132
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 5
-                    }
-                  ], 
                   "PHVNUMBER": 133
                 }, 
                 {
@@ -19985,24 +19952,24 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_srcPort", 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 76
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 8, 
                       "PHVMSB": 7, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
+                      "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 289
@@ -20012,67 +19979,12 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_srcPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 17
-                    }
-                  ], 
-                  "PHVNUMBER": 290
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 8, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 291
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "tcp_dstPort", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 292
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "ecmp_metadata_selector", 
+                      "PHVNAME": "ecmp_metadata_group_id", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 36
                     }
                   ], 
                   "PHVNUMBER": 135
@@ -20128,6 +20040,26 @@
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 17
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 68
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -20175,6 +20107,31 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 38
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "udp_srcPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 66
+                    }
+                  ], 
+                  "PHVNUMBER": 65
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -20185,7 +20142,7 @@
                       "POSITIONOFFSET": 20
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -20200,7 +20157,7 @@
                       "POSITIONOFFSET": 70
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -20251,7 +20208,7 @@
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 68
                 }, 
                 {
                   "PHVRECORD": [
@@ -20266,22 +20223,7 @@
                       "POSITIONOFFSET": 51
                     }
                   ], 
-                  "PHVNUMBER": 68
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 26
-                    }
-                  ], 
-                  "PHVNUMBER": 325
+                  "PHVNUMBER": 69
                 }, 
                 {
                   "PHVRECORD": [
@@ -20315,20 +20257,20 @@
                       "FIELDLSB": 16, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }, 
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
+                      "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 68
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -20340,16 +20282,16 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
+                      "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 76
+                      "POSITIONOFFSET": 26
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 33
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -20387,7 +20329,7 @@
                       "POSITIONOFFSET": 9
                     }
                   ], 
-                  "PHVNUMBER": 264
+                  "PHVNUMBER": 260
                 }, 
                 {
                   "PHVRECORD": [
@@ -20402,7 +20344,7 @@
                       "POSITIONOFFSET": 12
                     }
                   ], 
-                  "PHVNUMBER": 265
+                  "PHVNUMBER": 261
                 }, 
                 {
                   "PHVRECORD": [
@@ -20417,7 +20359,7 @@
                       "POSITIONOFFSET": 50
                     }
                   ], 
-                  "PHVNUMBER": 266
+                  "PHVNUMBER": 262
                 }, 
                 {
                   "PHVRECORD": [
@@ -20452,7 +20394,7 @@
                       "POSITIONOFFSET": 59
                     }
                   ], 
-                  "PHVNUMBER": 267
+                  "PHVNUMBER": 263
                 }, 
                 {
                   "PHVRECORD": [
@@ -20507,7 +20449,7 @@
                       "POSITIONOFFSET": 41
                     }
                   ], 
-                  "PHVNUMBER": 268
+                  "PHVNUMBER": 264
                 }, 
                 {
                   "PHVRECORD": [
@@ -20532,7 +20474,7 @@
                       "POSITIONOFFSET": 45
                     }
                   ], 
-                  "PHVNUMBER": 269
+                  "PHVNUMBER": 265
                 }, 
                 {
                   "PHVRECORD": [
@@ -20547,7 +20489,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 270
+                  "PHVNUMBER": 266
                 }, 
                 {
                   "PHVRECORD": [
@@ -20562,7 +20504,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 271
+                  "PHVNUMBER": 267
                 }, 
                 {
                   "PHVRECORD": [
@@ -20602,7 +20544,7 @@
                       "POSITIONOFFSET": 37
                     }
                   ], 
-                  "PHVNUMBER": 296
+                  "PHVNUMBER": 292
                 }, 
                 {
                   "PHVRECORD": [
@@ -20617,7 +20559,7 @@
                       "POSITIONOFFSET": 4
                     }
                   ], 
-                  "PHVNUMBER": 297
+                  "PHVNUMBER": 293
                 }, 
                 {
                   "PHVRECORD": [
@@ -20642,7 +20584,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 298
+                  "PHVNUMBER": 294
                 }, 
                 {
                   "PHVRECORD": [
@@ -20667,7 +20609,7 @@
                       "POSITIONOFFSET": 56
                     }
                   ], 
-                  "PHVNUMBER": 299
+                  "PHVNUMBER": 295
                 }, 
                 {
                   "PHVRECORD": [
@@ -20682,7 +20624,7 @@
                       "POSITIONOFFSET": 19
                     }
                   ], 
-                  "PHVNUMBER": 300
+                  "PHVNUMBER": 296
                 }, 
                 {
                   "PHVRECORD": [
@@ -20697,7 +20639,7 @@
                       "POSITIONOFFSET": 63
                     }
                   ], 
-                  "PHVNUMBER": 301
+                  "PHVNUMBER": 297
                 }, 
                 {
                   "PHVRECORD": [
@@ -20712,7 +20654,7 @@
                       "POSITIONOFFSET": 54
                     }
                   ], 
-                  "PHVNUMBER": 332
+                  "PHVNUMBER": 326
                 }, 
                 {
                   "PHVRECORD": [
@@ -20727,7 +20669,7 @@
                       "POSITIONOFFSET": 43
                     }
                   ], 
-                  "PHVNUMBER": 333
+                  "PHVNUMBER": 327
                 }, 
                 {
                   "PHVRECORD": [
@@ -20752,7 +20694,7 @@
                       "POSITIONOFFSET": 5
                     }
                   ], 
-                  "PHVNUMBER": 334
+                  "PHVNUMBER": 328
                 }, 
                 {
                   "PHVRECORD": [
@@ -20765,9 +20707,114 @@
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
                       "POSITIONOFFSET": 32
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_dstPort", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 48
                     }
                   ], 
-                  "PHVNUMBER": 335
+                  "PHVNUMBER": 329
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 330
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_seqNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 69
+                    }
+                  ], 
+                  "PHVNUMBER": 331
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "ethernet_dstAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 8, 
+                      "POSITIONOFFSET": 19
+                    }, 
+                    {
+                      "FIELDWIDTH": 6, 
+                      "FIELDLSB": 40, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 47, 
+                      "PHVNAME": "ethernet_srcAddr", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 63
+                    }
+                  ], 
+                  "PHVNUMBER": 332
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "ethernet_etherType", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 39
+                    }
+                  ], 
+                  "PHVNUMBER": 333
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_out_hdr_egress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 0
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 8, 
+                      "PHVNAME": "packet_in_hdr_ingress_port", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 7, 
+                      "POSITIONOFFSET": 30
+                    }
+                  ], 
+                  "PHVNUMBER": 334
                 }, 
                 {
                   "PHVRECORD": [
@@ -20834,111 +20881,6 @@
                     }
                   ], 
                   "PHVNUMBER": 81
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 63
-                    }
-                  ], 
-                  "PHVNUMBER": 338
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "ethernet_etherType", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 39
-                    }
-                  ], 
-                  "PHVNUMBER": 339
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_out_hdr_egress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 0
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 30
-                    }
-                  ], 
-                  "PHVNUMBER": 340
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_dstPort", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
-                    }
-                  ], 
-                  "PHVNUMBER": 336
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 69
-                    }
-                  ], 
-                  "PHVNUMBER": 337
                 }
               ], 
               "TOTALEGRESSPHVS": 26
@@ -21380,8 +21322,7 @@
         "6": "default_parser", 
         "7": "parse_pkt_out", 
         "8": "<POV initialization>_<Ingress intrinsic metadata>_<Phase 0>", 
-        "9": "start", 
-        "10": "parse_tcp//spilled"
+        "9": "start"
       }, 
       "parser_value_set": []
     }, 
@@ -21412,21 +21353,16 @@
         "stage_tables": [
           {
             "stage_number": 2, 
-            "stage_table_type": "match_with_no_key", 
-            "number_entries": 1, 
+            "stage_table_type": "hash_action", 
+            "number_entries": 1024, 
             "pack_format_length": 1, 
             "pack_format": [
               {
                 "table_word_width": 0, 
                 "memory_word_width": 0, 
-                "entries_per_table_word": 1, 
+                "entries_per_table_word": 0, 
                 "number_memory_units_per_table_word": 0, 
-                "entry_list": [
-                  {
-                    "entry_number": 0, 
-                    "field_list": []
-                  }
-                ]
+                "entry_list": []
               }
             ], 
             "memory_resource_allocation": null, 
@@ -21463,15 +21399,15 @@
                 ], 
                 "match_group_key_bit_width": 16, 
                 "match_group_phv_bit_scrambling": {
-                  "ig_intr_md_for_tm.ucast_egress_port[0]": 0, 
-                  "ig_intr_md_for_tm.ucast_egress_port[1]": 1, 
-                  "ig_intr_md_for_tm.ucast_egress_port[2]": 2, 
-                  "ig_intr_md_for_tm.ucast_egress_port[3]": 3, 
-                  "ig_intr_md_for_tm.ucast_egress_port[4]": 4, 
-                  "ig_intr_md_for_tm.ucast_egress_port[5]": 5, 
-                  "ig_intr_md_for_tm.ucast_egress_port[6]": 6, 
-                  "ig_intr_md_for_tm.ucast_egress_port[7]": 7, 
-                  "ig_intr_md_for_tm.ucast_egress_port[8]": 8
+                  "ig_intr_md_for_tm.ucast_egress_port[0]": 16, 
+                  "ig_intr_md_for_tm.ucast_egress_port[1]": 17, 
+                  "ig_intr_md_for_tm.ucast_egress_port[2]": 18, 
+                  "ig_intr_md_for_tm.ucast_egress_port[3]": 19, 
+                  "ig_intr_md_for_tm.ucast_egress_port[4]": 20, 
+                  "ig_intr_md_for_tm.ucast_egress_port[5]": 21, 
+                  "ig_intr_md_for_tm.ucast_egress_port[6]": 22, 
+                  "ig_intr_md_for_tm.ucast_egress_port[7]": 23, 
+                  "ig_intr_md_for_tm.ucast_egress_port[8]": 24
                 }, 
                 "match_group_match_bit_scrambling": {}, 
                 "seed": [
@@ -21577,8 +21513,8 @@
           {
             "name": "count_ingress", 
             "handle": 536870914, 
-            "allowed_to_be_default_action": true, 
-            "disallowed_as_default_action_reason": null, 
+            "allowed_to_be_default_action": false, 
+            "disallowed_as_default_action_reason": "USES_HASH_DIST", 
             "override_stat_addr_pfe": true, 
             "override_stat_addr": false, 
             "override_stat_full_addr": 0, 
@@ -21609,8 +21545,8 @@
         "default_action": {
           "name": "count_ingress", 
           "handle": 536870914, 
-          "allowed_to_be_default_action": true, 
-          "disallowed_as_default_action_reason": null, 
+          "allowed_to_be_default_action": false, 
+          "disallowed_as_default_action_reason": "USES_HASH_DIST", 
           "override_stat_addr_pfe": true, 
           "override_stat_addr": false, 
           "override_stat_full_addr": 0, 
@@ -21650,7 +21586,7 @@
         "p4_stateful_tables": [], 
         "p4_selection_tables": [], 
         "include_idletime": false, 
-        "performs_hash_action": false, 
+        "performs_hash_action": true, 
         "uses_range": false, 
         "number_entries_with_ranges": 0, 
         "uses_versioning": true, 
@@ -21671,21 +21607,16 @@
         "stage_tables": [
           {
             "stage_number": 2, 
-            "stage_table_type": "match_with_no_key", 
-            "number_entries": 1, 
+            "stage_table_type": "hash_action", 
+            "number_entries": 1024, 
             "pack_format_length": 1, 
             "pack_format": [
               {
                 "table_word_width": 0, 
                 "memory_word_width": 0, 
-                "entries_per_table_word": 1, 
+                "entries_per_table_word": 0, 
                 "number_memory_units_per_table_word": 0, 
-                "entry_list": [
-                  {
-                    "entry_number": 0, 
-                    "field_list": []
-                  }
-                ]
+                "entry_list": []
               }
             ], 
             "memory_resource_allocation": null, 
@@ -21818,8 +21749,8 @@
           {
             "name": "count_egress", 
             "handle": 536870916, 
-            "allowed_to_be_default_action": true, 
-            "disallowed_as_default_action_reason": null, 
+            "allowed_to_be_default_action": false, 
+            "disallowed_as_default_action_reason": "USES_HASH_DIST", 
             "override_stat_addr_pfe": true, 
             "override_stat_addr": false, 
             "override_stat_full_addr": 0, 
@@ -21850,8 +21781,8 @@
         "default_action": {
           "name": "count_egress", 
           "handle": 536870916, 
-          "allowed_to_be_default_action": true, 
-          "disallowed_as_default_action_reason": null, 
+          "allowed_to_be_default_action": false, 
+          "disallowed_as_default_action_reason": "USES_HASH_DIST", 
           "override_stat_addr_pfe": true, 
           "override_stat_addr": false, 
           "override_stat_full_addr": 0, 
@@ -21891,7 +21822,7 @@
         "p4_stateful_tables": [], 
         "p4_selection_tables": [], 
         "include_idletime": false, 
-        "performs_hash_action": false, 
+        "performs_hash_action": true, 
         "uses_range": false, 
         "number_entries_with_ranges": 0, 
         "uses_versioning": true, 
@@ -22103,7 +22034,7 @@
                 "phv_word_address": 130
               }, 
               {
-                "phv_word_address": 67
+                "phv_word_address": 68
               }
             ], 
             "indirect_resources": []
@@ -22156,7 +22087,7 @@
               "phv_word_address": 130
             }, 
             {
-              "phv_word_address": 67
+              "phv_word_address": 68
             }
           ]
         }, 
@@ -23019,16 +22950,16 @@
                   "conditional_extend": false
                 }, 
                 "total_bits": 1, 
-                "hash_algorithm": "crc32", 
-                "hash_output_width": 32
+                "hash_algorithm": "crc16", 
+                "hash_output_width": 16
               }
             ], 
             "stage_primitives": [
               {
-                "phv_word_address": 134
+                "phv_word_address": 135
               }, 
               {
-                "phv_word_address": 135
+                "phv_word_address": 136
               }
             ]
           }, 
@@ -23097,7 +23028,7 @@
                 "phv_word_address": 130
               }, 
               {
-                "phv_word_address": 67
+                "phv_word_address": 68
               }, 
               {
                 "phv_word_address": 129
@@ -23127,7 +23058,7 @@
             ], 
             "stage_primitives": [
               {
-                "phv_word_address": 68
+                "phv_word_address": 69
               }
             ]
           }
@@ -24483,16 +24414,16 @@
                   "conditional_extend": false
                 }, 
                 "total_bits": 1, 
-                "hash_algorithm": "crc32", 
-                "hash_output_width": 32
+                "hash_algorithm": "crc16", 
+                "hash_output_width": 16
               }
             ], 
             "stage_primitives": [
               {
-                "phv_word_address": 134
+                "phv_word_address": 135
               }, 
               {
-                "phv_word_address": 135
+                "phv_word_address": 136
               }
             ], 
             "indirect_resources": []
@@ -24562,7 +24493,7 @@
                 "phv_word_address": 130
               }, 
               {
-                "phv_word_address": 67
+                "phv_word_address": 68
               }, 
               {
                 "phv_word_address": 129
@@ -24593,7 +24524,7 @@
             ], 
             "stage_primitives": [
               {
-                "phv_word_address": 68
+                "phv_word_address": 69
               }
             ], 
             "indirect_resources": []
@@ -25668,7 +25599,7 @@
         "name": "ingress_port_counter", 
         "handle": 67108865, 
         "direction": "ingress", 
-        "number_entries": 510, 
+        "number_entries": 512, 
         "stage_tables_length": 1, 
         "stage_tables": [
           {
@@ -25776,7 +25707,7 @@
         "name": "egress_port_counter", 
         "handle": 67108866, 
         "direction": "ingress", 
-        "number_entries": 510, 
+        "number_entries": 512, 
         "stage_tables_length": 1, 
         "stage_tables": [
           {
@@ -26178,7 +26109,7 @@
     }, 
     {
       "0": {
-        "67": {
+        "68": {
           "0": "packet_in_hdr", 
           "1": "packet_out_hdr", 
           "2": "ethernet",