diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/context/mau.context.json b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/context/mau.context.json
index c29a162..8a5de37 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/context/mau.context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/context/mau.context.json
@@ -1,7 +1,7 @@
 {
   "ProgramInfo": {
     "ProgramName": "default", 
-    "BuildDate": "Thu Sep  7 13:56:23 2017", 
+    "BuildDate": "Fri Sep  8 08:24:01 2017", 
     "CompilerVersion": "5.1.0"
   }, 
   "HashJsonNode": {
@@ -13,7 +13,7 @@
   "EntryFormatNode": {
     "ExmEntryFormat": {
       "AllExmTables": [], 
-      "TotalExmTables": 5
+      "TotalExmTables": 4
     }, 
     "Phase0EntryFormat": {
       "Phase0Action": [], 
@@ -28,7 +28,7 @@
         "SPECFORMAT": []
       }, 
       {
-        "TableHandle": 16777221, 
+        "TableHandle": 16777220, 
         "SPECFORMAT": [
           {
             "MATCHTYPE": "ternary", 
@@ -57,10 +57,6 @@
         ]
       }, 
       {
-        "TableHandle": 16777220, 
-        "SPECFORMAT": []
-      }, 
-      {
         "TableHandle": 16777219, 
         "SPECFORMAT": []
       }, 
@@ -74,7 +70,7 @@
       "AllTindTables": [
         {
           "TindTableName": "table0", 
-          "TindTableHandle": 16777221, 
+          "TindTableHandle": 16777220, 
           "TindTableFormat": [
             {
               "TindMatchEntryFormat": [
@@ -297,7 +293,7 @@
               ], 
               "TindActionHandleCount": 3, 
               "TindMatchEntryFieldCount": 12, 
-              "TindActionImmediateCount": 1, 
+              "TindActionImmediateCount": 2, 
               "TindMatchEntryCount": 4, 
               "TindActionHandles": [
                 {
@@ -305,28 +301,8 @@
                   "OVERRIDE_METER_ADDR_PFE": false, 
                   "OVERRIDE_STAT_ADDR_PFE": false, 
                   "IMMEDIATE": {
-                    "table_name": "_condition_2", 
-                    "action_name": "_drop", 
-                    "next_tbl": 0, 
-                    "next_tbl_full": 32, 
-                    "instr": 7
-                  }, 
-                  "OVERRIDE_STATEFUL_ADDR_PFE": false, 
-                  "OVERRIDE_METER_FULL_ADDR": 0, 
-                  "ImmediateCount": 0, 
-                  "OVERRIDE_STAT_ADDR": false, 
-                  "ACTION_HDL": 536870928, 
-                  "OVERRIDE_STATEFUL_FULL_ADDR": 0, 
-                  "OVERRIDE_METER_ADDR": false, 
-                  "OVERRIDE_STATEFUL_ADDR": false
-                }, 
-                {
-                  "OVERRIDE_STAT_FULL_ADDR": 0, 
-                  "OVERRIDE_METER_ADDR_PFE": false, 
-                  "OVERRIDE_STAT_ADDR_PFE": false, 
-                  "IMMEDIATE": {
                     "instr": 5, 
-                    "next_tbl_full": 32, 
+                    "next_tbl_full": 16, 
                     "action_name": "set_egress_port", 
                     "table_name": "_condition_2", 
                     "next_tbl": 0, 
@@ -347,7 +323,39 @@
                   "OVERRIDE_METER_FULL_ADDR": 0, 
                   "ImmediateCount": 1, 
                   "OVERRIDE_STAT_ADDR": false, 
-                  "ACTION_HDL": 536870924, 
+                  "ACTION_HDL": 536870921, 
+                  "OVERRIDE_STATEFUL_FULL_ADDR": 0, 
+                  "OVERRIDE_METER_ADDR": false, 
+                  "OVERRIDE_STATEFUL_ADDR": false
+                }, 
+                {
+                  "OVERRIDE_STAT_FULL_ADDR": 0, 
+                  "OVERRIDE_METER_ADDR_PFE": false, 
+                  "OVERRIDE_STAT_ADDR_PFE": false, 
+                  "IMMEDIATE": {
+                    "instr": 6, 
+                    "next_tbl_full": 16, 
+                    "action_name": "send_to_cpu", 
+                    "table_name": "_condition_2", 
+                    "next_tbl": 0, 
+                    "--immediate--": [
+                      {
+                        "DSTSTART": 0, 
+                        "PARAMNAME": "--constant-0--", 
+                        "PARAMVAL": 320, 
+                        "PARAMTYPE": "constant", 
+                        "PARAMSTART": 0, 
+                        "PARAMWIDTH": 0, 
+                        "PARAMSHIFT": 0, 
+                        "DSTWIDTH": 9
+                      }
+                    ]
+                  }, 
+                  "OVERRIDE_STATEFUL_ADDR_PFE": false, 
+                  "OVERRIDE_METER_FULL_ADDR": 0, 
+                  "ImmediateCount": 1, 
+                  "OVERRIDE_STAT_ADDR": false, 
+                  "ACTION_HDL": 536870925, 
                   "OVERRIDE_STATEFUL_FULL_ADDR": 0, 
                   "OVERRIDE_METER_ADDR": false, 
                   "OVERRIDE_STATEFUL_ADDR": false
@@ -358,22 +366,22 @@
                   "OVERRIDE_STAT_ADDR_PFE": false, 
                   "IMMEDIATE": {
                     "table_name": "_condition_2", 
-                    "action_name": "send_to_cpu", 
+                    "action_name": "_drop", 
                     "next_tbl": 0, 
-                    "next_tbl_full": 32, 
-                    "instr": 6
+                    "next_tbl_full": 16, 
+                    "instr": 7
                   }, 
                   "OVERRIDE_STATEFUL_ADDR_PFE": false, 
                   "OVERRIDE_METER_FULL_ADDR": 0, 
                   "ImmediateCount": 0, 
                   "OVERRIDE_STAT_ADDR": false, 
-                  "ACTION_HDL": 536870926, 
+                  "ACTION_HDL": 536870927, 
                   "OVERRIDE_STATEFUL_FULL_ADDR": 0, 
                   "OVERRIDE_METER_ADDR": false, 
                   "OVERRIDE_STATEFUL_ADDR": false
                 }
               ], 
-              "Stage": 1
+              "Stage": 0
             }
           ]
         }
@@ -392,16 +400,11 @@
       }, 
       {
         "ActionHandle": 536870919, 
-        "action_function": "_packet_out", 
+        "action_function": "_process_packet_out", 
         "ACTIONSPECFORMAT": []
       }, 
       {
-        "ActionHandle": 536870922, 
-        "action_function": "add_packet_in_hdr", 
-        "ACTIONSPECFORMAT": []
-      }, 
-      {
-        "ActionHandle": 536870924, 
+        "ActionHandle": 536870921, 
         "action_function": "set_egress_port", 
         "ACTIONSPECFORMAT": [
           {
@@ -412,12 +415,12 @@
         ]
       }, 
       {
-        "ActionHandle": 536870926, 
+        "ActionHandle": 536870925, 
         "action_function": "send_to_cpu", 
         "ACTIONSPECFORMAT": []
       }, 
       {
-        "ActionHandle": 536870928, 
+        "ActionHandle": 536870927, 
         "action_function": "_drop", 
         "ACTIONSPECFORMAT": []
       }
@@ -425,7 +428,7 @@
     "TernEntryFormat": {
       "AllTernTables": [
         {
-          "TernTableHandle": 16777221, 
+          "TernTableHandle": 16777220, 
           "TernTableName": "table0", 
           "TernTableFormat": [
             {
@@ -815,12 +818,12 @@
                 }
               ], 
               "TernEntryFieldCount": 22, 
-              "Stage": 1
+              "Stage": 0
             }
           ]
         }
       ], 
-      "TotalTernTables": 5
+      "TotalTernTables": 4
     }, 
     "AdtEntryFormat": {
       "AllActionDataTables": [
@@ -855,7 +858,7 @@
                     }
                   ], 
                   "ActFuncEntryCount": 1, 
-                  "Stage": 2
+                  "Stage": 1
                 }
               ]
             }
@@ -896,7 +899,7 @@
                     }
                   ], 
                   "ActFuncEntryCount": 1, 
-                  "Stage": 2
+                  "Stage": 1
                 }
               ]
             }
@@ -911,7 +914,7 @@
           "ActFuncTotalEntries": 1, 
           "ActionDataTableFormat": [
             {
-              "ActFuncName": "_packet_out", 
+              "ActFuncName": "_process_packet_out", 
               "ActFuncHandle": 536870919, 
               "ActFuncStageCount": 1, 
               "ActFuncFormat": [
@@ -948,12 +951,74 @@
           "ActionDataTableHandle": 33554435
         }, 
         {
-          "ActFuncTotalStageCount": 1, 
-          "ActFuncTotalEntries": 1, 
+          "ActFuncTotalStageCount": 3, 
+          "ActFuncTotalEntries": 3, 
           "ActionDataTableFormat": [
             {
-              "ActFuncName": "add_packet_in_hdr", 
-              "ActFuncHandle": 536870922, 
+              "ActFuncName": "set_egress_port", 
+              "ActFuncHandle": 536870921, 
+              "ActFuncStageCount": 1, 
+              "ActFuncFormat": [
+                {
+                  "ActFuncEntryFormat": [
+                    {
+                      "Entry": 0, 
+                      "EntryFieldCount": 1, 
+                      "EntryConstTupCount": 0, 
+                      "EntryFormat": [
+                        {
+                          "FIELDWIDTH": 0, 
+                          "SOURCENAME": "ZERO", 
+                          "SHIFT": 0, 
+                          "WORDINDEX": 1, 
+                          "MASKBITOFFSET": "NULL", 
+                          "SOURCEOFFSET": 0, 
+                          "FIELDNAME": "--padding--", 
+                          "FIELDOFFSET": 0, 
+                          "SOURCEWIDTH": 0
+                        }
+                      ]
+                    }
+                  ], 
+                  "ActFuncEntryCount": 1, 
+                  "Stage": 0
+                }
+              ]
+            }, 
+            {
+              "ActFuncName": "send_to_cpu", 
+              "ActFuncHandle": 536870925, 
+              "ActFuncStageCount": 1, 
+              "ActFuncFormat": [
+                {
+                  "ActFuncEntryFormat": [
+                    {
+                      "Entry": 0, 
+                      "EntryFieldCount": 1, 
+                      "EntryConstTupCount": 0, 
+                      "EntryFormat": [
+                        {
+                          "FIELDWIDTH": 0, 
+                          "SOURCENAME": "ZERO", 
+                          "SHIFT": 0, 
+                          "WORDINDEX": 1, 
+                          "MASKBITOFFSET": "NULL", 
+                          "SOURCEOFFSET": 0, 
+                          "FIELDNAME": "--padding--", 
+                          "FIELDOFFSET": 0, 
+                          "SOURCEWIDTH": 0
+                        }
+                      ]
+                    }
+                  ], 
+                  "ActFuncEntryCount": 1, 
+                  "Stage": 0
+                }
+              ]
+            }, 
+            {
+              "ActFuncName": "_drop", 
+              "ActFuncHandle": 536870927, 
               "ActFuncStageCount": 1, 
               "ActFuncFormat": [
                 {
@@ -983,123 +1048,20 @@
               ]
             }
           ], 
-          "ActFuncHandleTotalCount": 1, 
-          "ActFuncTotalEntryFieldCount": 1, 
-          "ActFuncTotalConstTupleList": 0, 
-          "ActionDataTableHandle": 33554436
-        }, 
-        {
-          "ActFuncTotalStageCount": 3, 
-          "ActFuncTotalEntries": 3, 
-          "ActionDataTableFormat": [
-            {
-              "ActFuncName": "_drop", 
-              "ActFuncHandle": 536870928, 
-              "ActFuncStageCount": 1, 
-              "ActFuncFormat": [
-                {
-                  "ActFuncEntryFormat": [
-                    {
-                      "Entry": 0, 
-                      "EntryFieldCount": 1, 
-                      "EntryConstTupCount": 0, 
-                      "EntryFormat": [
-                        {
-                          "FIELDWIDTH": 0, 
-                          "SOURCENAME": "ZERO", 
-                          "SHIFT": 0, 
-                          "WORDINDEX": 1, 
-                          "MASKBITOFFSET": "NULL", 
-                          "SOURCEOFFSET": 0, 
-                          "FIELDNAME": "--padding--", 
-                          "FIELDOFFSET": 0, 
-                          "SOURCEWIDTH": 0
-                        }
-                      ]
-                    }
-                  ], 
-                  "ActFuncEntryCount": 1, 
-                  "Stage": 1
-                }
-              ]
-            }, 
-            {
-              "ActFuncName": "set_egress_port", 
-              "ActFuncHandle": 536870924, 
-              "ActFuncStageCount": 1, 
-              "ActFuncFormat": [
-                {
-                  "ActFuncEntryFormat": [
-                    {
-                      "Entry": 0, 
-                      "EntryFieldCount": 1, 
-                      "EntryConstTupCount": 0, 
-                      "EntryFormat": [
-                        {
-                          "FIELDWIDTH": 0, 
-                          "SOURCENAME": "ZERO", 
-                          "SHIFT": 0, 
-                          "WORDINDEX": 1, 
-                          "MASKBITOFFSET": "NULL", 
-                          "SOURCEOFFSET": 0, 
-                          "FIELDNAME": "--padding--", 
-                          "FIELDOFFSET": 0, 
-                          "SOURCEWIDTH": 0
-                        }
-                      ]
-                    }
-                  ], 
-                  "ActFuncEntryCount": 1, 
-                  "Stage": 1
-                }
-              ]
-            }, 
-            {
-              "ActFuncName": "send_to_cpu", 
-              "ActFuncHandle": 536870926, 
-              "ActFuncStageCount": 1, 
-              "ActFuncFormat": [
-                {
-                  "ActFuncEntryFormat": [
-                    {
-                      "Entry": 0, 
-                      "EntryFieldCount": 1, 
-                      "EntryConstTupCount": 0, 
-                      "EntryFormat": [
-                        {
-                          "FIELDWIDTH": 0, 
-                          "SOURCENAME": "ZERO", 
-                          "SHIFT": 0, 
-                          "WORDINDEX": 1, 
-                          "MASKBITOFFSET": "NULL", 
-                          "SOURCEOFFSET": 0, 
-                          "FIELDNAME": "--padding--", 
-                          "FIELDOFFSET": 0, 
-                          "SOURCEWIDTH": 0
-                        }
-                      ]
-                    }
-                  ], 
-                  "ActFuncEntryCount": 1, 
-                  "Stage": 1
-                }
-              ]
-            }
-          ], 
           "ActFuncHandleTotalCount": 3, 
           "ActFuncTotalEntryFieldCount": 3, 
           "ActFuncTotalConstTupleList": 0, 
-          "ActionDataTableHandle": 33554437
+          "ActionDataTableHandle": 33554436
         }
       ], 
-      "TotalAdTables": 5
+      "TotalAdTables": 4
     }, 
     "SnapShot": {
       "PhvDetails": [
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 58, 
-          "TOTALPHVRECORDS": 90, 
+          "TOTALSTAGEPHVS": 56, 
+          "TOTALPHVRECORDS": 89, 
           "Phvs": [
             {
               "PHVDIRECTION": 0, 
@@ -1118,7 +1080,7 @@
                           "HEADER": "--pov_reserved--_0", 
                           "POVBIT": 0, 
                           "HIDDEN": true, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 76
                         }
                       ]
                     }
@@ -1135,7 +1097,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
                   "PHVNUMBER": 1
@@ -1150,7 +1112,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 2
@@ -1165,7 +1127,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -1175,7 +1137,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 131
@@ -1200,31 +1162,6 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 2
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_urgentPtr", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
-                    }
-                  ], 
-                  "PHVNUMBER": 261
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 8, 
                       "PHVNAME": "packet_out_hdr_egress_port", 
@@ -1240,7 +1177,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -1248,21 +1185,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
-                    }
-                  ], 
-                  "PHVNUMBER": 324
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -1270,7 +1192,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 31
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -1295,7 +1217,7 @@
                       "PHVNAME": "ig_intr_md_for_tm_ucast_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 40
                     }
                   ], 
                   "PHVNUMBER": 130
@@ -1310,7 +1232,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 52
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -1320,7 +1242,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -1345,7 +1267,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 60
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 320
@@ -1353,41 +1275,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 65
-                    }
-                  ], 
-                  "PHVNUMBER": 259
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -1395,7 +1282,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 43
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -1405,7 +1292,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 63
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -1415,7 +1302,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 13
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -1425,7 +1312,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 36
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -1435,7 +1322,52 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 47
+                      "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 18
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 64
+                    }
+                  ], 
+                  "PHVNUMBER": 259
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 2
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_urgentPtr", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 260
@@ -1450,7 +1382,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 43
+                      "POSITIONOFFSET": 42
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -1460,7 +1392,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 288
@@ -1490,7 +1422,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -1500,7 +1432,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 290
@@ -1515,7 +1447,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -1525,7 +1457,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -1533,6 +1465,36 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 292
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 293
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -1540,7 +1502,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 14
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -1555,7 +1517,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 49
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 321
@@ -1563,21 +1525,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 64
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -1585,10 +1532,10 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 64
                 }, 
                 {
                   "PHVRECORD": [
@@ -1600,10 +1547,10 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 65
                 }, 
                 {
                   "PHVRECORD": [
@@ -1619,42 +1566,42 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 78
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 79
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 80
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 82
+                          "POSITIONOFFSET": 81
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 83
+                          "POSITIONOFFSET": 82
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -1669,7 +1616,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 68
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -1681,7 +1628,22 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
+                      "POSITIONOFFSET": 72
+                    }
+                  ], 
+                  "PHVNUMBER": 324
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -1691,12 +1653,27 @@
                     {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
+                    }
+                  ], 
+                  "PHVNUMBER": 326
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 31, 
                       "FIELDMSB": 31, 
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 56
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 258
@@ -1721,7 +1698,7 @@
                       "PHVNAME": "ipv4_fragOffset", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 45
+                      "POSITIONOFFSET": 44
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -1729,14 +1706,14 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 72
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -1746,13 +1723,13 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 54
+                      "POSITIONOFFSET": 53
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 29
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -1767,7 +1744,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 50
+                      "POSITIONOFFSET": 47
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -1777,7 +1754,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 18
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -1787,7 +1764,7 @@
                       "PHVNAME": "ipv4_hdrChecksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 11
+                      "POSITIONOFFSET": 9
                     }
                   ], 
                   "PHVNUMBER": 264
@@ -1802,7 +1779,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 12
                     }
                   ], 
                   "PHVNUMBER": 265
@@ -1817,7 +1794,7 @@
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 266
@@ -1832,7 +1809,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 25
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -1842,7 +1819,7 @@
                       "PHVNAME": "udp_length_", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
+                      "POSITIONOFFSET": 16
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -1852,7 +1829,7 @@
                       "PHVNAME": "udp_checksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 267
@@ -1867,7 +1844,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 38
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -1877,7 +1854,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 58
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -1887,7 +1864,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 11
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -1897,7 +1874,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 34
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -1907,7 +1884,7 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 41
                     }
                   ], 
                   "PHVNUMBER": 268
@@ -1932,7 +1909,7 @@
                       "PHVNAME": "tcp_urgentPtr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
+                      "POSITIONOFFSET": 45
                     }
                   ], 
                   "PHVNUMBER": 269
@@ -1947,7 +1924,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 270
@@ -1962,7 +1939,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 271
@@ -1974,43 +1951,13 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 8, 
                       "FIELDMSB": 8, 
-                      "PHVNAME": "ig_intr_md_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 9
-                    }
-                  ], 
-                  "PHVNUMBER": 144
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 145
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 8, 
-                      "FIELDMSB": 8, 
                       "PHVNAME": "eg_intr_md_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 146
+                  "PHVNUMBER": 144
                 }, 
                 {
                   "PHVRECORD": [
@@ -2022,7 +1969,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 29
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -2032,7 +1979,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 37
                     }
                   ], 
                   "PHVNUMBER": 296
@@ -2062,7 +2009,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -2072,7 +2019,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 298
@@ -2087,7 +2034,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -2097,7 +2044,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 299
@@ -2112,7 +2059,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 300
@@ -2127,7 +2074,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 301
@@ -2142,7 +2089,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 57
+                      "POSITIONOFFSET": 54
                     }
                   ], 
                   "PHVNUMBER": 332
@@ -2157,7 +2104,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 46
+                      "POSITIONOFFSET": 43
                     }
                   ], 
                   "PHVNUMBER": 333
@@ -2197,7 +2144,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 335
@@ -2207,21 +2154,6 @@
                     {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 80
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 2, 
                       "FIELDMSB": 2, 
                       "PHVNAME": "eg_intr_md_egress_cos", 
@@ -2230,7 +2162,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 81
+                  "PHVNUMBER": 80
                 }, 
                 {
                   "PHVRECORD": [
@@ -2246,42 +2178,67 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 76
+                          "POSITIONOFFSET": 73
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 74
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 75
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 76
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 78
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 82
+                  "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": [
@@ -2293,7 +2250,7 @@
                       "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 42
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 339
@@ -2309,6 +2266,16 @@
                       "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
@@ -2323,7 +2290,7 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -2333,7 +2300,7 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 336
@@ -2348,46 +2315,21 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }
                   ], 
                   "PHVNUMBER": 337
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
-                    }
-                  ], 
-                  "PHVNUMBER": 338
                 }
               ], 
-              "TOTALEGRESSPHVS": 29
+              "TOTALEGRESSPHVS": 26
             }
           ], 
           "Stage": 0
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 58, 
-          "TOTALPHVRECORDS": 90, 
+          "TOTALSTAGEPHVS": 56, 
+          "TOTALPHVRECORDS": 89, 
           "Phvs": [
             {
               "PHVDIRECTION": 0, 
@@ -2406,7 +2348,7 @@
                           "HEADER": "--pov_reserved--_0", 
                           "POVBIT": 0, 
                           "HIDDEN": true, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 76
                         }
                       ]
                     }
@@ -2423,7 +2365,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
                   "PHVNUMBER": 1
@@ -2438,7 +2380,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 2
@@ -2453,7 +2395,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -2463,7 +2405,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 131
@@ -2488,31 +2430,6 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 2
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_urgentPtr", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
-                    }
-                  ], 
-                  "PHVNUMBER": 261
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 8, 
                       "PHVNAME": "packet_out_hdr_egress_port", 
@@ -2528,7 +2445,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -2536,21 +2453,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
-                    }
-                  ], 
-                  "PHVNUMBER": 324
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -2558,7 +2460,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 31
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -2583,7 +2485,7 @@
                       "PHVNAME": "ig_intr_md_for_tm_ucast_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 40
                     }
                   ], 
                   "PHVNUMBER": 130
@@ -2598,7 +2500,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 52
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -2608,7 +2510,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -2633,7 +2535,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 60
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 320
@@ -2641,41 +2543,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 65
-                    }
-                  ], 
-                  "PHVNUMBER": 259
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -2683,7 +2550,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 43
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -2693,7 +2560,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 63
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -2703,7 +2570,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 13
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -2713,7 +2580,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 36
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -2723,7 +2590,52 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 47
+                      "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 18
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 64
+                    }
+                  ], 
+                  "PHVNUMBER": 259
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 2
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_urgentPtr", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 260
@@ -2738,7 +2650,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 43
+                      "POSITIONOFFSET": 42
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -2748,7 +2660,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 288
@@ -2778,7 +2690,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -2788,7 +2700,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 290
@@ -2803,7 +2715,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -2813,7 +2725,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -2821,6 +2733,36 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 292
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 293
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -2828,7 +2770,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 14
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -2843,7 +2785,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 49
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 321
@@ -2851,21 +2793,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 64
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -2873,10 +2800,10 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 64
                 }, 
                 {
                   "PHVRECORD": [
@@ -2888,10 +2815,10 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 65
                 }, 
                 {
                   "PHVRECORD": [
@@ -2907,42 +2834,42 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 78
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 79
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 80
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 82
+                          "POSITIONOFFSET": 81
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 83
+                          "POSITIONOFFSET": 82
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -2957,7 +2884,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 68
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -2969,7 +2896,22 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
+                      "POSITIONOFFSET": 72
+                    }
+                  ], 
+                  "PHVNUMBER": 324
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -2979,12 +2921,27 @@
                     {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
+                    }
+                  ], 
+                  "PHVNUMBER": 326
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 31, 
                       "FIELDMSB": 31, 
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 56
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 258
@@ -3009,7 +2966,7 @@
                       "PHVNAME": "ipv4_fragOffset", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 45
+                      "POSITIONOFFSET": 44
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -3017,14 +2974,14 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 72
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -3034,13 +2991,13 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 54
+                      "POSITIONOFFSET": 53
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 29
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -3055,7 +3012,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 50
+                      "POSITIONOFFSET": 47
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -3065,7 +3022,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 18
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -3075,7 +3032,7 @@
                       "PHVNAME": "ipv4_hdrChecksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 11
+                      "POSITIONOFFSET": 9
                     }
                   ], 
                   "PHVNUMBER": 264
@@ -3090,7 +3047,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 12
                     }
                   ], 
                   "PHVNUMBER": 265
@@ -3105,7 +3062,7 @@
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 266
@@ -3120,7 +3077,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 25
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -3130,7 +3087,7 @@
                       "PHVNAME": "udp_length_", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
+                      "POSITIONOFFSET": 16
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -3140,7 +3097,7 @@
                       "PHVNAME": "udp_checksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 267
@@ -3155,7 +3112,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 38
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -3165,7 +3122,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 58
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -3175,7 +3132,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 11
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -3185,7 +3142,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 34
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -3195,7 +3152,7 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 41
                     }
                   ], 
                   "PHVNUMBER": 268
@@ -3220,7 +3177,7 @@
                       "PHVNAME": "tcp_urgentPtr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
+                      "POSITIONOFFSET": 45
                     }
                   ], 
                   "PHVNUMBER": 269
@@ -3235,7 +3192,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 270
@@ -3250,7 +3207,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 271
@@ -3262,43 +3219,13 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 8, 
                       "FIELDMSB": 8, 
-                      "PHVNAME": "ig_intr_md_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 9
-                    }
-                  ], 
-                  "PHVNUMBER": 144
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 145
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 8, 
-                      "FIELDMSB": 8, 
                       "PHVNAME": "eg_intr_md_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 146
+                  "PHVNUMBER": 144
                 }, 
                 {
                   "PHVRECORD": [
@@ -3310,7 +3237,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 29
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -3320,7 +3247,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 37
                     }
                   ], 
                   "PHVNUMBER": 296
@@ -3350,7 +3277,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -3360,7 +3287,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 298
@@ -3375,7 +3302,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -3385,7 +3312,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 299
@@ -3400,7 +3327,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 300
@@ -3415,7 +3342,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 301
@@ -3430,7 +3357,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 57
+                      "POSITIONOFFSET": 54
                     }
                   ], 
                   "PHVNUMBER": 332
@@ -3445,7 +3372,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 46
+                      "POSITIONOFFSET": 43
                     }
                   ], 
                   "PHVNUMBER": 333
@@ -3485,7 +3412,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 335
@@ -3495,21 +3422,6 @@
                     {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 80
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 2, 
                       "FIELDMSB": 2, 
                       "PHVNAME": "eg_intr_md_egress_cos", 
@@ -3518,7 +3430,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 81
+                  "PHVNUMBER": 80
                 }, 
                 {
                   "PHVRECORD": [
@@ -3534,42 +3446,67 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 76
+                          "POSITIONOFFSET": 73
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 74
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 75
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 76
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 78
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 82
+                  "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": [
@@ -3581,7 +3518,7 @@
                       "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 42
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 339
@@ -3597,6 +3534,16 @@
                       "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
@@ -3611,7 +3558,7 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -3621,7 +3568,7 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 336
@@ -3636,46 +3583,21 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }
                   ], 
                   "PHVNUMBER": 337
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
-                    }
-                  ], 
-                  "PHVNUMBER": 338
                 }
               ], 
-              "TOTALEGRESSPHVS": 29
+              "TOTALEGRESSPHVS": 26
             }
           ], 
           "Stage": 1
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 58, 
-          "TOTALPHVRECORDS": 90, 
+          "TOTALSTAGEPHVS": 56, 
+          "TOTALPHVRECORDS": 89, 
           "Phvs": [
             {
               "PHVDIRECTION": 0, 
@@ -3694,7 +3616,7 @@
                           "HEADER": "--pov_reserved--_0", 
                           "POVBIT": 0, 
                           "HIDDEN": true, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 76
                         }
                       ]
                     }
@@ -3711,7 +3633,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
                   "PHVNUMBER": 1
@@ -3726,7 +3648,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 2
@@ -3741,7 +3663,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -3751,7 +3673,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 131
@@ -3776,31 +3698,6 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 2
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_urgentPtr", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
-                    }
-                  ], 
-                  "PHVNUMBER": 261
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 8, 
                       "PHVNAME": "packet_out_hdr_egress_port", 
@@ -3816,7 +3713,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -3824,21 +3721,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
-                    }
-                  ], 
-                  "PHVNUMBER": 324
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -3846,7 +3728,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 31
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -3871,7 +3753,7 @@
                       "PHVNAME": "ig_intr_md_for_tm_ucast_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 40
                     }
                   ], 
                   "PHVNUMBER": 130
@@ -3886,7 +3768,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 52
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -3896,7 +3778,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -3921,7 +3803,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 60
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 320
@@ -3929,41 +3811,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 65
-                    }
-                  ], 
-                  "PHVNUMBER": 259
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -3971,7 +3818,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 43
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -3981,7 +3828,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 63
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -3991,7 +3838,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 13
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -4001,7 +3848,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 36
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -4011,7 +3858,52 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 47
+                      "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 18
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 64
+                    }
+                  ], 
+                  "PHVNUMBER": 259
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 2
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_urgentPtr", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 260
@@ -4026,7 +3918,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 43
+                      "POSITIONOFFSET": 42
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -4036,7 +3928,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 288
@@ -4066,7 +3958,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -4076,7 +3968,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 290
@@ -4091,7 +3983,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -4101,7 +3993,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -4109,6 +4001,36 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 292
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 293
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -4116,7 +4038,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 14
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -4131,7 +4053,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 49
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 321
@@ -4139,21 +4061,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 64
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -4161,10 +4068,10 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 64
                 }, 
                 {
                   "PHVRECORD": [
@@ -4176,10 +4083,10 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 65
                 }, 
                 {
                   "PHVRECORD": [
@@ -4195,42 +4102,42 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 78
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 79
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 80
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 82
+                          "POSITIONOFFSET": 81
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 83
+                          "POSITIONOFFSET": 82
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -4245,7 +4152,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 68
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -4257,7 +4164,22 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
+                      "POSITIONOFFSET": 72
+                    }
+                  ], 
+                  "PHVNUMBER": 324
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -4267,12 +4189,27 @@
                     {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
+                    }
+                  ], 
+                  "PHVNUMBER": 326
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 31, 
                       "FIELDMSB": 31, 
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 56
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 258
@@ -4297,7 +4234,7 @@
                       "PHVNAME": "ipv4_fragOffset", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 45
+                      "POSITIONOFFSET": 44
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -4305,14 +4242,14 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 72
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -4322,13 +4259,13 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 54
+                      "POSITIONOFFSET": 53
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 29
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -4343,7 +4280,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 50
+                      "POSITIONOFFSET": 47
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -4353,7 +4290,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 18
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -4363,7 +4300,7 @@
                       "PHVNAME": "ipv4_hdrChecksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 11
+                      "POSITIONOFFSET": 9
                     }
                   ], 
                   "PHVNUMBER": 264
@@ -4378,7 +4315,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 12
                     }
                   ], 
                   "PHVNUMBER": 265
@@ -4393,7 +4330,7 @@
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 266
@@ -4408,7 +4345,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 25
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -4418,7 +4355,7 @@
                       "PHVNAME": "udp_length_", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
+                      "POSITIONOFFSET": 16
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -4428,7 +4365,7 @@
                       "PHVNAME": "udp_checksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 267
@@ -4443,7 +4380,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 38
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -4453,7 +4390,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 58
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -4463,7 +4400,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 11
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -4473,7 +4410,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 34
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -4483,7 +4420,7 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 41
                     }
                   ], 
                   "PHVNUMBER": 268
@@ -4508,7 +4445,7 @@
                       "PHVNAME": "tcp_urgentPtr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
+                      "POSITIONOFFSET": 45
                     }
                   ], 
                   "PHVNUMBER": 269
@@ -4523,7 +4460,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 270
@@ -4538,7 +4475,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 271
@@ -4550,43 +4487,13 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 8, 
                       "FIELDMSB": 8, 
-                      "PHVNAME": "ig_intr_md_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 9
-                    }
-                  ], 
-                  "PHVNUMBER": 144
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 145
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 8, 
-                      "FIELDMSB": 8, 
                       "PHVNAME": "eg_intr_md_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 146
+                  "PHVNUMBER": 144
                 }, 
                 {
                   "PHVRECORD": [
@@ -4598,7 +4505,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 29
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -4608,7 +4515,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 37
                     }
                   ], 
                   "PHVNUMBER": 296
@@ -4638,7 +4545,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -4648,7 +4555,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 298
@@ -4663,7 +4570,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -4673,7 +4580,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 299
@@ -4688,7 +4595,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 300
@@ -4703,7 +4610,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 301
@@ -4718,7 +4625,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 57
+                      "POSITIONOFFSET": 54
                     }
                   ], 
                   "PHVNUMBER": 332
@@ -4733,7 +4640,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 46
+                      "POSITIONOFFSET": 43
                     }
                   ], 
                   "PHVNUMBER": 333
@@ -4773,7 +4680,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 335
@@ -4783,21 +4690,6 @@
                     {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 80
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 2, 
                       "FIELDMSB": 2, 
                       "PHVNAME": "eg_intr_md_egress_cos", 
@@ -4806,7 +4698,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 81
+                  "PHVNUMBER": 80
                 }, 
                 {
                   "PHVRECORD": [
@@ -4822,42 +4714,67 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 76
+                          "POSITIONOFFSET": 73
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 74
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 75
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 76
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 78
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 82
+                  "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": [
@@ -4869,7 +4786,7 @@
                       "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 42
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 339
@@ -4885,6 +4802,16 @@
                       "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
@@ -4899,7 +4826,7 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -4909,7 +4836,7 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 336
@@ -4924,46 +4851,21 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }
                   ], 
                   "PHVNUMBER": 337
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
-                    }
-                  ], 
-                  "PHVNUMBER": 338
                 }
               ], 
-              "TOTALEGRESSPHVS": 29
+              "TOTALEGRESSPHVS": 26
             }
           ], 
           "Stage": 2
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 58, 
-          "TOTALPHVRECORDS": 90, 
+          "TOTALSTAGEPHVS": 56, 
+          "TOTALPHVRECORDS": 89, 
           "Phvs": [
             {
               "PHVDIRECTION": 0, 
@@ -4982,7 +4884,7 @@
                           "HEADER": "--pov_reserved--_0", 
                           "POVBIT": 0, 
                           "HIDDEN": true, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 76
                         }
                       ]
                     }
@@ -4999,7 +4901,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
                   "PHVNUMBER": 1
@@ -5014,7 +4916,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 2
@@ -5029,7 +4931,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -5039,7 +4941,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 131
@@ -5064,31 +4966,6 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 2
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_urgentPtr", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
-                    }
-                  ], 
-                  "PHVNUMBER": 261
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 8, 
                       "PHVNAME": "packet_out_hdr_egress_port", 
@@ -5104,7 +4981,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -5112,21 +4989,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
-                    }
-                  ], 
-                  "PHVNUMBER": 324
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -5134,7 +4996,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 31
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -5159,7 +5021,7 @@
                       "PHVNAME": "ig_intr_md_for_tm_ucast_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 40
                     }
                   ], 
                   "PHVNUMBER": 130
@@ -5174,7 +5036,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 52
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -5184,7 +5046,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -5209,7 +5071,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 60
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 320
@@ -5217,41 +5079,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 65
-                    }
-                  ], 
-                  "PHVNUMBER": 259
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -5259,7 +5086,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 43
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -5269,7 +5096,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 63
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -5279,7 +5106,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 13
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -5289,7 +5116,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 36
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -5299,7 +5126,52 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 47
+                      "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 18
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 64
+                    }
+                  ], 
+                  "PHVNUMBER": 259
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 2
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_urgentPtr", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 260
@@ -5314,7 +5186,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 43
+                      "POSITIONOFFSET": 42
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -5324,7 +5196,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 288
@@ -5354,7 +5226,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -5364,7 +5236,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 290
@@ -5379,7 +5251,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -5389,7 +5261,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -5397,6 +5269,36 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 292
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 293
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -5404,7 +5306,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 14
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -5419,7 +5321,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 49
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 321
@@ -5427,21 +5329,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 64
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -5449,10 +5336,10 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 64
                 }, 
                 {
                   "PHVRECORD": [
@@ -5464,10 +5351,10 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 65
                 }, 
                 {
                   "PHVRECORD": [
@@ -5483,42 +5370,42 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 78
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 79
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 80
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 82
+                          "POSITIONOFFSET": 81
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 83
+                          "POSITIONOFFSET": 82
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -5533,7 +5420,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 68
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -5545,7 +5432,22 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
+                      "POSITIONOFFSET": 72
+                    }
+                  ], 
+                  "PHVNUMBER": 324
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -5555,12 +5457,27 @@
                     {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
+                    }
+                  ], 
+                  "PHVNUMBER": 326
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 31, 
                       "FIELDMSB": 31, 
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 56
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 258
@@ -5585,7 +5502,7 @@
                       "PHVNAME": "ipv4_fragOffset", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 45
+                      "POSITIONOFFSET": 44
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -5593,14 +5510,14 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 72
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -5610,13 +5527,13 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 54
+                      "POSITIONOFFSET": 53
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 29
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -5631,7 +5548,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 50
+                      "POSITIONOFFSET": 47
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -5641,7 +5558,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 18
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -5651,7 +5568,7 @@
                       "PHVNAME": "ipv4_hdrChecksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 11
+                      "POSITIONOFFSET": 9
                     }
                   ], 
                   "PHVNUMBER": 264
@@ -5666,7 +5583,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 12
                     }
                   ], 
                   "PHVNUMBER": 265
@@ -5681,7 +5598,7 @@
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 266
@@ -5696,7 +5613,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 25
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -5706,7 +5623,7 @@
                       "PHVNAME": "udp_length_", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
+                      "POSITIONOFFSET": 16
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -5716,7 +5633,7 @@
                       "PHVNAME": "udp_checksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 267
@@ -5731,7 +5648,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 38
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -5741,7 +5658,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 58
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -5751,7 +5668,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 11
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -5761,7 +5678,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 34
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -5771,7 +5688,7 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 41
                     }
                   ], 
                   "PHVNUMBER": 268
@@ -5796,7 +5713,7 @@
                       "PHVNAME": "tcp_urgentPtr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
+                      "POSITIONOFFSET": 45
                     }
                   ], 
                   "PHVNUMBER": 269
@@ -5811,7 +5728,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 270
@@ -5826,7 +5743,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 271
@@ -5838,43 +5755,13 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 8, 
                       "FIELDMSB": 8, 
-                      "PHVNAME": "ig_intr_md_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 9
-                    }
-                  ], 
-                  "PHVNUMBER": 144
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 145
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 8, 
-                      "FIELDMSB": 8, 
                       "PHVNAME": "eg_intr_md_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 146
+                  "PHVNUMBER": 144
                 }, 
                 {
                   "PHVRECORD": [
@@ -5886,7 +5773,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 29
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -5896,7 +5783,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 37
                     }
                   ], 
                   "PHVNUMBER": 296
@@ -5926,7 +5813,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -5936,7 +5823,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 298
@@ -5951,7 +5838,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -5961,7 +5848,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 299
@@ -5976,7 +5863,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 300
@@ -5991,7 +5878,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 301
@@ -6006,7 +5893,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 57
+                      "POSITIONOFFSET": 54
                     }
                   ], 
                   "PHVNUMBER": 332
@@ -6021,7 +5908,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 46
+                      "POSITIONOFFSET": 43
                     }
                   ], 
                   "PHVNUMBER": 333
@@ -6061,7 +5948,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 335
@@ -6071,21 +5958,6 @@
                     {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 80
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 2, 
                       "FIELDMSB": 2, 
                       "PHVNAME": "eg_intr_md_egress_cos", 
@@ -6094,7 +5966,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 81
+                  "PHVNUMBER": 80
                 }, 
                 {
                   "PHVRECORD": [
@@ -6110,42 +5982,67 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 76
+                          "POSITIONOFFSET": 73
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 74
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 75
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 76
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 78
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 82
+                  "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": [
@@ -6157,7 +6054,7 @@
                       "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 42
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 339
@@ -6173,6 +6070,16 @@
                       "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
@@ -6187,7 +6094,7 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -6197,7 +6104,7 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 336
@@ -6212,46 +6119,21 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }
                   ], 
                   "PHVNUMBER": 337
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
-                    }
-                  ], 
-                  "PHVNUMBER": 338
                 }
               ], 
-              "TOTALEGRESSPHVS": 29
+              "TOTALEGRESSPHVS": 26
             }
           ], 
           "Stage": 3
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 58, 
-          "TOTALPHVRECORDS": 90, 
+          "TOTALSTAGEPHVS": 56, 
+          "TOTALPHVRECORDS": 89, 
           "Phvs": [
             {
               "PHVDIRECTION": 0, 
@@ -6270,7 +6152,7 @@
                           "HEADER": "--pov_reserved--_0", 
                           "POVBIT": 0, 
                           "HIDDEN": true, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 76
                         }
                       ]
                     }
@@ -6287,7 +6169,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
                   "PHVNUMBER": 1
@@ -6302,7 +6184,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 2
@@ -6317,7 +6199,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -6327,7 +6209,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 131
@@ -6352,31 +6234,6 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 2
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_urgentPtr", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
-                    }
-                  ], 
-                  "PHVNUMBER": 261
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 8, 
                       "PHVNAME": "packet_out_hdr_egress_port", 
@@ -6392,7 +6249,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -6400,21 +6257,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
-                    }
-                  ], 
-                  "PHVNUMBER": 324
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -6422,7 +6264,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 31
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -6447,7 +6289,7 @@
                       "PHVNAME": "ig_intr_md_for_tm_ucast_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 40
                     }
                   ], 
                   "PHVNUMBER": 130
@@ -6462,7 +6304,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 52
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -6472,7 +6314,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -6497,7 +6339,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 60
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 320
@@ -6505,41 +6347,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 65
-                    }
-                  ], 
-                  "PHVNUMBER": 259
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -6547,7 +6354,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 43
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -6557,7 +6364,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 63
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -6567,7 +6374,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 13
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -6577,7 +6384,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 36
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -6587,7 +6394,52 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 47
+                      "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 18
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 64
+                    }
+                  ], 
+                  "PHVNUMBER": 259
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 2
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_urgentPtr", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 260
@@ -6602,7 +6454,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 43
+                      "POSITIONOFFSET": 42
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -6612,7 +6464,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 288
@@ -6642,7 +6494,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -6652,7 +6504,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 290
@@ -6667,7 +6519,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -6677,7 +6529,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -6685,6 +6537,36 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 292
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 293
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -6692,7 +6574,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 14
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -6707,7 +6589,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 49
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 321
@@ -6715,21 +6597,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 64
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -6737,10 +6604,10 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 64
                 }, 
                 {
                   "PHVRECORD": [
@@ -6752,10 +6619,10 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 65
                 }, 
                 {
                   "PHVRECORD": [
@@ -6771,42 +6638,42 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 78
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 79
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 80
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 82
+                          "POSITIONOFFSET": 81
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 83
+                          "POSITIONOFFSET": 82
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -6821,7 +6688,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 68
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -6833,7 +6700,22 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
+                      "POSITIONOFFSET": 72
+                    }
+                  ], 
+                  "PHVNUMBER": 324
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -6843,12 +6725,27 @@
                     {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
+                    }
+                  ], 
+                  "PHVNUMBER": 326
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 31, 
                       "FIELDMSB": 31, 
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 56
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 258
@@ -6873,7 +6770,7 @@
                       "PHVNAME": "ipv4_fragOffset", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 45
+                      "POSITIONOFFSET": 44
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -6881,14 +6778,14 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 72
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -6898,13 +6795,13 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 54
+                      "POSITIONOFFSET": 53
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 29
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -6919,7 +6816,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 50
+                      "POSITIONOFFSET": 47
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -6929,7 +6826,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 18
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -6939,7 +6836,7 @@
                       "PHVNAME": "ipv4_hdrChecksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 11
+                      "POSITIONOFFSET": 9
                     }
                   ], 
                   "PHVNUMBER": 264
@@ -6954,7 +6851,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 12
                     }
                   ], 
                   "PHVNUMBER": 265
@@ -6969,7 +6866,7 @@
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 266
@@ -6984,7 +6881,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 25
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -6994,7 +6891,7 @@
                       "PHVNAME": "udp_length_", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
+                      "POSITIONOFFSET": 16
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -7004,7 +6901,7 @@
                       "PHVNAME": "udp_checksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 267
@@ -7019,7 +6916,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 38
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -7029,7 +6926,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 58
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -7039,7 +6936,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 11
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -7049,7 +6946,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 34
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -7059,7 +6956,7 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 41
                     }
                   ], 
                   "PHVNUMBER": 268
@@ -7084,7 +6981,7 @@
                       "PHVNAME": "tcp_urgentPtr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
+                      "POSITIONOFFSET": 45
                     }
                   ], 
                   "PHVNUMBER": 269
@@ -7099,7 +6996,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 270
@@ -7114,7 +7011,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 271
@@ -7126,43 +7023,13 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 8, 
                       "FIELDMSB": 8, 
-                      "PHVNAME": "ig_intr_md_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 9
-                    }
-                  ], 
-                  "PHVNUMBER": 144
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 145
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 8, 
-                      "FIELDMSB": 8, 
                       "PHVNAME": "eg_intr_md_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 146
+                  "PHVNUMBER": 144
                 }, 
                 {
                   "PHVRECORD": [
@@ -7174,7 +7041,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 29
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -7184,7 +7051,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 37
                     }
                   ], 
                   "PHVNUMBER": 296
@@ -7214,7 +7081,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -7224,7 +7091,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 298
@@ -7239,7 +7106,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -7249,7 +7116,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 299
@@ -7264,7 +7131,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 300
@@ -7279,7 +7146,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 301
@@ -7294,7 +7161,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 57
+                      "POSITIONOFFSET": 54
                     }
                   ], 
                   "PHVNUMBER": 332
@@ -7309,7 +7176,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 46
+                      "POSITIONOFFSET": 43
                     }
                   ], 
                   "PHVNUMBER": 333
@@ -7349,7 +7216,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 335
@@ -7359,21 +7226,6 @@
                     {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 80
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 2, 
                       "FIELDMSB": 2, 
                       "PHVNAME": "eg_intr_md_egress_cos", 
@@ -7382,7 +7234,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 81
+                  "PHVNUMBER": 80
                 }, 
                 {
                   "PHVRECORD": [
@@ -7398,42 +7250,67 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 76
+                          "POSITIONOFFSET": 73
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 74
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 75
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 76
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 78
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 82
+                  "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": [
@@ -7445,7 +7322,7 @@
                       "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 42
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 339
@@ -7461,6 +7338,16 @@
                       "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
@@ -7475,7 +7362,7 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -7485,7 +7372,7 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 336
@@ -7500,46 +7387,21 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }
                   ], 
                   "PHVNUMBER": 337
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
-                    }
-                  ], 
-                  "PHVNUMBER": 338
                 }
               ], 
-              "TOTALEGRESSPHVS": 29
+              "TOTALEGRESSPHVS": 26
             }
           ], 
           "Stage": 4
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 58, 
-          "TOTALPHVRECORDS": 90, 
+          "TOTALSTAGEPHVS": 56, 
+          "TOTALPHVRECORDS": 89, 
           "Phvs": [
             {
               "PHVDIRECTION": 0, 
@@ -7558,7 +7420,7 @@
                           "HEADER": "--pov_reserved--_0", 
                           "POVBIT": 0, 
                           "HIDDEN": true, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 76
                         }
                       ]
                     }
@@ -7575,7 +7437,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
                   "PHVNUMBER": 1
@@ -7590,7 +7452,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 2
@@ -7605,7 +7467,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -7615,7 +7477,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 131
@@ -7640,31 +7502,6 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 2
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_urgentPtr", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
-                    }
-                  ], 
-                  "PHVNUMBER": 261
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 8, 
                       "PHVNAME": "packet_out_hdr_egress_port", 
@@ -7680,7 +7517,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -7688,21 +7525,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
-                    }
-                  ], 
-                  "PHVNUMBER": 324
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -7710,7 +7532,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 31
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -7735,7 +7557,7 @@
                       "PHVNAME": "ig_intr_md_for_tm_ucast_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 40
                     }
                   ], 
                   "PHVNUMBER": 130
@@ -7750,7 +7572,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 52
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -7760,7 +7582,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -7785,7 +7607,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 60
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 320
@@ -7793,41 +7615,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 65
-                    }
-                  ], 
-                  "PHVNUMBER": 259
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -7835,7 +7622,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 43
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -7845,7 +7632,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 63
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -7855,7 +7642,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 13
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -7865,7 +7652,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 36
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -7875,7 +7662,52 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 47
+                      "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 18
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 64
+                    }
+                  ], 
+                  "PHVNUMBER": 259
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 2
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_urgentPtr", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 260
@@ -7890,7 +7722,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 43
+                      "POSITIONOFFSET": 42
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -7900,7 +7732,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 288
@@ -7930,7 +7762,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -7940,7 +7772,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 290
@@ -7955,7 +7787,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -7965,7 +7797,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -7973,6 +7805,36 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 292
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 293
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -7980,7 +7842,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 14
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -7995,7 +7857,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 49
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 321
@@ -8003,21 +7865,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 64
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -8025,10 +7872,10 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 64
                 }, 
                 {
                   "PHVRECORD": [
@@ -8040,10 +7887,10 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 65
                 }, 
                 {
                   "PHVRECORD": [
@@ -8059,42 +7906,42 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 78
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 79
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 80
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 82
+                          "POSITIONOFFSET": 81
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 83
+                          "POSITIONOFFSET": 82
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -8109,7 +7956,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 68
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -8121,7 +7968,22 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
+                      "POSITIONOFFSET": 72
+                    }
+                  ], 
+                  "PHVNUMBER": 324
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -8131,12 +7993,27 @@
                     {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
+                    }
+                  ], 
+                  "PHVNUMBER": 326
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 31, 
                       "FIELDMSB": 31, 
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 56
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 258
@@ -8161,7 +8038,7 @@
                       "PHVNAME": "ipv4_fragOffset", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 45
+                      "POSITIONOFFSET": 44
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -8169,14 +8046,14 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 72
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -8186,13 +8063,13 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 54
+                      "POSITIONOFFSET": 53
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 29
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -8207,7 +8084,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 50
+                      "POSITIONOFFSET": 47
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -8217,7 +8094,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 18
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -8227,7 +8104,7 @@
                       "PHVNAME": "ipv4_hdrChecksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 11
+                      "POSITIONOFFSET": 9
                     }
                   ], 
                   "PHVNUMBER": 264
@@ -8242,7 +8119,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 12
                     }
                   ], 
                   "PHVNUMBER": 265
@@ -8257,7 +8134,7 @@
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 266
@@ -8272,7 +8149,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 25
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -8282,7 +8159,7 @@
                       "PHVNAME": "udp_length_", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
+                      "POSITIONOFFSET": 16
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -8292,7 +8169,7 @@
                       "PHVNAME": "udp_checksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 267
@@ -8307,7 +8184,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 38
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -8317,7 +8194,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 58
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -8327,7 +8204,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 11
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -8337,7 +8214,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 34
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -8347,7 +8224,7 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 41
                     }
                   ], 
                   "PHVNUMBER": 268
@@ -8372,7 +8249,7 @@
                       "PHVNAME": "tcp_urgentPtr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
+                      "POSITIONOFFSET": 45
                     }
                   ], 
                   "PHVNUMBER": 269
@@ -8387,7 +8264,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 270
@@ -8402,7 +8279,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 271
@@ -8414,43 +8291,13 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 8, 
                       "FIELDMSB": 8, 
-                      "PHVNAME": "ig_intr_md_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 9
-                    }
-                  ], 
-                  "PHVNUMBER": 144
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 145
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 8, 
-                      "FIELDMSB": 8, 
                       "PHVNAME": "eg_intr_md_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 146
+                  "PHVNUMBER": 144
                 }, 
                 {
                   "PHVRECORD": [
@@ -8462,7 +8309,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 29
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -8472,7 +8319,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 37
                     }
                   ], 
                   "PHVNUMBER": 296
@@ -8502,7 +8349,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -8512,7 +8359,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 298
@@ -8527,7 +8374,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -8537,7 +8384,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 299
@@ -8552,7 +8399,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 300
@@ -8567,7 +8414,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 301
@@ -8582,7 +8429,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 57
+                      "POSITIONOFFSET": 54
                     }
                   ], 
                   "PHVNUMBER": 332
@@ -8597,7 +8444,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 46
+                      "POSITIONOFFSET": 43
                     }
                   ], 
                   "PHVNUMBER": 333
@@ -8637,7 +8484,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 335
@@ -8647,21 +8494,6 @@
                     {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 80
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 2, 
                       "FIELDMSB": 2, 
                       "PHVNAME": "eg_intr_md_egress_cos", 
@@ -8670,7 +8502,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 81
+                  "PHVNUMBER": 80
                 }, 
                 {
                   "PHVRECORD": [
@@ -8686,42 +8518,67 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 76
+                          "POSITIONOFFSET": 73
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 74
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 75
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 76
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 78
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 82
+                  "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": [
@@ -8733,7 +8590,7 @@
                       "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 42
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 339
@@ -8749,6 +8606,16 @@
                       "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
@@ -8763,7 +8630,7 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -8773,7 +8640,7 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 336
@@ -8788,46 +8655,21 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }
                   ], 
                   "PHVNUMBER": 337
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
-                    }
-                  ], 
-                  "PHVNUMBER": 338
                 }
               ], 
-              "TOTALEGRESSPHVS": 29
+              "TOTALEGRESSPHVS": 26
             }
           ], 
           "Stage": 5
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 58, 
-          "TOTALPHVRECORDS": 90, 
+          "TOTALSTAGEPHVS": 56, 
+          "TOTALPHVRECORDS": 89, 
           "Phvs": [
             {
               "PHVDIRECTION": 0, 
@@ -8846,7 +8688,7 @@
                           "HEADER": "--pov_reserved--_0", 
                           "POVBIT": 0, 
                           "HIDDEN": true, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 76
                         }
                       ]
                     }
@@ -8863,7 +8705,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
                   "PHVNUMBER": 1
@@ -8878,7 +8720,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 2
@@ -8893,7 +8735,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -8903,7 +8745,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 131
@@ -8928,31 +8770,6 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 2
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_urgentPtr", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
-                    }
-                  ], 
-                  "PHVNUMBER": 261
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 8, 
                       "PHVNAME": "packet_out_hdr_egress_port", 
@@ -8968,7 +8785,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -8976,21 +8793,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
-                    }
-                  ], 
-                  "PHVNUMBER": 324
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -8998,7 +8800,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 31
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -9023,7 +8825,7 @@
                       "PHVNAME": "ig_intr_md_for_tm_ucast_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 40
                     }
                   ], 
                   "PHVNUMBER": 130
@@ -9038,7 +8840,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 52
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -9048,7 +8850,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -9073,7 +8875,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 60
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 320
@@ -9081,41 +8883,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 65
-                    }
-                  ], 
-                  "PHVNUMBER": 259
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -9123,7 +8890,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 43
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -9133,7 +8900,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 63
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -9143,7 +8910,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 13
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -9153,7 +8920,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 36
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -9163,7 +8930,52 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 47
+                      "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 18
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 64
+                    }
+                  ], 
+                  "PHVNUMBER": 259
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 2
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_urgentPtr", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 260
@@ -9178,7 +8990,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 43
+                      "POSITIONOFFSET": 42
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -9188,7 +9000,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 288
@@ -9218,7 +9030,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -9228,7 +9040,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 290
@@ -9243,7 +9055,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -9253,7 +9065,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -9261,6 +9073,36 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 292
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 293
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -9268,7 +9110,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 14
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -9283,7 +9125,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 49
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 321
@@ -9291,21 +9133,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 64
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -9313,10 +9140,10 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 64
                 }, 
                 {
                   "PHVRECORD": [
@@ -9328,10 +9155,10 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 65
                 }, 
                 {
                   "PHVRECORD": [
@@ -9347,42 +9174,42 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 78
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 79
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 80
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 82
+                          "POSITIONOFFSET": 81
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 83
+                          "POSITIONOFFSET": 82
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -9397,7 +9224,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 68
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -9409,7 +9236,22 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
+                      "POSITIONOFFSET": 72
+                    }
+                  ], 
+                  "PHVNUMBER": 324
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -9419,12 +9261,27 @@
                     {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
+                    }
+                  ], 
+                  "PHVNUMBER": 326
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 31, 
                       "FIELDMSB": 31, 
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 56
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 258
@@ -9449,7 +9306,7 @@
                       "PHVNAME": "ipv4_fragOffset", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 45
+                      "POSITIONOFFSET": 44
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -9457,14 +9314,14 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 72
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -9474,13 +9331,13 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 54
+                      "POSITIONOFFSET": 53
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 29
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -9495,7 +9352,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 50
+                      "POSITIONOFFSET": 47
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -9505,7 +9362,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 18
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -9515,7 +9372,7 @@
                       "PHVNAME": "ipv4_hdrChecksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 11
+                      "POSITIONOFFSET": 9
                     }
                   ], 
                   "PHVNUMBER": 264
@@ -9530,7 +9387,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 12
                     }
                   ], 
                   "PHVNUMBER": 265
@@ -9545,7 +9402,7 @@
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 266
@@ -9560,7 +9417,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 25
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -9570,7 +9427,7 @@
                       "PHVNAME": "udp_length_", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
+                      "POSITIONOFFSET": 16
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -9580,7 +9437,7 @@
                       "PHVNAME": "udp_checksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 267
@@ -9595,7 +9452,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 38
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -9605,7 +9462,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 58
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -9615,7 +9472,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 11
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -9625,7 +9482,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 34
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -9635,7 +9492,7 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 41
                     }
                   ], 
                   "PHVNUMBER": 268
@@ -9660,7 +9517,7 @@
                       "PHVNAME": "tcp_urgentPtr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
+                      "POSITIONOFFSET": 45
                     }
                   ], 
                   "PHVNUMBER": 269
@@ -9675,7 +9532,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 270
@@ -9690,7 +9547,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 271
@@ -9702,43 +9559,13 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 8, 
                       "FIELDMSB": 8, 
-                      "PHVNAME": "ig_intr_md_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 9
-                    }
-                  ], 
-                  "PHVNUMBER": 144
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 145
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 8, 
-                      "FIELDMSB": 8, 
                       "PHVNAME": "eg_intr_md_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 146
+                  "PHVNUMBER": 144
                 }, 
                 {
                   "PHVRECORD": [
@@ -9750,7 +9577,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 29
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -9760,7 +9587,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 37
                     }
                   ], 
                   "PHVNUMBER": 296
@@ -9790,7 +9617,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -9800,7 +9627,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 298
@@ -9815,7 +9642,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -9825,7 +9652,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 299
@@ -9840,7 +9667,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 300
@@ -9855,7 +9682,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 301
@@ -9870,7 +9697,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 57
+                      "POSITIONOFFSET": 54
                     }
                   ], 
                   "PHVNUMBER": 332
@@ -9885,7 +9712,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 46
+                      "POSITIONOFFSET": 43
                     }
                   ], 
                   "PHVNUMBER": 333
@@ -9925,7 +9752,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 335
@@ -9935,21 +9762,6 @@
                     {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 80
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 2, 
                       "FIELDMSB": 2, 
                       "PHVNAME": "eg_intr_md_egress_cos", 
@@ -9958,7 +9770,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 81
+                  "PHVNUMBER": 80
                 }, 
                 {
                   "PHVRECORD": [
@@ -9974,42 +9786,67 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 76
+                          "POSITIONOFFSET": 73
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 74
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 75
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 76
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 78
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 82
+                  "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": [
@@ -10021,7 +9858,7 @@
                       "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 42
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 339
@@ -10037,6 +9874,16 @@
                       "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
@@ -10051,7 +9898,7 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -10061,7 +9908,7 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 336
@@ -10076,46 +9923,21 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }
                   ], 
                   "PHVNUMBER": 337
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
-                    }
-                  ], 
-                  "PHVNUMBER": 338
                 }
               ], 
-              "TOTALEGRESSPHVS": 29
+              "TOTALEGRESSPHVS": 26
             }
           ], 
           "Stage": 6
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 58, 
-          "TOTALPHVRECORDS": 90, 
+          "TOTALSTAGEPHVS": 56, 
+          "TOTALPHVRECORDS": 89, 
           "Phvs": [
             {
               "PHVDIRECTION": 0, 
@@ -10134,7 +9956,7 @@
                           "HEADER": "--pov_reserved--_0", 
                           "POVBIT": 0, 
                           "HIDDEN": true, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 76
                         }
                       ]
                     }
@@ -10151,7 +9973,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
                   "PHVNUMBER": 1
@@ -10166,7 +9988,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 2
@@ -10181,7 +10003,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -10191,7 +10013,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 131
@@ -10216,31 +10038,6 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 2
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_urgentPtr", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
-                    }
-                  ], 
-                  "PHVNUMBER": 261
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 8, 
                       "PHVNAME": "packet_out_hdr_egress_port", 
@@ -10256,7 +10053,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -10264,21 +10061,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
-                    }
-                  ], 
-                  "PHVNUMBER": 324
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -10286,7 +10068,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 31
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -10311,7 +10093,7 @@
                       "PHVNAME": "ig_intr_md_for_tm_ucast_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 40
                     }
                   ], 
                   "PHVNUMBER": 130
@@ -10326,7 +10108,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 52
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -10336,7 +10118,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -10361,7 +10143,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 60
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 320
@@ -10369,41 +10151,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 65
-                    }
-                  ], 
-                  "PHVNUMBER": 259
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -10411,7 +10158,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 43
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -10421,7 +10168,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 63
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -10431,7 +10178,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 13
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -10441,7 +10188,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 36
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -10451,7 +10198,52 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 47
+                      "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 18
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 64
+                    }
+                  ], 
+                  "PHVNUMBER": 259
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 2
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_urgentPtr", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 260
@@ -10466,7 +10258,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 43
+                      "POSITIONOFFSET": 42
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -10476,7 +10268,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 288
@@ -10506,7 +10298,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -10516,7 +10308,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 290
@@ -10531,7 +10323,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -10541,7 +10333,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -10549,6 +10341,36 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 292
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 293
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -10556,7 +10378,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 14
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -10571,7 +10393,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 49
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 321
@@ -10579,21 +10401,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 64
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -10601,10 +10408,10 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 64
                 }, 
                 {
                   "PHVRECORD": [
@@ -10616,10 +10423,10 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 65
                 }, 
                 {
                   "PHVRECORD": [
@@ -10635,42 +10442,42 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 78
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 79
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 80
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 82
+                          "POSITIONOFFSET": 81
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 83
+                          "POSITIONOFFSET": 82
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -10685,7 +10492,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 68
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -10697,7 +10504,22 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
+                      "POSITIONOFFSET": 72
+                    }
+                  ], 
+                  "PHVNUMBER": 324
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -10707,12 +10529,27 @@
                     {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
+                    }
+                  ], 
+                  "PHVNUMBER": 326
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 31, 
                       "FIELDMSB": 31, 
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 56
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 258
@@ -10737,7 +10574,7 @@
                       "PHVNAME": "ipv4_fragOffset", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 45
+                      "POSITIONOFFSET": 44
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -10745,14 +10582,14 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 72
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -10762,13 +10599,13 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 54
+                      "POSITIONOFFSET": 53
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 29
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -10783,7 +10620,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 50
+                      "POSITIONOFFSET": 47
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -10793,7 +10630,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 18
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -10803,7 +10640,7 @@
                       "PHVNAME": "ipv4_hdrChecksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 11
+                      "POSITIONOFFSET": 9
                     }
                   ], 
                   "PHVNUMBER": 264
@@ -10818,7 +10655,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 12
                     }
                   ], 
                   "PHVNUMBER": 265
@@ -10833,7 +10670,7 @@
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 266
@@ -10848,7 +10685,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 25
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -10858,7 +10695,7 @@
                       "PHVNAME": "udp_length_", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
+                      "POSITIONOFFSET": 16
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -10868,7 +10705,7 @@
                       "PHVNAME": "udp_checksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 267
@@ -10883,7 +10720,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 38
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -10893,7 +10730,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 58
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -10903,7 +10740,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 11
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -10913,7 +10750,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 34
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -10923,7 +10760,7 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 41
                     }
                   ], 
                   "PHVNUMBER": 268
@@ -10948,7 +10785,7 @@
                       "PHVNAME": "tcp_urgentPtr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
+                      "POSITIONOFFSET": 45
                     }
                   ], 
                   "PHVNUMBER": 269
@@ -10963,7 +10800,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 270
@@ -10978,7 +10815,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 271
@@ -10990,43 +10827,13 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 8, 
                       "FIELDMSB": 8, 
-                      "PHVNAME": "ig_intr_md_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 9
-                    }
-                  ], 
-                  "PHVNUMBER": 144
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 145
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 8, 
-                      "FIELDMSB": 8, 
                       "PHVNAME": "eg_intr_md_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 146
+                  "PHVNUMBER": 144
                 }, 
                 {
                   "PHVRECORD": [
@@ -11038,7 +10845,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 29
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -11048,7 +10855,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 37
                     }
                   ], 
                   "PHVNUMBER": 296
@@ -11078,7 +10885,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -11088,7 +10895,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 298
@@ -11103,7 +10910,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -11113,7 +10920,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 299
@@ -11128,7 +10935,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 300
@@ -11143,7 +10950,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 301
@@ -11158,7 +10965,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 57
+                      "POSITIONOFFSET": 54
                     }
                   ], 
                   "PHVNUMBER": 332
@@ -11173,7 +10980,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 46
+                      "POSITIONOFFSET": 43
                     }
                   ], 
                   "PHVNUMBER": 333
@@ -11213,7 +11020,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 335
@@ -11223,21 +11030,6 @@
                     {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 80
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 2, 
                       "FIELDMSB": 2, 
                       "PHVNAME": "eg_intr_md_egress_cos", 
@@ -11246,7 +11038,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 81
+                  "PHVNUMBER": 80
                 }, 
                 {
                   "PHVRECORD": [
@@ -11262,42 +11054,67 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 76
+                          "POSITIONOFFSET": 73
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 74
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 75
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 76
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 78
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 82
+                  "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": [
@@ -11309,7 +11126,7 @@
                       "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 42
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 339
@@ -11325,6 +11142,16 @@
                       "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
@@ -11339,7 +11166,7 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -11349,7 +11176,7 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 336
@@ -11364,46 +11191,21 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }
                   ], 
                   "PHVNUMBER": 337
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
-                    }
-                  ], 
-                  "PHVNUMBER": 338
                 }
               ], 
-              "TOTALEGRESSPHVS": 29
+              "TOTALEGRESSPHVS": 26
             }
           ], 
           "Stage": 7
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 58, 
-          "TOTALPHVRECORDS": 90, 
+          "TOTALSTAGEPHVS": 56, 
+          "TOTALPHVRECORDS": 89, 
           "Phvs": [
             {
               "PHVDIRECTION": 0, 
@@ -11422,7 +11224,7 @@
                           "HEADER": "--pov_reserved--_0", 
                           "POVBIT": 0, 
                           "HIDDEN": true, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 76
                         }
                       ]
                     }
@@ -11439,7 +11241,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
                   "PHVNUMBER": 1
@@ -11454,7 +11256,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 2
@@ -11469,7 +11271,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -11479,7 +11281,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 131
@@ -11504,31 +11306,6 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 2
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_urgentPtr", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
-                    }
-                  ], 
-                  "PHVNUMBER": 261
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 8, 
                       "PHVNAME": "packet_out_hdr_egress_port", 
@@ -11544,7 +11321,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -11552,21 +11329,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
-                    }
-                  ], 
-                  "PHVNUMBER": 324
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -11574,7 +11336,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 31
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -11599,7 +11361,7 @@
                       "PHVNAME": "ig_intr_md_for_tm_ucast_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 40
                     }
                   ], 
                   "PHVNUMBER": 130
@@ -11614,7 +11376,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 52
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -11624,7 +11386,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -11649,7 +11411,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 60
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 320
@@ -11657,41 +11419,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 65
-                    }
-                  ], 
-                  "PHVNUMBER": 259
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -11699,7 +11426,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 43
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -11709,7 +11436,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 63
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -11719,7 +11446,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 13
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -11729,7 +11456,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 36
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -11739,7 +11466,52 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 47
+                      "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 18
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 64
+                    }
+                  ], 
+                  "PHVNUMBER": 259
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 2
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_urgentPtr", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 260
@@ -11754,7 +11526,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 43
+                      "POSITIONOFFSET": 42
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -11764,7 +11536,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 288
@@ -11794,7 +11566,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -11804,7 +11576,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 290
@@ -11819,7 +11591,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -11829,7 +11601,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -11837,6 +11609,36 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 292
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 293
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -11844,7 +11646,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 14
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -11859,7 +11661,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 49
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 321
@@ -11867,21 +11669,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 64
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -11889,10 +11676,10 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 64
                 }, 
                 {
                   "PHVRECORD": [
@@ -11904,10 +11691,10 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 65
                 }, 
                 {
                   "PHVRECORD": [
@@ -11923,42 +11710,42 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 78
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 79
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 80
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 82
+                          "POSITIONOFFSET": 81
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 83
+                          "POSITIONOFFSET": 82
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -11973,7 +11760,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 68
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -11985,7 +11772,22 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
+                      "POSITIONOFFSET": 72
+                    }
+                  ], 
+                  "PHVNUMBER": 324
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -11995,12 +11797,27 @@
                     {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
+                    }
+                  ], 
+                  "PHVNUMBER": 326
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 31, 
                       "FIELDMSB": 31, 
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 56
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 258
@@ -12025,7 +11842,7 @@
                       "PHVNAME": "ipv4_fragOffset", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 45
+                      "POSITIONOFFSET": 44
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -12033,14 +11850,14 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 72
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -12050,13 +11867,13 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 54
+                      "POSITIONOFFSET": 53
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 29
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -12071,7 +11888,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 50
+                      "POSITIONOFFSET": 47
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -12081,7 +11898,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 18
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -12091,7 +11908,7 @@
                       "PHVNAME": "ipv4_hdrChecksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 11
+                      "POSITIONOFFSET": 9
                     }
                   ], 
                   "PHVNUMBER": 264
@@ -12106,7 +11923,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 12
                     }
                   ], 
                   "PHVNUMBER": 265
@@ -12121,7 +11938,7 @@
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 266
@@ -12136,7 +11953,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 25
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -12146,7 +11963,7 @@
                       "PHVNAME": "udp_length_", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
+                      "POSITIONOFFSET": 16
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -12156,7 +11973,7 @@
                       "PHVNAME": "udp_checksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 267
@@ -12171,7 +11988,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 38
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -12181,7 +11998,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 58
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -12191,7 +12008,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 11
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -12201,7 +12018,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 34
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -12211,7 +12028,7 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 41
                     }
                   ], 
                   "PHVNUMBER": 268
@@ -12236,7 +12053,7 @@
                       "PHVNAME": "tcp_urgentPtr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
+                      "POSITIONOFFSET": 45
                     }
                   ], 
                   "PHVNUMBER": 269
@@ -12251,7 +12068,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 270
@@ -12266,7 +12083,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 271
@@ -12278,43 +12095,13 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 8, 
                       "FIELDMSB": 8, 
-                      "PHVNAME": "ig_intr_md_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 9
-                    }
-                  ], 
-                  "PHVNUMBER": 144
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 145
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 8, 
-                      "FIELDMSB": 8, 
                       "PHVNAME": "eg_intr_md_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 146
+                  "PHVNUMBER": 144
                 }, 
                 {
                   "PHVRECORD": [
@@ -12326,7 +12113,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 29
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -12336,7 +12123,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 37
                     }
                   ], 
                   "PHVNUMBER": 296
@@ -12366,7 +12153,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -12376,7 +12163,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 298
@@ -12391,7 +12178,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -12401,7 +12188,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 299
@@ -12416,7 +12203,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 300
@@ -12431,7 +12218,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 301
@@ -12446,7 +12233,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 57
+                      "POSITIONOFFSET": 54
                     }
                   ], 
                   "PHVNUMBER": 332
@@ -12461,7 +12248,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 46
+                      "POSITIONOFFSET": 43
                     }
                   ], 
                   "PHVNUMBER": 333
@@ -12501,7 +12288,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 335
@@ -12511,21 +12298,6 @@
                     {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 80
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 2, 
                       "FIELDMSB": 2, 
                       "PHVNAME": "eg_intr_md_egress_cos", 
@@ -12534,7 +12306,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 81
+                  "PHVNUMBER": 80
                 }, 
                 {
                   "PHVRECORD": [
@@ -12550,42 +12322,67 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 76
+                          "POSITIONOFFSET": 73
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 74
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 75
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 76
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 78
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 82
+                  "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": [
@@ -12597,7 +12394,7 @@
                       "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 42
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 339
@@ -12613,6 +12410,16 @@
                       "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
@@ -12627,7 +12434,7 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -12637,7 +12444,7 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 336
@@ -12652,46 +12459,21 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }
                   ], 
                   "PHVNUMBER": 337
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
-                    }
-                  ], 
-                  "PHVNUMBER": 338
                 }
               ], 
-              "TOTALEGRESSPHVS": 29
+              "TOTALEGRESSPHVS": 26
             }
           ], 
           "Stage": 8
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 58, 
-          "TOTALPHVRECORDS": 90, 
+          "TOTALSTAGEPHVS": 56, 
+          "TOTALPHVRECORDS": 89, 
           "Phvs": [
             {
               "PHVDIRECTION": 0, 
@@ -12710,7 +12492,7 @@
                           "HEADER": "--pov_reserved--_0", 
                           "POVBIT": 0, 
                           "HIDDEN": true, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 76
                         }
                       ]
                     }
@@ -12727,7 +12509,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
                   "PHVNUMBER": 1
@@ -12742,7 +12524,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 2
@@ -12757,7 +12539,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -12767,7 +12549,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 131
@@ -12792,31 +12574,6 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 2
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_urgentPtr", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
-                    }
-                  ], 
-                  "PHVNUMBER": 261
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 8, 
                       "PHVNAME": "packet_out_hdr_egress_port", 
@@ -12832,7 +12589,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -12840,21 +12597,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
-                    }
-                  ], 
-                  "PHVNUMBER": 324
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -12862,7 +12604,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 31
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -12887,7 +12629,7 @@
                       "PHVNAME": "ig_intr_md_for_tm_ucast_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 40
                     }
                   ], 
                   "PHVNUMBER": 130
@@ -12902,7 +12644,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 52
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -12912,7 +12654,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -12937,7 +12679,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 60
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 320
@@ -12945,41 +12687,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 65
-                    }
-                  ], 
-                  "PHVNUMBER": 259
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -12987,7 +12694,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 43
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -12997,7 +12704,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 63
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -13007,7 +12714,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 13
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -13017,7 +12724,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 36
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -13027,7 +12734,52 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 47
+                      "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 18
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 64
+                    }
+                  ], 
+                  "PHVNUMBER": 259
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 2
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_urgentPtr", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 260
@@ -13042,7 +12794,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 43
+                      "POSITIONOFFSET": 42
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -13052,7 +12804,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 288
@@ -13082,7 +12834,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -13092,7 +12844,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 290
@@ -13107,7 +12859,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -13117,7 +12869,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -13125,6 +12877,36 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 292
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 293
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -13132,7 +12914,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 14
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -13147,7 +12929,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 49
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 321
@@ -13155,21 +12937,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 64
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -13177,10 +12944,10 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 64
                 }, 
                 {
                   "PHVRECORD": [
@@ -13192,10 +12959,10 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 65
                 }, 
                 {
                   "PHVRECORD": [
@@ -13211,42 +12978,42 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 78
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 79
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 80
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 82
+                          "POSITIONOFFSET": 81
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 83
+                          "POSITIONOFFSET": 82
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -13261,7 +13028,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 68
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -13273,7 +13040,22 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
+                      "POSITIONOFFSET": 72
+                    }
+                  ], 
+                  "PHVNUMBER": 324
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -13283,12 +13065,27 @@
                     {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
+                    }
+                  ], 
+                  "PHVNUMBER": 326
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 31, 
                       "FIELDMSB": 31, 
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 56
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 258
@@ -13313,7 +13110,7 @@
                       "PHVNAME": "ipv4_fragOffset", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 45
+                      "POSITIONOFFSET": 44
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -13321,14 +13118,14 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 72
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -13338,13 +13135,13 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 54
+                      "POSITIONOFFSET": 53
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 29
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -13359,7 +13156,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 50
+                      "POSITIONOFFSET": 47
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -13369,7 +13166,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 18
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -13379,7 +13176,7 @@
                       "PHVNAME": "ipv4_hdrChecksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 11
+                      "POSITIONOFFSET": 9
                     }
                   ], 
                   "PHVNUMBER": 264
@@ -13394,7 +13191,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 12
                     }
                   ], 
                   "PHVNUMBER": 265
@@ -13409,7 +13206,7 @@
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 266
@@ -13424,7 +13221,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 25
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -13434,7 +13231,7 @@
                       "PHVNAME": "udp_length_", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
+                      "POSITIONOFFSET": 16
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -13444,7 +13241,7 @@
                       "PHVNAME": "udp_checksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 267
@@ -13459,7 +13256,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 38
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -13469,7 +13266,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 58
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -13479,7 +13276,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 11
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -13489,7 +13286,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 34
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -13499,7 +13296,7 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 41
                     }
                   ], 
                   "PHVNUMBER": 268
@@ -13524,7 +13321,7 @@
                       "PHVNAME": "tcp_urgentPtr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
+                      "POSITIONOFFSET": 45
                     }
                   ], 
                   "PHVNUMBER": 269
@@ -13539,7 +13336,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 270
@@ -13554,7 +13351,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 271
@@ -13566,43 +13363,13 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 8, 
                       "FIELDMSB": 8, 
-                      "PHVNAME": "ig_intr_md_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 9
-                    }
-                  ], 
-                  "PHVNUMBER": 144
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 145
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 8, 
-                      "FIELDMSB": 8, 
                       "PHVNAME": "eg_intr_md_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 146
+                  "PHVNUMBER": 144
                 }, 
                 {
                   "PHVRECORD": [
@@ -13614,7 +13381,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 29
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -13624,7 +13391,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 37
                     }
                   ], 
                   "PHVNUMBER": 296
@@ -13654,7 +13421,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -13664,7 +13431,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 298
@@ -13679,7 +13446,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -13689,7 +13456,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 299
@@ -13704,7 +13471,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 300
@@ -13719,7 +13486,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 301
@@ -13734,7 +13501,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 57
+                      "POSITIONOFFSET": 54
                     }
                   ], 
                   "PHVNUMBER": 332
@@ -13749,7 +13516,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 46
+                      "POSITIONOFFSET": 43
                     }
                   ], 
                   "PHVNUMBER": 333
@@ -13789,7 +13556,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 335
@@ -13799,21 +13566,6 @@
                     {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 80
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 2, 
                       "FIELDMSB": 2, 
                       "PHVNAME": "eg_intr_md_egress_cos", 
@@ -13822,7 +13574,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 81
+                  "PHVNUMBER": 80
                 }, 
                 {
                   "PHVRECORD": [
@@ -13838,42 +13590,67 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 76
+                          "POSITIONOFFSET": 73
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 74
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 75
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 76
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 78
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 82
+                  "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": [
@@ -13885,7 +13662,7 @@
                       "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 42
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 339
@@ -13901,6 +13678,16 @@
                       "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
@@ -13915,7 +13702,7 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -13925,7 +13712,7 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 336
@@ -13940,46 +13727,21 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }
                   ], 
                   "PHVNUMBER": 337
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
-                    }
-                  ], 
-                  "PHVNUMBER": 338
                 }
               ], 
-              "TOTALEGRESSPHVS": 29
+              "TOTALEGRESSPHVS": 26
             }
           ], 
           "Stage": 9
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 58, 
-          "TOTALPHVRECORDS": 90, 
+          "TOTALSTAGEPHVS": 56, 
+          "TOTALPHVRECORDS": 89, 
           "Phvs": [
             {
               "PHVDIRECTION": 0, 
@@ -13998,7 +13760,7 @@
                           "HEADER": "--pov_reserved--_0", 
                           "POVBIT": 0, 
                           "HIDDEN": true, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 76
                         }
                       ]
                     }
@@ -14015,7 +13777,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
                   "PHVNUMBER": 1
@@ -14030,7 +13792,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 2
@@ -14045,7 +13807,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -14055,7 +13817,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 131
@@ -14080,31 +13842,6 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 2
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_urgentPtr", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
-                    }
-                  ], 
-                  "PHVNUMBER": 261
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 8, 
                       "PHVNAME": "packet_out_hdr_egress_port", 
@@ -14120,7 +13857,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -14128,21 +13865,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
-                    }
-                  ], 
-                  "PHVNUMBER": 324
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -14150,7 +13872,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 31
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -14175,7 +13897,7 @@
                       "PHVNAME": "ig_intr_md_for_tm_ucast_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 40
                     }
                   ], 
                   "PHVNUMBER": 130
@@ -14190,7 +13912,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 52
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -14200,7 +13922,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -14225,7 +13947,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 60
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 320
@@ -14233,41 +13955,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 65
-                    }
-                  ], 
-                  "PHVNUMBER": 259
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -14275,7 +13962,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 43
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -14285,7 +13972,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 63
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -14295,7 +13982,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 13
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -14305,7 +13992,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 36
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -14315,7 +14002,52 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 47
+                      "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 18
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 64
+                    }
+                  ], 
+                  "PHVNUMBER": 259
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 2
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_urgentPtr", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 260
@@ -14330,7 +14062,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 43
+                      "POSITIONOFFSET": 42
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -14340,7 +14072,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 288
@@ -14370,7 +14102,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -14380,7 +14112,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 290
@@ -14395,7 +14127,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -14405,7 +14137,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -14413,6 +14145,36 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 292
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 293
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -14420,7 +14182,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 14
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -14435,7 +14197,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 49
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 321
@@ -14443,21 +14205,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 64
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -14465,10 +14212,10 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 64
                 }, 
                 {
                   "PHVRECORD": [
@@ -14480,10 +14227,10 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 65
                 }, 
                 {
                   "PHVRECORD": [
@@ -14499,42 +14246,42 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 78
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 79
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 80
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 82
+                          "POSITIONOFFSET": 81
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 83
+                          "POSITIONOFFSET": 82
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -14549,7 +14296,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 68
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -14561,7 +14308,22 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
+                      "POSITIONOFFSET": 72
+                    }
+                  ], 
+                  "PHVNUMBER": 324
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -14571,12 +14333,27 @@
                     {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
+                    }
+                  ], 
+                  "PHVNUMBER": 326
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 31, 
                       "FIELDMSB": 31, 
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 56
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 258
@@ -14601,7 +14378,7 @@
                       "PHVNAME": "ipv4_fragOffset", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 45
+                      "POSITIONOFFSET": 44
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -14609,14 +14386,14 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 72
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -14626,13 +14403,13 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 54
+                      "POSITIONOFFSET": 53
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 29
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -14647,7 +14424,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 50
+                      "POSITIONOFFSET": 47
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -14657,7 +14434,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 18
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -14667,7 +14444,7 @@
                       "PHVNAME": "ipv4_hdrChecksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 11
+                      "POSITIONOFFSET": 9
                     }
                   ], 
                   "PHVNUMBER": 264
@@ -14682,7 +14459,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 12
                     }
                   ], 
                   "PHVNUMBER": 265
@@ -14697,7 +14474,7 @@
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 266
@@ -14712,7 +14489,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 25
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -14722,7 +14499,7 @@
                       "PHVNAME": "udp_length_", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
+                      "POSITIONOFFSET": 16
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -14732,7 +14509,7 @@
                       "PHVNAME": "udp_checksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 267
@@ -14747,7 +14524,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 38
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -14757,7 +14534,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 58
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -14767,7 +14544,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 11
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -14777,7 +14554,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 34
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -14787,7 +14564,7 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 41
                     }
                   ], 
                   "PHVNUMBER": 268
@@ -14812,7 +14589,7 @@
                       "PHVNAME": "tcp_urgentPtr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
+                      "POSITIONOFFSET": 45
                     }
                   ], 
                   "PHVNUMBER": 269
@@ -14827,7 +14604,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 270
@@ -14842,7 +14619,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 271
@@ -14854,43 +14631,13 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 8, 
                       "FIELDMSB": 8, 
-                      "PHVNAME": "ig_intr_md_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 9
-                    }
-                  ], 
-                  "PHVNUMBER": 144
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 145
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 8, 
-                      "FIELDMSB": 8, 
                       "PHVNAME": "eg_intr_md_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 146
+                  "PHVNUMBER": 144
                 }, 
                 {
                   "PHVRECORD": [
@@ -14902,7 +14649,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 29
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -14912,7 +14659,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 37
                     }
                   ], 
                   "PHVNUMBER": 296
@@ -14942,7 +14689,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -14952,7 +14699,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 298
@@ -14967,7 +14714,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -14977,7 +14724,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 299
@@ -14992,7 +14739,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 300
@@ -15007,7 +14754,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 301
@@ -15022,7 +14769,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 57
+                      "POSITIONOFFSET": 54
                     }
                   ], 
                   "PHVNUMBER": 332
@@ -15037,7 +14784,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 46
+                      "POSITIONOFFSET": 43
                     }
                   ], 
                   "PHVNUMBER": 333
@@ -15077,7 +14824,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 335
@@ -15087,21 +14834,6 @@
                     {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 80
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 2, 
                       "FIELDMSB": 2, 
                       "PHVNAME": "eg_intr_md_egress_cos", 
@@ -15110,7 +14842,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 81
+                  "PHVNUMBER": 80
                 }, 
                 {
                   "PHVRECORD": [
@@ -15126,42 +14858,67 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 76
+                          "POSITIONOFFSET": 73
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 74
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 75
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 76
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 78
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 82
+                  "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": [
@@ -15173,7 +14930,7 @@
                       "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 42
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 339
@@ -15189,6 +14946,16 @@
                       "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
@@ -15203,7 +14970,7 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -15213,7 +14980,7 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 336
@@ -15228,46 +14995,21 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }
                   ], 
                   "PHVNUMBER": 337
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
-                    }
-                  ], 
-                  "PHVNUMBER": 338
                 }
               ], 
-              "TOTALEGRESSPHVS": 29
+              "TOTALEGRESSPHVS": 26
             }
           ], 
           "Stage": 10
         }, 
         {
           "TOTALPOVHEADERS": 13, 
-          "TOTALSTAGEPHVS": 58, 
-          "TOTALPHVRECORDS": 90, 
+          "TOTALSTAGEPHVS": 56, 
+          "TOTALPHVRECORDS": 89, 
           "Phvs": [
             {
               "PHVDIRECTION": 0, 
@@ -15286,7 +15028,7 @@
                           "HEADER": "--pov_reserved--_0", 
                           "POVBIT": 0, 
                           "HIDDEN": true, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 76
                         }
                       ]
                     }
@@ -15303,7 +15045,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
                   "PHVNUMBER": 1
@@ -15318,7 +15060,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 2
@@ -15333,7 +15075,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }, 
                     {
                       "FIELDWIDTH": 6, 
@@ -15343,7 +15085,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
                   "PHVNUMBER": 131
@@ -15368,31 +15110,6 @@
                     {
                       "FIELDWIDTH": 2, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 2
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_urgentPtr", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
-                    }
-                  ], 
-                  "PHVNUMBER": 261
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 15, 
                       "FIELDMSB": 8, 
                       "PHVNAME": "packet_out_hdr_egress_port", 
@@ -15408,7 +15125,7 @@
                       "PHVNAME": "packet_in_hdr_ingress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 129
@@ -15416,21 +15133,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 16, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_seqNo", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
-                    }
-                  ], 
-                  "PHVNUMBER": 324
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 15, 
@@ -15438,7 +15140,7 @@
                       "PHVNAME": "ig_intr_md_resubmit_flag", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 15, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 31
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -15463,7 +15165,7 @@
                       "PHVNAME": "ig_intr_md_for_tm_ucast_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 40
                     }
                   ], 
                   "PHVNUMBER": 130
@@ -15478,7 +15180,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 52
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -15488,7 +15190,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 20
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -15513,7 +15215,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 60
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 320
@@ -15521,41 +15223,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 4, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 31, 
-                      "PHVNAME": "tcp_ackNo", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 31, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_length_", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
-                    }, 
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "udp_checksum", 
-                      "CONTAINERWIDTH": 32, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 65
-                    }
-                  ], 
-                  "PHVNUMBER": 259
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -15563,7 +15230,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 43
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -15573,7 +15240,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 63
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -15583,7 +15250,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 13
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -15593,7 +15260,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 36
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -15603,7 +15270,52 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 47
+                      "POSITIONOFFSET": 46
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_length_", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 18
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "udp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 64
+                    }
+                  ], 
+                  "PHVNUMBER": 259
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 31, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_checksum", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 16, 
+                      "POSITIONOFFSET": 2
+                    }, 
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_urgentPtr", 
+                      "CONTAINERWIDTH": 32, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 260
@@ -15618,7 +15330,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 43
+                      "POSITIONOFFSET": 42
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -15628,7 +15340,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 288
@@ -15658,7 +15370,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -15668,7 +15380,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 290
@@ -15683,7 +15395,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 37
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -15693,7 +15405,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 61
                     }
                   ], 
                   "PHVNUMBER": 291
@@ -15701,6 +15413,36 @@
                 {
                   "PHVRECORD": [
                     {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 8, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 292
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 2, 
+                      "FIELDLSB": 0, 
+                      "PHVMSB": 7, 
+                      "FIELDMSB": 7, 
+                      "PHVNAME": "tcp_dstPort", 
+                      "CONTAINERWIDTH": 8, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 34
+                    }
+                  ], 
+                  "PHVNUMBER": 293
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
                       "PHVMSB": 31, 
@@ -15708,7 +15450,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 14
                     }
                   ], 
                   "PHVNUMBER": 257
@@ -15723,7 +15465,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 49
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 321
@@ -15731,21 +15473,6 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 64
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
                       "FIELDWIDTH": 6, 
                       "FIELDLSB": 40, 
                       "PHVMSB": 7, 
@@ -15753,10 +15480,10 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 21
                     }
                   ], 
-                  "PHVNUMBER": 65
+                  "PHVNUMBER": 64
                 }, 
                 {
                   "PHVRECORD": [
@@ -15768,10 +15495,10 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 67
+                      "POSITIONOFFSET": 66
                     }
                   ], 
-                  "PHVNUMBER": 66
+                  "PHVNUMBER": 65
                 }, 
                 {
                   "PHVRECORD": [
@@ -15787,42 +15514,42 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 78
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 79
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 80
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 82
+                          "POSITIONOFFSET": 81
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 83
+                          "POSITIONOFFSET": 82
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 67
+                  "PHVNUMBER": 66
                 }, 
                 {
                   "PHVRECORD": [
@@ -15837,7 +15564,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 68
+                  "PHVNUMBER": 67
                 }, 
                 {
                   "PHVRECORD": [
@@ -15849,7 +15576,22 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 73
+                      "POSITIONOFFSET": 72
+                    }
+                  ], 
+                  "PHVNUMBER": 324
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
                     }
                   ], 
                   "PHVNUMBER": 325
@@ -15859,12 +15601,27 @@
                     {
                       "FIELDWIDTH": 4, 
                       "FIELDLSB": 0, 
+                      "PHVMSB": 15, 
+                      "FIELDMSB": 15, 
+                      "PHVNAME": "tcp_ackNo", 
+                      "CONTAINERWIDTH": 16, 
+                      "PHVLSB": 0, 
+                      "POSITIONOFFSET": 27
+                    }
+                  ], 
+                  "PHVNUMBER": 326
+                }, 
+                {
+                  "PHVRECORD": [
+                    {
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 0, 
                       "PHVMSB": 31, 
                       "FIELDMSB": 31, 
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 56
+                      "POSITIONOFFSET": 55
                     }
                   ], 
                   "PHVNUMBER": 258
@@ -15889,7 +15646,7 @@
                       "PHVNAME": "ipv4_fragOffset", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 45
+                      "POSITIONOFFSET": 44
                     }
                   ], 
                   "PHVNUMBER": 322
@@ -15897,14 +15654,14 @@
                 {
                   "PHVRECORD": [
                     {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
+                      "FIELDWIDTH": 4, 
+                      "FIELDLSB": 16, 
                       "PHVMSB": 15, 
-                      "FIELDMSB": 15, 
-                      "PHVNAME": "tcp_dstPort", 
+                      "FIELDMSB": 31, 
+                      "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 72
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -15914,13 +15671,13 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 54
+                      "POSITIONOFFSET": 53
                     }
                   ], 
                   "PHVNUMBER": 323
                 }
               ], 
-              "TOTALINGRESSPHVS": 29
+              "TOTALINGRESSPHVS": 30
             }, 
             {
               "PHVDIRECTION": 1, 
@@ -15935,7 +15692,7 @@
                       "PHVNAME": "ipv4_ttl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 24, 
-                      "POSITIONOFFSET": 50
+                      "POSITIONOFFSET": 47
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -15945,7 +15702,7 @@
                       "PHVNAME": "ipv4_protocol", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 21
+                      "POSITIONOFFSET": 18
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -15955,7 +15712,7 @@
                       "PHVNAME": "ipv4_hdrChecksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 11
+                      "POSITIONOFFSET": 9
                     }
                   ], 
                   "PHVNUMBER": 264
@@ -15970,7 +15727,7 @@
                       "PHVNAME": "ipv4_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 15
+                      "POSITIONOFFSET": 12
                     }
                   ], 
                   "PHVNUMBER": 265
@@ -15985,7 +15742,7 @@
                       "PHVNAME": "ipv4_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 53
+                      "POSITIONOFFSET": 50
                     }
                   ], 
                   "PHVNUMBER": 266
@@ -16000,7 +15757,7 @@
                       "PHVNAME": "tcp_ackNo", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 28
+                      "POSITIONOFFSET": 25
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -16010,7 +15767,7 @@
                       "PHVNAME": "udp_length_", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 19
+                      "POSITIONOFFSET": 16
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -16020,7 +15777,7 @@
                       "PHVNAME": "udp_checksum", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 62
+                      "POSITIONOFFSET": 59
                     }
                   ], 
                   "PHVNUMBER": 267
@@ -16035,7 +15792,7 @@
                       "PHVNAME": "tcp_dataOffset", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 28, 
-                      "POSITIONOFFSET": 41
+                      "POSITIONOFFSET": 38
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -16045,7 +15802,7 @@
                       "PHVNAME": "tcp_res", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 25, 
-                      "POSITIONOFFSET": 61
+                      "POSITIONOFFSET": 58
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -16055,7 +15812,7 @@
                       "PHVNAME": "tcp_ecn", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 22, 
-                      "POSITIONOFFSET": 14
+                      "POSITIONOFFSET": 11
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -16065,7 +15822,7 @@
                       "PHVNAME": "tcp_ctrl", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 16, 
-                      "POSITIONOFFSET": 37
+                      "POSITIONOFFSET": 34
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -16075,7 +15832,7 @@
                       "PHVNAME": "tcp_window", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 44
+                      "POSITIONOFFSET": 41
                     }
                   ], 
                   "PHVNUMBER": 268
@@ -16100,7 +15857,7 @@
                       "PHVNAME": "tcp_urgentPtr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 48
+                      "POSITIONOFFSET": 45
                     }
                   ], 
                   "PHVNUMBER": 269
@@ -16115,7 +15872,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 270
@@ -16130,7 +15887,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 32, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 271
@@ -16142,43 +15899,13 @@
                       "FIELDLSB": 0, 
                       "PHVMSB": 8, 
                       "FIELDMSB": 8, 
-                      "PHVNAME": "ig_intr_md_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 9
-                    }
-                  ], 
-                  "PHVNUMBER": 144
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 8, 
-                      "PHVNAME": "packet_in_hdr_ingress_port", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 7, 
-                      "POSITIONOFFSET": 33
-                    }
-                  ], 
-                  "PHVNUMBER": 145
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 2, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 8, 
-                      "FIELDMSB": 8, 
                       "PHVNAME": "eg_intr_md_egress_port", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 64
+                      "POSITIONOFFSET": 61
                     }
                   ], 
-                  "PHVNUMBER": 146
+                  "PHVNUMBER": 144
                 }, 
                 {
                   "PHVRECORD": [
@@ -16190,7 +15917,7 @@
                       "PHVNAME": "ipv4_version", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 4, 
-                      "POSITIONOFFSET": 32
+                      "POSITIONOFFSET": 29
                     }, 
                     {
                       "FIELDWIDTH": 1, 
@@ -16200,7 +15927,7 @@
                       "PHVNAME": "ipv4_ihl", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 40
+                      "POSITIONOFFSET": 37
                     }
                   ], 
                   "PHVNUMBER": 296
@@ -16230,7 +15957,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -16240,7 +15967,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 298
@@ -16255,7 +15982,7 @@
                       "PHVNAME": "tcp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 38
+                      "POSITIONOFFSET": 35
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -16265,7 +15992,7 @@
                       "PHVNAME": "udp_srcPort", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 59
+                      "POSITIONOFFSET": 56
                     }
                   ], 
                   "PHVNUMBER": 299
@@ -16280,7 +16007,7 @@
                       "PHVNAME": "ethernet_dstAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 22
+                      "POSITIONOFFSET": 19
                     }
                   ], 
                   "PHVNUMBER": 300
@@ -16295,7 +16022,7 @@
                       "PHVNAME": "ethernet_srcAddr", 
                       "CONTAINERWIDTH": 8, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
+                      "POSITIONOFFSET": 63
                     }
                   ], 
                   "PHVNUMBER": 301
@@ -16310,7 +16037,7 @@
                       "PHVNAME": "ipv4_totalLen", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 57
+                      "POSITIONOFFSET": 54
                     }
                   ], 
                   "PHVNUMBER": 332
@@ -16325,7 +16052,7 @@
                       "PHVNAME": "ipv4_identification", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 46
+                      "POSITIONOFFSET": 43
                     }
                   ], 
                   "PHVNUMBER": 333
@@ -16365,7 +16092,7 @@
                       "PHVNAME": "tcp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 35
+                      "POSITIONOFFSET": 32
                     }
                   ], 
                   "PHVNUMBER": 335
@@ -16375,21 +16102,6 @@
                     {
                       "FIELDWIDTH": 1, 
                       "FIELDLSB": 0, 
-                      "PHVMSB": 0, 
-                      "FIELDMSB": 0, 
-                      "PHVNAME": "ig_intr_md_for_tm_copy_to_cpu", 
-                      "CONTAINERWIDTH": 8, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 13
-                    }
-                  ], 
-                  "PHVNUMBER": 80
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 1, 
-                      "FIELDLSB": 0, 
                       "PHVMSB": 2, 
                       "FIELDMSB": 2, 
                       "PHVNAME": "eg_intr_md_egress_cos", 
@@ -16398,7 +16110,7 @@
                       "POSITIONOFFSET": 7
                     }
                   ], 
-                  "PHVNUMBER": 81
+                  "PHVNUMBER": 80
                 }, 
                 {
                   "PHVRECORD": [
@@ -16414,42 +16126,67 @@
                           "HEADER": "packet_in_hdr", 
                           "POVBIT": 0, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 76
+                          "POSITIONOFFSET": 73
                         }, 
                         {
                           "HEADER": "packet_out_hdr", 
                           "POVBIT": 1, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 77
+                          "POSITIONOFFSET": 74
                         }, 
                         {
                           "HEADER": "ethernet", 
                           "POVBIT": 2, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 78
+                          "POSITIONOFFSET": 75
                         }, 
                         {
                           "HEADER": "ipv4", 
                           "POVBIT": 3, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 79
+                          "POSITIONOFFSET": 76
                         }, 
                         {
                           "HEADER": "tcp", 
                           "POVBIT": 4, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 80
+                          "POSITIONOFFSET": 77
                         }, 
                         {
                           "HEADER": "udp", 
                           "POVBIT": 5, 
                           "HIDDEN": false, 
-                          "POSITIONOFFSET": 81
+                          "POSITIONOFFSET": 78
                         }
                       ]
                     }
                   ], 
-                  "PHVNUMBER": 82
+                  "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": [
@@ -16461,7 +16198,7 @@
                       "PHVNAME": "ethernet_etherType", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 42
+                      "POSITIONOFFSET": 39
                     }
                   ], 
                   "PHVNUMBER": 339
@@ -16477,6 +16214,16 @@
                       "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
@@ -16491,7 +16238,7 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }, 
                     {
                       "FIELDWIDTH": 2, 
@@ -16501,7 +16248,7 @@
                       "PHVNAME": "udp_dstPort", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 51
+                      "POSITIONOFFSET": 48
                     }
                   ], 
                   "PHVNUMBER": 336
@@ -16516,38 +16263,13 @@
                       "PHVNAME": "tcp_seqNo", 
                       "CONTAINERWIDTH": 16, 
                       "PHVLSB": 0, 
-                      "POSITIONOFFSET": 72
+                      "POSITIONOFFSET": 69
                     }
                   ], 
                   "PHVNUMBER": 337
-                }, 
-                {
-                  "PHVRECORD": [
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 0, 
-                      "PHVMSB": 15, 
-                      "FIELDMSB": 7, 
-                      "PHVNAME": "ethernet_dstAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 8, 
-                      "POSITIONOFFSET": 22
-                    }, 
-                    {
-                      "FIELDWIDTH": 6, 
-                      "FIELDLSB": 40, 
-                      "PHVMSB": 7, 
-                      "FIELDMSB": 47, 
-                      "PHVNAME": "ethernet_srcAddr", 
-                      "CONTAINERWIDTH": 16, 
-                      "PHVLSB": 0, 
-                      "POSITIONOFFSET": 66
-                    }
-                  ], 
-                  "PHVNUMBER": 338
                 }
               ], 
-              "TOTALEGRESSPHVS": 29
+              "TOTALEGRESSPHVS": 26
             }
           ], 
           "Stage": 11
@@ -16561,10 +16283,10 @@
             1
           ], 
           "TABLENAME": "ingress_port_count_table", 
-          "ID": 32, 
+          "ID": 16, 
           "TableHandle": 16777217, 
           "TCAMADDRSHIFT": 0, 
-          "Stage": 2
+          "Stage": 1
         }, 
         {
           "DIRECTION": 0, 
@@ -16573,10 +16295,10 @@
             0
           ], 
           "TABLENAME": "egress_port_count_table", 
-          "ID": 33, 
+          "ID": 17, 
           "TableHandle": 16777218, 
           "TCAMADDRSHIFT": 0, 
-          "Stage": 2
+          "Stage": 1
         }, 
         {
           "DIRECTION": 0, 
@@ -16585,10 +16307,10 @@
             0
           ], 
           "TABLENAME": "table0", 
-          "ID": 16, 
-          "TableHandle": 16777221, 
+          "ID": 0, 
+          "TableHandle": 16777220, 
           "TCAMADDRSHIFT": 3, 
-          "Stage": 1
+          "Stage": 0
         }, 
         {
           "DIRECTION": 0, 
@@ -16596,21 +16318,9 @@
           "PHYSICALBUSES": [
             1
           ], 
-          "TABLENAME": "ingress_pkt", 
-          "ID": 0, 
-          "TableHandle": 16777219, 
-          "TCAMADDRSHIFT": 0, 
-          "Stage": 0
-        }, 
-        {
-          "DIRECTION": 1, 
-          "TABLETYPE": "SRAM", 
-          "PHYSICALBUSES": [
-            0
-          ], 
-          "TABLENAME": "egress_pkt", 
+          "TABLENAME": "process_packet_out_table", 
           "ID": 1, 
-          "TableHandle": 16777220, 
+          "TableHandle": 16777219, 
           "TCAMADDRSHIFT": 0, 
           "Stage": 0
         }
@@ -16618,7 +16328,7 @@
     }, 
     "AlpmFormat": [], 
     "DefaultEntryFormat": {
-      "TotalTables": 5, 
+      "TotalTables": 4, 
       "DefaultEntries": [
         {
           "TotalActionFields": 0, 
@@ -16638,7 +16348,7 @@
                 "OVERRIDE_STATEFUL_FULL_ADDR": 0, 
                 "tbl_mask": 0, 
                 "OVERRIDE_METER_ADDR": false, 
-                "next_tbl": 33, 
+                "next_tbl": 17, 
                 "act_name": "reset_default_action"
               }
             }, 
@@ -16656,7 +16366,7 @@
                 "OVERRIDE_STATEFUL_FULL_ADDR": 0, 
                 "tbl_mask": 0, 
                 "OVERRIDE_METER_ADDR": false, 
-                "next_tbl": 33, 
+                "next_tbl": 17, 
                 "act_name": "count_ingress"
               }
             }
@@ -16673,7 +16383,7 @@
           "SelectorCount": 0, 
           "TableHandle": 16777217, 
           "LogicalId": 0, 
-          "Stage": 2
+          "Stage": 1
         }, 
         {
           "TotalActionFields": 0, 
@@ -16728,7 +16438,7 @@
           "SelectorCount": 0, 
           "TableHandle": 16777218, 
           "LogicalId": 1, 
-          "Stage": 2
+          "Stage": 1
         }, 
         {
           "TotalActionFields": 0, 
@@ -16755,7 +16465,7 @@
             {
               "ActionHandle": 536870919, 
               "ActionFunction": {
-                "instr": 65, 
+                "instr": 68, 
                 "OVERRIDE_STAT_FULL_ADDR": 0, 
                 "OVERRIDE_METER_ADDR_PFE": false, 
                 "OVERRIDE_STAT_ADDR_PFE": false, 
@@ -16767,7 +16477,7 @@
                 "tbl_mask": 0, 
                 "OVERRIDE_METER_ADDR": false, 
                 "next_tbl": 16, 
-                "act_name": "_packet_out"
+                "act_name": "_process_packet_out"
               }
             }
           ], 
@@ -16782,86 +16492,13 @@
           "TotalActionHandles": 2, 
           "SelectorCount": 0, 
           "TableHandle": 16777219, 
-          "LogicalId": 0, 
-          "Stage": 0
-        }, 
-        {
-          "TotalActionFields": 0, 
-          "Actions": [
-            {
-              "ActionHandle": 0, 
-              "ActionFunction": {
-                "instr": 0, 
-                "OVERRIDE_STAT_FULL_ADDR": 0, 
-                "OVERRIDE_METER_ADDR_PFE": false, 
-                "OVERRIDE_STAT_ADDR_PFE": false, 
-                "OVERRIDE_STATEFUL_ADDR_PFE": false, 
-                "OVERRIDE_METER_FULL_ADDR": 0, 
-                "OVERRIDE_STAT_ADDR": false, 
-                "tbl_name": "None", 
-                "OVERRIDE_STATEFUL_ADDR": false, 
-                "OVERRIDE_STATEFUL_FULL_ADDR": 0, 
-                "tbl_mask": 0, 
-                "OVERRIDE_METER_ADDR": false, 
-                "next_tbl": 255, 
-                "act_name": "reset_default_action"
-              }
-            }, 
-            {
-              "ActionHandle": 536870922, 
-              "ActionFunction": {
-                "instr": 65, 
-                "OVERRIDE_STAT_FULL_ADDR": 0, 
-                "OVERRIDE_METER_ADDR_PFE": false, 
-                "OVERRIDE_STAT_ADDR_PFE": false, 
-                "OVERRIDE_STATEFUL_ADDR_PFE": false, 
-                "OVERRIDE_METER_FULL_ADDR": 0, 
-                "OVERRIDE_STAT_ADDR": false, 
-                "OVERRIDE_STATEFUL_ADDR": false, 
-                "OVERRIDE_STATEFUL_FULL_ADDR": 0, 
-                "tbl_mask": 0, 
-                "OVERRIDE_METER_ADDR": false, 
-                "next_tbl": 255, 
-                "act_name": "add_packet_in_hdr"
-              }
-            }
-          ], 
-          "Immediate": [
-            {
-              "ActionHandle": 0
-            }, 
-            {
-              "ActionHandle": 536870922
-            }
-          ], 
-          "TotalActionHandles": 2, 
-          "SelectorCount": 0, 
-          "TableHandle": 16777220, 
           "LogicalId": 1, 
           "Stage": 0
         }, 
         {
-          "TotalActionFields": 1, 
+          "TotalActionFields": 2, 
           "Actions": [
             {
-              "ActionHandle": 536870928, 
-              "ActionFunction": {
-                "instr": 67, 
-                "OVERRIDE_STAT_FULL_ADDR": 0, 
-                "OVERRIDE_METER_ADDR_PFE": false, 
-                "OVERRIDE_STAT_ADDR_PFE": false, 
-                "OVERRIDE_STATEFUL_ADDR_PFE": false, 
-                "OVERRIDE_METER_FULL_ADDR": 0, 
-                "OVERRIDE_STAT_ADDR": false, 
-                "OVERRIDE_STATEFUL_ADDR": false, 
-                "OVERRIDE_STATEFUL_FULL_ADDR": 0, 
-                "tbl_mask": 0, 
-                "OVERRIDE_METER_ADDR": false, 
-                "next_tbl": 32, 
-                "act_name": "_drop"
-              }
-            }, 
-            {
               "ActionHandle": 0, 
               "ActionFunction": {
                 "instr": 0, 
@@ -16876,12 +16513,12 @@
                 "OVERRIDE_STATEFUL_FULL_ADDR": 0, 
                 "tbl_mask": 0, 
                 "OVERRIDE_METER_ADDR": false, 
-                "next_tbl": 32, 
+                "next_tbl": 16, 
                 "act_name": "reset_default_action"
               }
             }, 
             {
-              "ActionHandle": 536870924, 
+              "ActionHandle": 536870921, 
               "ActionFunction": {
                 "instr": 65, 
                 "OVERRIDE_STAT_FULL_ADDR": 0, 
@@ -16894,12 +16531,12 @@
                 "OVERRIDE_STATEFUL_FULL_ADDR": 0, 
                 "tbl_mask": 0, 
                 "OVERRIDE_METER_ADDR": false, 
-                "next_tbl": 32, 
+                "next_tbl": 16, 
                 "act_name": "set_egress_port"
               }
             }, 
             {
-              "ActionHandle": 536870926, 
+              "ActionHandle": 536870925, 
               "ActionFunction": {
                 "instr": 66, 
                 "OVERRIDE_STAT_FULL_ADDR": 0, 
@@ -16912,20 +16549,35 @@
                 "OVERRIDE_STATEFUL_FULL_ADDR": 0, 
                 "tbl_mask": 0, 
                 "OVERRIDE_METER_ADDR": false, 
-                "next_tbl": 32, 
+                "next_tbl": 16, 
                 "act_name": "send_to_cpu"
               }
+            }, 
+            {
+              "ActionHandle": 536870927, 
+              "ActionFunction": {
+                "instr": 67, 
+                "OVERRIDE_STAT_FULL_ADDR": 0, 
+                "OVERRIDE_METER_ADDR_PFE": false, 
+                "OVERRIDE_STAT_ADDR_PFE": false, 
+                "OVERRIDE_STATEFUL_ADDR_PFE": false, 
+                "OVERRIDE_METER_FULL_ADDR": 0, 
+                "OVERRIDE_STAT_ADDR": false, 
+                "OVERRIDE_STATEFUL_ADDR": false, 
+                "OVERRIDE_STATEFUL_FULL_ADDR": 0, 
+                "tbl_mask": 0, 
+                "OVERRIDE_METER_ADDR": false, 
+                "next_tbl": 16, 
+                "act_name": "_drop"
+              }
             }
           ], 
           "Immediate": [
             {
-              "ActionHandle": 536870928
-            }, 
-            {
               "ActionHandle": 0
             }, 
             {
-              "ActionHandle": 536870924, 
+              "ActionHandle": 536870921, 
               "ActionFunctionFields": [
                 {
                   "DSTSTART": 0, 
@@ -16940,14 +16592,29 @@
               ]
             }, 
             {
-              "ActionHandle": 536870926
+              "ActionHandle": 536870925, 
+              "ActionFunctionFields": [
+                {
+                  "DSTSTART": 0, 
+                  "PARAMNAME": "--constant-0--", 
+                  "PARAMVAL": 320, 
+                  "PARAMTYPE": "constant", 
+                  "PARAMSTART": 0, 
+                  "PARAMWIDTH": 9, 
+                  "PARAMSHIFT": 0, 
+                  "DSTWIDTH": 9
+                }
+              ]
+            }, 
+            {
+              "ActionHandle": 536870927
             }
           ], 
           "TotalActionHandles": 4, 
           "SelectorCount": 0, 
-          "TableHandle": 16777221, 
+          "TableHandle": 16777220, 
           "LogicalId": 0, 
-          "Stage": 1
+          "Stage": 0
         }
       ]
     }
@@ -16965,7 +16632,8 @@
         "6": "default_parser", 
         "7": "parse_pkt_out", 
         "8": "<POV initialization>_<Ingress intrinsic metadata>_<Phase 0>", 
-        "9": "start"
+        "9": "start", 
+        "10": "parse_tcp//spilled"
       }, 
       "parser_value_set": []
     }, 
@@ -16979,7 +16647,7 @@
         "4": "parse_udp", 
         "5": "default_parser", 
         "6": "parse_pkt_out", 
-        "7": "<POV initialization>_<Egress intrinsic metadata>_<POV skip>_<Metadata bridge>_<_parse_bridged_ingress_intrinsic_metadata>_start", 
+        "7": "<POV initialization>_<Egress intrinsic metadata>_<POV skip>_<_parse_bridged_ingress_intrinsic_metadata>_start", 
         "8": "parse_pkt_in"
       }, 
       "parser_value_set": []
@@ -16995,7 +16663,7 @@
         "stage_tables_length": 1, 
         "stage_tables": [
           {
-            "stage_number": 2, 
+            "stage_number": 1, 
             "stage_table_type": "match_with_no_key", 
             "number_entries": 1, 
             "pack_format_length": 1, 
@@ -17018,7 +16686,7 @@
             "stage_table_type_handle": 0, 
             "stage_idletime_table": null, 
             "stage_gateway_table": {
-              "stage_number": 2, 
+              "stage_number": 1, 
               "stage_table_type": "gateway", 
               "number_entries": 0, 
               "pack_format_length": 0, 
@@ -17131,12 +16799,12 @@
               "536870914": {
                 "next_table_address_to_use": 0, 
                 "action_name": "count_ingress", 
-                "next_table_full_address": 33, 
+                "next_table_full_address": 17, 
                 "next_table_name": "egress_port_count_table"
               }
             }, 
             "default_next_table_modifiable": false, 
-            "default_next_table": 33, 
+            "default_next_table": 17, 
             "action_to_immediate_mapping": {
               "536870914": [
                 []
@@ -17254,7 +16922,7 @@
         "stage_tables_length": 1, 
         "stage_tables": [
           {
-            "stage_number": 2, 
+            "stage_number": 1, 
             "stage_table_type": "match_with_no_key", 
             "number_entries": 1, 
             "pack_format_length": 1, 
@@ -17277,7 +16945,7 @@
             "stage_table_type_handle": 1, 
             "stage_idletime_table": null, 
             "stage_gateway_table": {
-              "stage_number": 2, 
+              "stage_number": 1, 
               "stage_table_type": "gateway", 
               "number_entries": 0, 
               "pack_format_length": 0, 
@@ -17488,7 +17156,7 @@
         "ap_bind_indirect_res_to_match": []
       }, 
       {
-        "name": "ingress_pkt", 
+        "name": "process_packet_out_table", 
         "handle": 16777219, 
         "direction": "ingress", 
         "number_entries": 1024, 
@@ -17514,7 +17182,7 @@
               }
             ], 
             "memory_resource_allocation": null, 
-            "stage_table_handle": 0, 
+            "stage_table_handle": 1, 
             "stage_table_type_handle": 0, 
             "stage_idletime_table": null, 
             "stage_gateway_table": {
@@ -17545,10 +17213,8 @@
                     16
                   ]
                 ], 
-                "match_group_key_bit_width": 8, 
-                "match_group_phv_bit_scrambling": {
-                  "--validity_check--packet_out_hdr[0]": 9
-                }, 
+                "match_group_key_bit_width": 0, 
+                "match_group_phv_bit_scrambling": {}, 
                 "match_group_match_bit_scrambling": {}, 
                 "seed": [
                   0, 
@@ -17607,24 +17273,24 @@
                 "hash_match_group_id_for_hash_bits": 0, 
                 "hash_match_group_id_for_data_bits": 0
               }, 
-              "use_condition_from_program": true
+              "use_condition_from_program": false
             }, 
             "match_group_resource_allocation": [], 
             "vliw_resource_allocation": {
               "536870919": {
-                "address_to_use": 1, 
-                "full_address": 65, 
-                "vliw_instruction_number": 0, 
-                "color": 1, 
+                "address_to_use": 0, 
+                "full_address": 68, 
+                "vliw_instruction_number": 2, 
+                "color": 0, 
                 "direction": "ingress"
               }
             }, 
             "action_to_next_table_mapping": {
               "536870919": {
                 "next_table_address_to_use": 0, 
-                "action_name": "_packet_out", 
+                "action_name": "_process_packet_out", 
                 "next_table_full_address": 16, 
-                "next_table_name": "_condition_1"
+                "next_table_name": "_condition_2"
               }
             }, 
             "default_next_table_modifiable": false, 
@@ -17639,19 +17305,11 @@
         ], 
         "match_key_fields": [], 
         "match_fields_type_dictionary": {}, 
-        "gateway_fields": [
-          {
-            "name": "--validity_check--packet_out_hdr", 
-            "start_offset": 0, 
-            "start_bit": 0, 
-            "bit_width": 1, 
-            "range_field": false
-          }
-        ], 
+        "gateway_fields": [], 
         "preferred_match_type": "exact", 
         "actions": [
           {
-            "name": "_packet_out", 
+            "name": "_process_packet_out", 
             "handle": 536870919, 
             "allowed_to_be_default_action": true, 
             "disallowed_as_default_action_reason": null, 
@@ -17697,14 +17355,14 @@
                 "phv_word_address": 130
               }, 
               {
-                "phv_word_address": 67
+                "phv_word_address": 66
               }
             ], 
             "indirect_resources": []
           }
         ], 
         "default_action": {
-          "name": "_packet_out", 
+          "name": "_process_packet_out", 
           "handle": 536870919, 
           "allowed_to_be_default_action": true, 
           "disallowed_as_default_action_reason": null, 
@@ -17750,294 +17408,7 @@
               "phv_word_address": 130
             }, 
             {
-              "phv_word_address": 67
-            }
-          ]
-        }, 
-        "default_action_parameters": {}, 
-        "default_only_action": null, 
-        "p4_action_data_tables": [], 
-        "p4_statistics_tables": [], 
-        "p4_meter_tables": [], 
-        "p4_stateful_tables": [], 
-        "p4_selection_tables": [], 
-        "include_idletime": false, 
-        "performs_hash_action": false, 
-        "uses_range": false, 
-        "number_entries_with_ranges": 0, 
-        "uses_versioning": true, 
-        "tcam_error_detect": false, 
-        "dynamic_match_key_masks": false, 
-        "uses_static_entries": false, 
-        "match_type": "exact", 
-        "action_profile": null, 
-        "timeout": false, 
-        "ap_bind_indirect_res_to_match": []
-      }, 
-      {
-        "name": "egress_pkt", 
-        "handle": 16777220, 
-        "direction": "egress", 
-        "number_entries": 1024, 
-        "stage_tables_length": 1, 
-        "stage_tables": [
-          {
-            "stage_number": 0, 
-            "stage_table_type": "match_with_no_key", 
-            "number_entries": 1, 
-            "pack_format_length": 1, 
-            "pack_format": [
-              {
-                "table_word_width": 0, 
-                "memory_word_width": 0, 
-                "entries_per_table_word": 1, 
-                "number_memory_units_per_table_word": 0, 
-                "entry_list": [
-                  {
-                    "entry_number": 0, 
-                    "field_list": []
-                  }
-                ]
-              }
-            ], 
-            "memory_resource_allocation": null, 
-            "stage_table_handle": 1, 
-            "stage_table_type_handle": 1, 
-            "stage_idletime_table": null, 
-            "stage_gateway_table": {
-              "stage_number": 0, 
-              "stage_table_type": "gateway", 
-              "number_entries": 0, 
-              "pack_format_length": 0, 
-              "pack_format": [], 
-              "memory_resource_allocation": {
-                "memory_type": "gateway", 
-                "memory_units_depth": 1, 
-                "memory_units_width": 1, 
-                "memory_units_and_vpns": [
-                  {
-                    "memory_units": [
-                      15
-                    ], 
-                    "vpns": [
-                      null
-                    ]
-                  }
-                ]
-              }, 
-              "gateway_match_group_resource_allocation": {
-                "match_groups": [
-                  [
-                    0, 
-                    16
-                  ]
-                ], 
-                "match_group_key_bit_width": 8, 
-                "match_group_phv_bit_scrambling": {
-                  "ig_intr_md_for_tm.copy_to_cpu[0]": 0
-                }, 
-                "match_group_match_bit_scrambling": {}, 
-                "seed": [
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0, 
-                  0
-                ], 
-                "hash_match_group_id_for_hash_bits": 0, 
-                "hash_match_group_id_for_data_bits": 0
-              }, 
-              "use_condition_from_program": true
-            }, 
-            "match_group_resource_allocation": [], 
-            "vliw_resource_allocation": {
-              "536870922": {
-                "address_to_use": 1, 
-                "full_address": 65, 
-                "vliw_instruction_number": 0, 
-                "color": 1, 
-                "direction": "egress"
-              }
-            }, 
-            "action_to_next_table_mapping": {
-              "536870922": {
-                "next_table_address_to_use": 0, 
-                "action_name": "add_packet_in_hdr", 
-                "next_table_full_address": 255, 
-                "next_table_name": "--END_OF_PIPELINE--"
-              }
-            }, 
-            "default_next_table_modifiable": false, 
-            "default_next_table": 255, 
-            "action_to_immediate_mapping": {
-              "536870922": [
-                []
-              ]
-            }, 
-            "stage_table_type_handle_type": "exact"
-          }
-        ], 
-        "match_key_fields": [], 
-        "match_fields_type_dictionary": {}, 
-        "gateway_fields": [
-          {
-            "name": "ig_intr_md_for_tm.copy_to_cpu", 
-            "start_offset": 35, 
-            "start_bit": 0, 
-            "bit_width": 1, 
-            "range_field": false
-          }
-        ], 
-        "preferred_match_type": "exact", 
-        "actions": [
-          {
-            "name": "add_packet_in_hdr", 
-            "handle": 536870922, 
-            "allowed_to_be_default_action": true, 
-            "disallowed_as_default_action_reason": null, 
-            "override_stat_addr_pfe": false, 
-            "override_stat_addr": false, 
-            "override_stat_full_addr": 0, 
-            "override_meter_addr_pfe": false, 
-            "override_meter_addr": false, 
-            "override_meter_full_addr": 0, 
-            "override_stateful_addr_pfe": false, 
-            "override_stateful_addr": false, 
-            "override_stateful_full_addr": 0, 
-            "p4_parameters": [], 
-            "p4_primitives": [
-              {
-                "handle": 536870920, 
-                "header_instance": "packet_in_hdr"
-              }, 
-              {
-                "handle": 536870921, 
-                "destination_field": {
-                  "name": "packet_in_hdr.ingress_port", 
-                  "start_offset": 0, 
-                  "start_bit": 0, 
-                  "bit_width": 9, 
-                  "range_field": false
-                }, 
-                "source_value": {
-                  "name": "ig_intr_md.ingress_port", 
-                  "start_offset": 7, 
-                  "start_bit": 0, 
-                  "bit_width": 9, 
-                  "range_field": false
-                }, 
-                "mask": {
-                  "value": 511, 
-                  "signed": false
-                }
-              }
-            ], 
-            "stage_primitives": [
-              {
-                "phv_word_address": 82
-              }, 
-              {
-                "phv_word_address": 145
-              }
-            ], 
-            "indirect_resources": []
-          }
-        ], 
-        "default_action": {
-          "name": "add_packet_in_hdr", 
-          "handle": 536870922, 
-          "allowed_to_be_default_action": true, 
-          "disallowed_as_default_action_reason": null, 
-          "override_stat_addr_pfe": false, 
-          "override_stat_addr": false, 
-          "override_stat_full_addr": 0, 
-          "override_meter_addr_pfe": false, 
-          "override_meter_addr": false, 
-          "override_meter_full_addr": 0, 
-          "override_stateful_addr_pfe": false, 
-          "override_stateful_addr": false, 
-          "override_stateful_full_addr": 0, 
-          "p4_parameters": [], 
-          "p4_primitives": [
-            {
-              "handle": 536870920, 
-              "header_instance": "packet_in_hdr"
-            }, 
-            {
-              "handle": 536870921, 
-              "destination_field": {
-                "name": "packet_in_hdr.ingress_port", 
-                "start_offset": 0, 
-                "start_bit": 0, 
-                "bit_width": 9, 
-                "range_field": false
-              }, 
-              "source_value": {
-                "name": "ig_intr_md.ingress_port", 
-                "start_offset": 7, 
-                "start_bit": 0, 
-                "bit_width": 9, 
-                "range_field": false
-              }, 
-              "mask": {
-                "value": 511, 
-                "signed": false
-              }
-            }
-          ], 
-          "stage_primitives": [
-            {
-              "phv_word_address": 82
-            }, 
-            {
-              "phv_word_address": 145
+              "phv_word_address": 66
             }
           ]
         }, 
@@ -18063,13 +17434,13 @@
       }, 
       {
         "name": "table0", 
-        "handle": 16777221, 
+        "handle": 16777220, 
         "direction": "ingress", 
         "number_entries": 512, 
         "stage_tables_length": 1, 
         "stage_tables": [
           {
-            "stage_number": 1, 
+            "stage_number": 0, 
             "stage_table_type": "ternary_match", 
             "number_entries": 512, 
             "pack_format_length": 0, 
@@ -18262,7 +17633,7 @@
             "stage_table_handle": 0, 
             "stage_table_type_handle": 0, 
             "stage_idletime_table": {
-              "stage_number": 1, 
+              "stage_number": 0, 
               "stage_table_type": "idletime", 
               "number_entries": 2048, 
               "pack_format_length": 1, 
@@ -18343,7 +17714,7 @@
               "idletime_per_flow_idletime": true
             }, 
             "stage_gateway_table": {
-              "stage_number": 1, 
+              "stage_number": 0, 
               "stage_table_type": "gateway", 
               "number_entries": 0, 
               "pack_format_length": 0, 
@@ -18708,21 +18079,21 @@
               }
             ], 
             "vliw_resource_allocation": {
-              "536870924": {
+              "536870921": {
                 "address_to_use": 5, 
                 "full_address": 65, 
                 "vliw_instruction_number": 0, 
                 "color": 1, 
                 "direction": "ingress"
               }, 
-              "536870926": {
+              "536870925": {
                 "address_to_use": 6, 
                 "full_address": 66, 
                 "vliw_instruction_number": 1, 
                 "color": 0, 
                 "direction": "ingress"
               }, 
-              "536870928": {
+              "536870927": {
                 "address_to_use": 7, 
                 "full_address": 67, 
                 "vliw_instruction_number": 1, 
@@ -18731,28 +18102,28 @@
               }
             }, 
             "action_to_next_table_mapping": {
-              "536870924": {
+              "536870921": {
                 "next_table_address_to_use": 0, 
                 "action_name": "set_egress_port", 
-                "next_table_full_address": 32, 
+                "next_table_full_address": 16, 
                 "next_table_name": "_condition_2"
               }, 
-              "536870926": {
+              "536870925": {
                 "next_table_address_to_use": 0, 
                 "action_name": "send_to_cpu", 
-                "next_table_full_address": 32, 
+                "next_table_full_address": 16, 
                 "next_table_name": "_condition_2"
               }, 
-              "536870928": {
+              "536870927": {
                 "next_table_address_to_use": 0, 
                 "action_name": "_drop", 
-                "next_table_full_address": 32, 
+                "next_table_full_address": 16, 
                 "next_table_name": "_condition_2"
               }
             }, 
-            "default_next_table": 32, 
+            "default_next_table": 16, 
             "action_to_immediate_mapping": {
-              "536870924": [
+              "536870921": [
                 [
                   {
                     "name": "port", 
@@ -18768,15 +18139,27 @@
                 ], 
                 []
               ], 
-              "536870926": [
-                []
+              "536870925": [
+                [
+                  {
+                    "name": "--constant-0--", 
+                    "parameter_least_significant_bit": 0, 
+                    "parameter_most_significant_bit": 8, 
+                    "immediate_least_significant_bit": 0, 
+                    "immediate_most_significant_bit": 8, 
+                    "location": "match_entry", 
+                    "type": "constant", 
+                    "value": 320, 
+                    "field_called": "--immediate--"
+                  }
+                ]
               ], 
-              "536870928": [
+              "536870927": [
                 []
               ]
             }, 
             "ternary_indirection_table": {
-              "stage_number": 1, 
+              "stage_number": 0, 
               "stage_table_type": "ternary_indirection", 
               "number_entries": 4096, 
               "pack_format_length": 1, 
@@ -18961,7 +18344,7 @@
         "actions": [
           {
             "name": "set_egress_port", 
-            "handle": 536870924, 
+            "handle": 536870921, 
             "allowed_to_be_default_action": true, 
             "disallowed_as_default_action_reason": null, 
             "override_stat_addr_pfe": false, 
@@ -18987,7 +18370,7 @@
             ], 
             "p4_primitives": [
               {
-                "handle": 536870923, 
+                "handle": 536870920, 
                 "destination_field": {
                   "name": "ig_intr_md_for_tm.ucast_egress_port", 
                   "start_offset": 7, 
@@ -19020,7 +18403,7 @@
           }, 
           {
             "name": "send_to_cpu", 
-            "handle": 536870926, 
+            "handle": 536870925, 
             "allowed_to_be_default_action": true, 
             "disallowed_as_default_action_reason": null, 
             "override_stat_addr_pfe": false, 
@@ -19035,34 +18418,65 @@
             "p4_parameters": [], 
             "p4_primitives": [
               {
-                "handle": 536870925, 
+                "handle": 536870922, 
                 "destination_field": {
-                  "name": "ig_intr_md_for_tm.copy_to_cpu", 
-                  "start_offset": 35, 
+                  "name": "ig_intr_md_for_tm.ucast_egress_port", 
+                  "start_offset": 7, 
                   "start_bit": 0, 
-                  "bit_width": 1, 
+                  "bit_width": 9, 
                   "range_field": false
                 }, 
                 "source_value": {
-                  "value": 1, 
+                  "value": 320, 
                   "signed": false
                 }, 
                 "mask": {
-                  "value": 1, 
+                  "value": 511, 
+                  "signed": false
+                }
+              }, 
+              {
+                "handle": 536870923, 
+                "header_instance": "packet_in_hdr"
+              }, 
+              {
+                "handle": 536870924, 
+                "destination_field": {
+                  "name": "packet_in_hdr.ingress_port", 
+                  "start_offset": 0, 
+                  "start_bit": 0, 
+                  "bit_width": 9, 
+                  "range_field": false
+                }, 
+                "source_value": {
+                  "name": "ig_intr_md.ingress_port", 
+                  "start_offset": 7, 
+                  "start_bit": 0, 
+                  "bit_width": 9, 
+                  "range_field": false
+                }, 
+                "mask": {
+                  "value": 511, 
                   "signed": false
                 }
               }
             ], 
             "stage_primitives": [
               {
-                "phv_word_address": 64
+                "phv_word_address": 130
+              }, 
+              {
+                "phv_word_address": 66
+              }, 
+              {
+                "phv_word_address": 129
               }
             ], 
             "indirect_resources": []
           }, 
           {
             "name": "_drop", 
-            "handle": 536870928, 
+            "handle": 536870927, 
             "allowed_to_be_default_action": true, 
             "disallowed_as_default_action_reason": null, 
             "override_stat_addr_pfe": false, 
@@ -19077,13 +18491,13 @@
             "p4_parameters": [], 
             "p4_primitives": [
               {
-                "handle": 536870927, 
+                "handle": 536870926, 
                 "table_direction": "ingress"
               }
             ], 
             "stage_primitives": [
               {
-                "phv_word_address": 68
+                "phv_word_address": 67
               }
             ], 
             "indirect_resources": []
@@ -19120,11 +18534,11 @@
         "name": "ingress_port_counter", 
         "handle": 67108865, 
         "direction": "ingress", 
-        "number_entries": 254, 
+        "number_entries": 510, 
         "stage_tables_length": 1, 
         "stage_tables": [
           {
-            "stage_number": 2, 
+            "stage_number": 1, 
             "stage_table_type": "statistics", 
             "number_entries": 4096, 
             "pack_format_length": 1, 
@@ -19228,11 +18642,11 @@
         "name": "egress_port_counter", 
         "handle": 67108866, 
         "direction": "ingress", 
-        "number_entries": 254, 
+        "number_entries": 510, 
         "stage_tables_length": 1, 
         "stage_tables": [
           {
-            "stage_number": 2, 
+            "stage_number": 1, 
             "stage_table_type": "statistics", 
             "number_entries": 4096, 
             "pack_format_length": 1, 
@@ -19340,7 +18754,7 @@
         "stage_tables_length": 1, 
         "stage_tables": [
           {
-            "stage_number": 1, 
+            "stage_number": 0, 
             "stage_table_type": "statistics", 
             "number_entries": 4096, 
             "pack_format_length": 1, 
@@ -19452,7 +18866,6 @@
         "ipv4_flags": 1, 
         "ig_intr_md_ingress_port": 2, 
         "ipv4_hdrChecksum": 2, 
-        "ig_intr_md_for_tm_copy_to_cpu": 1, 
         "tcp_ecn": 1, 
         "ipv4_srcAddr": 4, 
         "udp_length_": 2, 
@@ -19489,9 +18902,7 @@
         "ipv4_fragOffset": 2, 
         "eg_intr_md_egress_cos": 1, 
         "ipv4_flags": 1, 
-        "ig_intr_md_ingress_port": 2, 
         "ipv4_hdrChecksum": 2, 
-        "ig_intr_md_for_tm_copy_to_cpu": 1, 
         "tcp_ecn": 1, 
         "ipv4_srcAddr": 4, 
         "udp_length_": 2, 
@@ -19523,7 +18934,7 @@
     }, 
     {
       "0": {
-        "67": {
+        "66": {
           "0": "packet_in_hdr", 
           "1": "packet_out_hdr", 
           "2": "ethernet", 
@@ -19533,7 +18944,7 @@
         }
       }, 
       "1": {
-        "82": {
+        "81": {
           "0": "packet_in_hdr", 
           "1": "packet_out_hdr", 
           "2": "ethernet",