diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
index cb56bf0..9e0d9a5 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
@@ -32,19 +32,28 @@
         ["fabric_metadata_t._ip_proto12", 8, false],
         ["fabric_metadata_t._l4_sport13", 16, false],
         ["fabric_metadata_t._l4_dport14", 16, false],
-        ["fabric_metadata_t._spgw_direction15", 2, false],
-        ["fabric_metadata_t._spgw_ipv4_len16", 16, false],
-        ["fabric_metadata_t._spgw_teid17", 32, false],
-        ["fabric_metadata_t._spgw_s1u_enb_addr18", 32, false],
-        ["fabric_metadata_t._spgw_s1u_sgw_addr19", 32, false],
-        ["fabric_metadata_t._int_meta_source20", 1, false],
-        ["fabric_metadata_t._int_meta_transit21", 1, false],
-        ["fabric_metadata_t._int_meta_sink22", 1, false],
-        ["fabric_metadata_t._int_meta_switch_id23", 32, false],
-        ["fabric_metadata_t._int_meta_new_words24", 8, false],
-        ["fabric_metadata_t._int_meta_new_bytes25", 16, false],
-        ["fabric_metadata_t._int_meta_ig_tstamp26", 32, false],
-        ["fabric_metadata_t._int_meta_eg_tstamp27", 32, false]
+        ["fabric_metadata_t._ipv4_src_addr15", 32, false],
+        ["fabric_metadata_t._ipv4_dst_addr16", 32, false],
+        ["fabric_metadata_t._spgw_direction17", 2, false],
+        ["fabric_metadata_t._spgw_ipv4_len18", 16, false],
+        ["fabric_metadata_t._spgw_teid19", 32, false],
+        ["fabric_metadata_t._spgw_tunnel_src_addr20", 32, false],
+        ["fabric_metadata_t._spgw_tunnel_dst_addr21", 32, false],
+        ["fabric_metadata_t._spgw_ctr_id22", 32, false],
+        ["fabric_metadata_t._spgw_far_id23", 32, false],
+        ["fabric_metadata_t._spgw_pdr_hit24", 1, false],
+        ["fabric_metadata_t._spgw_far_dropped25", 1, false],
+        ["fabric_metadata_t._spgw_notify_cp26", 1, false],
+        ["fabric_metadata_t._spgw_outer_header_creation27", 1, false],
+        ["fabric_metadata_t._int_meta_source28", 1, false],
+        ["fabric_metadata_t._int_meta_transit29", 1, false],
+        ["fabric_metadata_t._int_meta_sink30", 1, false],
+        ["fabric_metadata_t._int_meta_switch_id31", 32, false],
+        ["fabric_metadata_t._int_meta_new_words32", 8, false],
+        ["fabric_metadata_t._int_meta_new_bytes33", 16, false],
+        ["fabric_metadata_t._int_meta_ig_tstamp34", 32, false],
+        ["fabric_metadata_t._int_meta_eg_tstamp35", 32, false],
+        ["_padding_0", 4, false]
       ]
     },
     {
@@ -887,6 +896,32 @@
               "parameters" : [
                 {
                   "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["ipv4", "src_addr"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["ipv4", "dst_addr"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
                   "value" : ["scalars", "last_ipv4_dscp_0"]
                 },
                 {
@@ -1362,7 +1397,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 269,
+        "line" : 267,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
@@ -1372,16 +1407,16 @@
   "meter_arrays" : [],
   "counter_arrays" : [
     {
-      "name" : "FabricIngress.spgw_ingress.ue_counter",
+      "name" : "FabricIngress.spgw_ingress.pdr_counter",
       "id" : 0,
-      "is_direct" : true,
-      "binding" : "FabricIngress.spgw_ingress.dl_sess_lookup",
       "source_info" : {
         "filename" : "include/spgw.p4",
-        "line" : 52,
-        "column" : 50,
-        "source_fragment" : "ue_counter"
-      }
+        "line" : 56,
+        "column" : 49,
+        "source_fragment" : "pdr_counter"
+      },
+      "size" : 1024,
+      "is_direct" : false
     },
     {
       "name" : "FabricIngress.process_set_source_sink.counter_set_source",
@@ -1528,8 +1563,20 @@
       "is_direct" : false
     },
     {
-      "name" : "FabricEgress.process_int_main.process_int_source.counter_int_source",
+      "name" : "FabricEgress.spgw_egress.pdr_counter",
       "id" : 13,
+      "source_info" : {
+        "filename" : "include/spgw.p4",
+        "line" : 246,
+        "column" : 49,
+        "source_fragment" : "pdr_counter"
+      },
+      "size" : 1024,
+      "is_direct" : false
+    },
+    {
+      "name" : "FabricEgress.process_int_main.process_int_source.counter_int_source",
+      "id" : 14,
       "is_direct" : true,
       "binding" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
       "source_info" : {
@@ -1541,7 +1588,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.egress_vlan_counter",
-      "id" : 14,
+      "id" : 15,
       "is_direct" : true,
       "binding" : "FabricEgress.egress_next.egress_vlan",
       "source_info" : {
@@ -1620,7 +1667,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/spgw.p4",
-        "line" : 243,
+        "line" : 306,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -1801,11 +1848,99 @@
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.spgw_ingress.gtpu_decap",
+      "name" : "NoAction",
       "id" : 10,
       "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 11,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.gtpu_decap",
+      "id" : 12,
+      "runtime_data" : [],
       "primitives" : [
         {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
+            },
+            {
+              "type" : "field",
+              "value" : ["gtpu", "teid"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 61,
+            "column" : 30,
+            "source_fragment" : "= gtpu.teid; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr21"]
+            },
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 62,
+            "column" : 41,
+            "source_fragment" : "= gtpu_ipv4.dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "field",
+              "value" : ["ipv4", "src_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 64,
+            "column" : 34,
+            "source_fragment" : "= ipv4.src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "field",
+              "value" : ["ipv4", "dst_addr"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 65,
+            "column" : 34,
+            "source_fragment" : "= ipv4.dst_addr; ..."
+          }
+        },
+        {
           "op" : "remove_header",
           "parameters" : [
             {
@@ -1815,7 +1950,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 56,
+            "line" : 67,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.setInvalid()"
           }
@@ -1830,7 +1965,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 57,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "gtpu_udp.setInvalid()"
           }
@@ -1845,7 +1980,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 58,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "gtpu.setInvalid()"
           }
@@ -1853,19 +1988,15 @@
       ]
     },
     {
-      "name" : "FabricIngress.spgw_ingress.set_dl_sess_info",
-      "id" : 11,
+      "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
+      "id" : 13,
       "runtime_data" : [
         {
-          "name" : "teid",
+          "name" : "ctr_id",
           "bitwidth" : 32
         },
         {
-          "name" : "s1u_enb_addr",
-          "bitwidth" : 32
-        },
-        {
-          "name" : "s1u_sgw_addr",
+          "name" : "far_id",
           "bitwidth" : 32
         }
       ],
@@ -1875,7 +2006,36 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid17"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit24"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 97,
+            "column" : 33,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id22"]
             },
             {
               "type" : "runtime_data",
@@ -1884,7 +2044,440 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 64,
+            "line" : 98,
+            "column" : 32,
+            "source_fragment" : "= ctr_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_far_id23"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 99,
+            "column" : 32,
+            "source_fragment" : "= far_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
+      "id" : 14,
+      "runtime_data" : [
+        {
+          "name" : "ctr_id",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "far_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit24"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 97,
+            "column" : 33,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id22"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 98,
+            "column" : 32,
+            "source_fragment" : "= ctr_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_far_id23"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 99,
+            "column" : 32,
+            "source_fragment" : "= far_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.set_pdr_attributes",
+      "id" : 15,
+      "runtime_data" : [
+        {
+          "name" : "ctr_id",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "far_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit24"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 97,
+            "column" : 33,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id22"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 98,
+            "column" : 32,
+            "source_fragment" : "= ctr_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_far_id23"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 99,
+            "column" : 32,
+            "source_fragment" : "= far_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.load_normal_far_attributes",
+      "id" : 16,
+      "runtime_data" : [
+        {
+          "name" : "drop",
+          "bitwidth" : 1
+        },
+        {
+          "name" : "notify_cp",
+          "bitwidth" : 1
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped25"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 146,
+            "column" : 37,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_cp26"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 1
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 147,
+            "column" : 35,
+            "source_fragment" : "= (bool)notify_cp; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.load_tunnel_far_attributes",
+      "id" : 17,
+      "runtime_data" : [
+        {
+          "name" : "drop",
+          "bitwidth" : 1
+        },
+        {
+          "name" : "notify_cp",
+          "bitwidth" : 1
+        },
+        {
+          "name" : "tunnel_src_addr",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "tunnel_dst_addr",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "teid",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped25"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 0
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 155,
+            "column" : 37,
+            "source_fragment" : "= (bool)drop; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_notify_cp26"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "!=",
+                      "left" : {
+                        "type" : "local",
+                        "value" : 1
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x00"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 156,
+            "column" : 35,
+            "source_fragment" : "= (bool)notify_cp; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_outer_header_creation27"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 158,
+            "column" : 47,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 4
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 159,
             "column" : 30,
             "source_fragment" : "= teid; ..."
           }
@@ -1894,26 +2487,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr18"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 65,
-            "column" : 38,
-            "source_fragment" : "= s1u_enb_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr19"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr20"]
             },
             {
               "type" : "runtime_data",
@@ -1922,16 +2496,73 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 66,
-            "column" : 38,
-            "source_fragment" : "= s1u_sgw_addr; ..."
+            "line" : 160,
+            "column" : 41,
+            "source_fragment" : "= tunnel_src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr21"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 161,
+            "column" : 41,
+            "source_fragment" : "= tunnel_dst_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 2
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 163,
+            "column" : 34,
+            "source_fragment" : "= tunnel_src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 164,
+            "column" : 34,
+            "source_fragment" : "= tunnel_dst_addr; ..."
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.process_set_source_sink.int_set_source",
-      "id" : 12,
+      "id" : 18,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1939,7 +2570,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_source20"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_source28"]
             },
             {
               "type" : "expression",
@@ -1967,7 +2598,7 @@
     },
     {
       "name" : "FabricIngress.filtering.deny",
-      "id" : 13,
+      "id" : 19,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2032,13 +2663,13 @@
     },
     {
       "name" : "FabricIngress.filtering.permit",
-      "id" : 14,
+      "id" : 20,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.filtering.permit_with_internal_vlan",
-      "id" : 15,
+      "id" : 21,
       "runtime_data" : [
         {
           "name" : "vlan_id",
@@ -2069,7 +2700,7 @@
     },
     {
       "name" : "FabricIngress.filtering.set_forwarding_type",
-      "id" : 16,
+      "id" : 22,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -2100,7 +2731,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
-      "id" : 17,
+      "id" : 23,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2131,7 +2762,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.pop_mpls_and_next",
-      "id" : 18,
+      "id" : 24,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2181,7 +2812,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
-      "id" : 19,
+      "id" : 25,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2212,13 +2843,13 @@
     },
     {
       "name" : "FabricIngress.forwarding.nop_routing_v4",
-      "id" : 20,
+      "id" : 26,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.acl.set_next_id_acl",
-      "id" : 21,
+      "id" : 27,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2249,7 +2880,7 @@
     },
     {
       "name" : "FabricIngress.acl.punt_to_cpu",
-      "id" : 22,
+      "id" : 28,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2304,7 +2935,7 @@
     },
     {
       "name" : "FabricIngress.acl.set_clone_session_id",
-      "id" : 23,
+      "id" : 29,
       "runtime_data" : [
         {
           "name" : "clone_id",
@@ -2335,7 +2966,7 @@
     },
     {
       "name" : "FabricIngress.acl.drop",
-      "id" : 24,
+      "id" : 30,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2386,13 +3017,13 @@
     },
     {
       "name" : "FabricIngress.acl.nop_acl",
-      "id" : 25,
+      "id" : 31,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.next.set_vlan",
-      "id" : 26,
+      "id" : 32,
       "runtime_data" : [
         {
           "name" : "vlan_id",
@@ -2423,7 +3054,7 @@
     },
     {
       "name" : "FabricIngress.next.output_xconnect",
-      "id" : 27,
+      "id" : 33,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -2454,7 +3085,7 @@
     },
     {
       "name" : "FabricIngress.next.set_next_id_xconnect",
-      "id" : 28,
+      "id" : 34,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2485,7 +3116,7 @@
     },
     {
       "name" : "FabricIngress.next.output_hashed",
-      "id" : 29,
+      "id" : 35,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -2516,7 +3147,7 @@
     },
     {
       "name" : "FabricIngress.next.routing_hashed",
-      "id" : 30,
+      "id" : 36,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -2593,7 +3224,7 @@
     },
     {
       "name" : "FabricIngress.next.mpls_routing_hashed",
-      "id" : 31,
+      "id" : 37,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -2693,7 +3324,7 @@
     },
     {
       "name" : "FabricIngress.next.set_mcast_group_id",
-      "id" : 32,
+      "id" : 38,
       "runtime_data" : [
         {
           "name" : "group_id",
@@ -2753,7 +3384,7 @@
     },
     {
       "name" : "act",
-      "id" : 33,
+      "id" : 39,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2780,7 +3411,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 30,
+            "line" : 34,
             "column" : 32,
             "source_fragment" : "return"
           }
@@ -2789,7 +3420,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 34,
+      "id" : 40,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2849,7 +3480,7 @@
     },
     {
       "name" : "act_1",
-      "id" : 35,
+      "id" : 41,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2866,7 +3497,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 35,
+            "line" : 39,
             "column" : 16,
             "source_fragment" : "= inner_udp; ..."
           }
@@ -2875,7 +3506,7 @@
     },
     {
       "name" : "act_2",
-      "id" : 36,
+      "id" : 42,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2888,7 +3519,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 37,
+            "line" : 41,
             "column" : 12,
             "source_fragment" : "udp.setInvalid()"
           }
@@ -2897,7 +3528,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 37,
+      "id" : 43,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2914,7 +3545,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 31,
+            "line" : 35,
             "column" : 18,
             "source_fragment" : "= ipv4; ..."
           }
@@ -2933,7 +3564,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 32,
+            "line" : 36,
             "column" : 13,
             "source_fragment" : "= inner_ipv4; ..."
           }
@@ -2952,7 +3583,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 33,
+            "line" : 37,
             "column" : 17,
             "source_fragment" : "= udp; ..."
           }
@@ -2961,7 +3592,7 @@
     },
     {
       "name" : "act_4",
-      "id" : 38,
+      "id" : 44,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3041,7 +3672,7 @@
     },
     {
       "name" : "act_5",
-      "id" : 39,
+      "id" : 45,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3105,7 +3736,7 @@
     },
     {
       "name" : "act_6",
-      "id" : 40,
+      "id" : 46,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3131,7 +3762,7 @@
     },
     {
       "name" : "act_7",
-      "id" : 41,
+      "id" : 47,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3161,7 +3792,7 @@
     },
     {
       "name" : "act_8",
-      "id" : 42,
+      "id" : 48,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3191,7 +3822,7 @@
     },
     {
       "name" : "act_9",
-      "id" : 43,
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3204,7 +3835,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 149,
+            "line" : 187,
             "column" : 16,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           }
@@ -3213,7 +3844,7 @@
     },
     {
       "name" : "act_10",
-      "id" : 44,
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3221,7 +3852,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction15"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
             },
             {
               "type" : "hexstr",
@@ -3230,7 +3861,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 147,
+            "line" : 150,
             "column" : 36,
             "source_fragment" : "2w1; ..."
           }
@@ -3239,7 +3870,7 @@
     },
     {
       "name" : "act_11",
-      "id" : 45,
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3269,7 +3900,7 @@
     },
     {
       "name" : "act_12",
-      "id" : 46,
+      "id" : 52,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3299,7 +3930,7 @@
     },
     {
       "name" : "act_13",
-      "id" : 47,
+      "id" : 53,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3307,7 +3938,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction15"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
             },
             {
               "type" : "hexstr",
@@ -3316,7 +3947,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 148,
+            "line" : 151,
             "column" : 38,
             "source_fragment" : "2w2; ..."
           }
@@ -3325,7 +3956,7 @@
     },
     {
       "name" : "act_14",
-      "id" : 48,
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3333,7 +3964,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_direction15"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
             },
             {
               "type" : "hexstr",
@@ -3342,7 +3973,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 146,
+            "line" : 149,
             "column" : 37,
             "source_fragment" : "2w0; ..."
           }
@@ -3371,7 +4002,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 158,
+            "line" : 196,
             "column" : 12,
             "source_fragment" : "return"
           }
@@ -3380,7 +4011,7 @@
     },
     {
       "name" : "act_15",
-      "id" : 49,
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3410,7 +4041,7 @@
     },
     {
       "name" : "act_16",
-      "id" : 50,
+      "id" : 56,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3418,7 +4049,134 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len16"]
+              "value" : ["scalars", "spgw_ingress_hasReturned"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 206,
+            "column" : 12,
+            "source_fragment" : "return"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_17",
+      "id" : 57,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.spgw_ingress.pdr_counter"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 213,
+            "column" : 8,
+            "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_18",
+      "id" : 58,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding6"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 223,
+            "column" : 40,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 224,
+            "column" : 34,
+            "source_fragment" : "= true; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_19",
+      "id" : 59,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
             },
             {
               "type" : "field",
@@ -3427,7 +4185,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 175,
+            "line" : 232,
             "column" : 34,
             "source_fragment" : "= ipv4.total_len; ..."
           }
@@ -3435,8 +4193,8 @@
       ]
     },
     {
-      "name" : "act_17",
-      "id" : 51,
+      "name" : "act_20",
+      "id" : 60,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3493,8 +4251,8 @@
       ]
     },
     {
-      "name" : "act_18",
-      "id" : 52,
+      "name" : "act_21",
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3552,37 +4310,37 @@
     },
     {
       "name" : "nop",
-      "id" : 53,
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 54,
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 55,
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "NoAction",
-      "id" : 56,
+      "id" : 65,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "NoAction",
-      "id" : 57,
+      "id" : 66,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 58,
+      "id" : 67,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3595,7 +4353,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 191,
+            "line" : 251,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.setValid()"
           }
@@ -3614,7 +4372,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 192,
+            "line" : 252,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.version = 4"
           }
@@ -3633,7 +4391,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 129,
+            "line" : 132,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -3652,7 +4410,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 194,
+            "line" : 254,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.dscp = 0"
           }
@@ -3671,7 +4429,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 195,
+            "line" : 255,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.ecn = 0"
           }
@@ -3713,7 +4471,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 196,
+            "line" : 256,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.total_len = ipv4.total_len ..."
           }
@@ -3732,7 +4490,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 198,
+            "line" : 258,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.identification = 0x1513"
           }
@@ -3751,7 +4509,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 199,
+            "line" : 259,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.flags = 0"
           }
@@ -3770,7 +4528,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 200,
+            "line" : 260,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.frag_offset = 0"
           }
@@ -3789,7 +4547,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 142,
+            "line" : 145,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -3808,7 +4566,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 126,
+            "line" : 129,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -3818,37 +4576,37 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["gtpu_ipv4", "dst_addr"]
-            },
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr18"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 203,
-            "column" : 8,
-            "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
               "value" : ["gtpu_ipv4", "src_addr"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr19"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_src_addr20"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 204,
+            "line" : 263,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr; ..."
+            "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.tunnel_src_addr; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["gtpu_ipv4", "dst_addr"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr21"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 264,
+            "column" : 8,
+            "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.tunnel_dst_addr; ..."
           }
         },
         {
@@ -3865,7 +4623,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 205,
+            "line" : 265,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.hdr_checksum = 0"
           }
@@ -3880,7 +4638,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 207,
+            "line" : 267,
             "column" : 8,
             "source_fragment" : "gtpu_udp.setValid()"
           }
@@ -3899,7 +4657,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 208,
+            "line" : 268,
             "column" : 8,
             "source_fragment" : "gtpu_udp.sport = 2152"
           }
@@ -3918,7 +4676,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 209,
+            "line" : 269,
             "column" : 8,
             "source_fragment" : "gtpu_udp.dport = 2152"
           }
@@ -3942,7 +4700,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len16"]
+                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3960,7 +4718,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 210,
+            "line" : 270,
             "column" : 8,
             "source_fragment" : "gtpu_udp.len = fabric_meta.spgw.ipv4_len ..."
           }
@@ -3979,7 +4737,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 212,
+            "line" : 272,
             "column" : 8,
             "source_fragment" : "gtpu_udp.checksum = 0"
           }
@@ -3994,7 +4752,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 214,
+            "line" : 275,
             "column" : 8,
             "source_fragment" : "gtpu.setValid()"
           }
@@ -4013,7 +4771,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 215,
+            "line" : 276,
             "column" : 8,
             "source_fragment" : "gtpu.version = 0x01"
           }
@@ -4032,7 +4790,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 216,
+            "line" : 277,
             "column" : 8,
             "source_fragment" : "gtpu.pt = 0x01"
           }
@@ -4051,7 +4809,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 217,
+            "line" : 278,
             "column" : 8,
             "source_fragment" : "gtpu.spare = 0"
           }
@@ -4070,7 +4828,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 218,
+            "line" : 279,
             "column" : 8,
             "source_fragment" : "gtpu.ex_flag = 0"
           }
@@ -4089,7 +4847,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 219,
+            "line" : 280,
             "column" : 8,
             "source_fragment" : "gtpu.seq_flag = 0"
           }
@@ -4108,7 +4866,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 220,
+            "line" : 281,
             "column" : 8,
             "source_fragment" : "gtpu.npdu_flag = 0"
           }
@@ -4127,7 +4885,7 @@
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 221,
+            "line" : 282,
             "column" : 8,
             "source_fragment" : "gtpu.msgtype = 0xff"
           }
@@ -4141,12 +4899,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len16"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 222,
+            "line" : 283,
             "column" : 8,
             "source_fragment" : "gtpu.msglen = fabric_meta.spgw.ipv4_len; ..."
           }
@@ -4160,12 +4918,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._spgw_teid17"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 223,
+            "line" : 284,
             "column" : 8,
             "source_fragment" : "gtpu.teid = fabric_meta.spgw.teid; ..."
           }
@@ -4174,7 +4932,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
-      "id" : 59,
+      "id" : 68,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -4242,7 +5000,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 157,
+            "line" : 160,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -4660,7 +5418,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 153,
+            "line" : 156,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -4669,7 +5427,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 60,
+      "id" : 69,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -4682,7 +5440,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_transit21"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_transit29"]
             },
             {
               "type" : "expression",
@@ -4711,7 +5469,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             },
             {
               "type" : "runtime_data",
@@ -4729,13 +5487,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 61,
+      "id" : 70,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 62,
+      "id" : 71,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4809,7 +5567,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -4823,7 +5581,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4851,7 +5609,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -4865,7 +5623,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4892,7 +5650,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 63,
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4934,7 +5692,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -4948,7 +5706,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4976,7 +5734,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -4990,7 +5748,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5017,7 +5775,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 64,
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5125,7 +5883,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -5139,7 +5897,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5167,7 +5925,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -5181,7 +5939,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5208,7 +5966,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 65,
+      "id" : 74,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5295,7 +6053,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -5309,7 +6067,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5337,7 +6095,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -5351,7 +6109,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5378,7 +6136,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
-      "id" : 66,
+      "id" : 75,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5531,7 +6289,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -5545,7 +6303,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5573,7 +6331,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -5587,7 +6345,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5614,7 +6372,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 67,
+      "id" : 76,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5735,7 +6493,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -5749,7 +6507,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5777,7 +6535,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -5791,7 +6549,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5818,7 +6576,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
-      "id" : 68,
+      "id" : 77,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6005,7 +6763,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -6019,7 +6777,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6047,7 +6805,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -6061,7 +6819,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6088,7 +6846,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 69,
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6115,7 +6873,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             }
           ],
           "source_info" : {
@@ -6130,7 +6888,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -6144,7 +6902,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6172,7 +6930,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -6186,7 +6944,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6213,7 +6971,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
-      "id" : 70,
+      "id" : 79,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6306,7 +7064,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             }
           ],
           "source_info" : {
@@ -6321,7 +7079,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -6335,7 +7093,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6363,7 +7121,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -6377,7 +7135,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6404,7 +7162,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
-      "id" : 71,
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6465,7 +7223,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             }
           ],
           "source_info" : {
@@ -6480,7 +7238,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -6494,7 +7252,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6522,7 +7280,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -6536,7 +7294,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6563,7 +7321,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
-      "id" : 72,
+      "id" : 81,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6690,7 +7448,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             }
           ],
           "source_info" : {
@@ -6705,7 +7463,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -6719,7 +7477,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6747,7 +7505,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -6761,7 +7519,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6788,7 +7546,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 73,
+      "id" : 82,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6894,7 +7652,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             }
           ],
           "source_info" : {
@@ -6909,7 +7667,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -6923,7 +7681,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6951,7 +7709,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -6965,7 +7723,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6992,7 +7750,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
-      "id" : 74,
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7164,7 +7922,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             }
           ],
           "source_info" : {
@@ -7179,7 +7937,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -7193,7 +7951,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7221,7 +7979,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -7235,7 +7993,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7262,7 +8020,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
-      "id" : 75,
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7402,7 +8160,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             }
           ],
           "source_info" : {
@@ -7417,7 +8175,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -7431,7 +8189,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7459,7 +8217,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -7473,7 +8231,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7500,7 +8258,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
-      "id" : 76,
+      "id" : 85,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7706,7 +8464,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id23"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id31"]
             }
           ],
           "source_info" : {
@@ -7721,7 +8479,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -7735,7 +8493,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7763,7 +8521,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -7777,7 +8535,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7804,13 +8562,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 77,
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 78,
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7852,7 +8610,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -7866,7 +8624,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7894,7 +8652,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -7908,7 +8666,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7935,7 +8693,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 79,
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7996,7 +8754,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -8010,7 +8768,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8038,7 +8796,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -8052,7 +8810,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8079,7 +8837,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 80,
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8174,7 +8932,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -8188,7 +8946,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8216,7 +8974,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -8230,7 +8988,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8257,7 +9015,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 81,
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8322,7 +9080,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -8336,7 +9094,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8364,7 +9122,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -8378,7 +9136,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8405,7 +9163,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
-      "id" : 82,
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8504,7 +9262,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -8518,7 +9276,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8546,7 +9304,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -8560,7 +9318,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8587,7 +9345,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 83,
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8705,7 +9463,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -8719,7 +9477,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8747,7 +9505,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -8761,7 +9519,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8788,7 +9546,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
-      "id" : 84,
+      "id" : 93,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8940,7 +9698,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -8954,7 +9712,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8982,7 +9740,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -8996,7 +9754,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9023,7 +9781,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 85,
+      "id" : 94,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9065,7 +9823,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -9079,7 +9837,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9107,7 +9865,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -9121,7 +9879,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9148,7 +9906,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
-      "id" : 86,
+      "id" : 95,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9224,7 +9982,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -9238,7 +9996,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9266,7 +10024,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -9280,7 +10038,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9307,7 +10065,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
-      "id" : 87,
+      "id" : 96,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9402,7 +10160,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -9416,7 +10174,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9444,7 +10202,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -9458,7 +10216,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9485,7 +10243,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
-      "id" : 88,
+      "id" : 97,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9614,7 +10372,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -9628,7 +10386,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9656,7 +10414,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -9670,7 +10428,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9697,7 +10455,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 89,
+      "id" : 98,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9796,7 +10554,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -9810,7 +10568,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9838,7 +10596,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -9852,7 +10610,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9879,7 +10637,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
-      "id" : 90,
+      "id" : 99,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10012,7 +10770,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -10026,7 +10784,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10054,7 +10812,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -10068,7 +10826,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10095,7 +10853,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
-      "id" : 91,
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10247,7 +11005,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -10261,7 +11019,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10289,7 +11047,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -10303,7 +11061,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10330,7 +11088,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
-      "id" : 92,
+      "id" : 101,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10516,7 +11274,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
             },
             {
               "type" : "expression",
@@ -10530,7 +11288,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10558,7 +11316,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
             },
             {
               "type" : "expression",
@@ -10572,7 +11330,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10599,7 +11357,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 93,
+      "id" : 102,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10640,7 +11398,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 94,
+      "id" : 103,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10748,7 +11506,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 112,
+            "line" : 115,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -10757,7 +11515,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 95,
+      "id" : 104,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10827,7 +11585,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 111,
+            "line" : 114,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -10855,7 +11613,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 96,
+      "id" : 105,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10876,8 +11634,8 @@
       ]
     },
     {
-      "name" : "act_19",
-      "id" : 97,
+      "name" : "act_22",
+      "id" : 106,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10893,8 +11651,8 @@
       ]
     },
     {
-      "name" : "act_20",
-      "id" : 98,
+      "name" : "act_23",
+      "id" : 107,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10944,8 +11702,8 @@
       ]
     },
     {
-      "name" : "act_21",
-      "id" : 99,
+      "name" : "act_24",
+      "id" : 108,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10966,8 +11724,8 @@
       ]
     },
     {
-      "name" : "act_22",
-      "id" : 100,
+      "name" : "act_25",
+      "id" : 109,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10996,8 +11754,8 @@
       ]
     },
     {
-      "name" : "act_23",
-      "id" : 101,
+      "name" : "act_26",
+      "id" : 110,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11026,8 +11784,8 @@
       ]
     },
     {
-      "name" : "act_24",
-      "id" : 102,
+      "name" : "act_27",
+      "id" : 111,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11048,8 +11806,8 @@
       ]
     },
     {
-      "name" : "act_25",
-      "id" : 103,
+      "name" : "act_28",
+      "id" : 112,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11097,8 +11855,8 @@
       ]
     },
     {
-      "name" : "act_26",
-      "id" : 104,
+      "name" : "act_29",
+      "id" : 113,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11119,8 +11877,8 @@
       ]
     },
     {
-      "name" : "act_27",
-      "id" : 105,
+      "name" : "act_30",
+      "id" : 114,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11168,8 +11926,34 @@
       ]
     },
     {
-      "name" : "act_28",
-      "id" : 106,
+      "name" : "act_31",
+      "id" : 115,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricEgress.spgw_egress.pdr_counter"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._spgw_ctr_id22"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 288,
+            "column" : 8,
+            "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_32",
+      "id" : 116,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11198,8 +11982,8 @@
       ]
     },
     {
-      "name" : "act_29",
-      "id" : 107,
+      "name" : "act_33",
+      "id" : 117,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11234,8 +12018,8 @@
       ]
     },
     {
-      "name" : "act_30",
-      "id" : 108,
+      "name" : "act_34",
+      "id" : 118,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11261,7 +12045,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       }
                     }
                   },
@@ -11283,8 +12067,8 @@
       ]
     },
     {
-      "name" : "act_31",
-      "id" : 109,
+      "name" : "act_35",
+      "id" : 119,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11332,8 +12116,8 @@
       ]
     },
     {
-      "name" : "act_32",
-      "id" : 110,
+      "name" : "act_36",
+      "id" : 120,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11359,7 +12143,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes25"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes33"]
                       }
                     }
                   },
@@ -11381,8 +12165,8 @@
       ]
     },
     {
-      "name" : "act_33",
-      "id" : 111,
+      "name" : "act_37",
+      "id" : 121,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11408,7 +12192,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words24"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words32"]
                       }
                     }
                   },
@@ -11458,14 +12242,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [34],
+          "action_ids" : [40],
           "actions" : ["act_0"],
           "base_default_next" : "node_3",
           "next_tables" : {
             "act_0" : "node_3"
           },
           "default_entry" : {
-            "action_id" : 34,
+            "action_id" : 40,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11476,7 +12260,7 @@
           "id" : 1,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 30,
+            "line" : 34,
             "column" : 32,
             "source_fragment" : "return"
           },
@@ -11487,14 +12271,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [33],
+          "action_ids" : [39],
           "actions" : ["act"],
           "base_default_next" : "node_5",
           "next_tables" : {
             "act" : "node_5"
           },
           "default_entry" : {
-            "action_id" : 33,
+            "action_id" : 39,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11505,7 +12289,7 @@
           "id" : 2,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 31,
+            "line" : 35,
             "column" : 18,
             "source_fragment" : "= ipv4; ..."
           },
@@ -11516,14 +12300,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [37],
+          "action_ids" : [43],
           "actions" : ["act_3"],
           "base_default_next" : "node_7",
           "next_tables" : {
             "act_3" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 37,
+            "action_id" : 43,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11534,7 +12318,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 35,
+            "line" : 39,
             "column" : 16,
             "source_fragment" : "="
           },
@@ -11545,14 +12329,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [35],
+          "action_ids" : [41],
           "actions" : ["act_1"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_1" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 35,
+            "action_id" : 41,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11563,7 +12347,7 @@
           "id" : 4,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 37,
+            "line" : 41,
             "column" : 12,
             "source_fragment" : "udp.setInvalid()"
           },
@@ -11574,14 +12358,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [36],
+          "action_ids" : [42],
           "actions" : ["act_2"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_2" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 36,
+            "action_id" : 42,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11603,14 +12387,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [38],
+          "action_ids" : [44],
           "actions" : ["act_4"],
           "base_default_next" : "node_12",
           "next_tables" : {
             "act_4" : "node_12"
           },
           "default_entry" : {
-            "action_id" : 38,
+            "action_id" : 44,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11632,14 +12416,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [39],
+          "action_ids" : [45],
           "actions" : ["act_5"],
           "base_default_next" : "node_14",
           "next_tables" : {
             "act_5" : "node_14"
           },
           "default_entry" : {
-            "action_id" : 39,
+            "action_id" : 45,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11661,14 +12445,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [40],
+          "action_ids" : [46],
           "actions" : ["act_6"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
             "act_6" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
-            "action_id" : 40,
+            "action_id" : 46,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11709,7 +12493,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [13, 14, 15],
+          "action_ids" : [19, 20, 21],
           "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
           "base_default_next" : "FabricIngress.filtering.fwd_classifier",
           "next_tables" : {
@@ -11718,7 +12502,7 @@
             "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
           },
           "default_entry" : {
-            "action_id" : 13,
+            "action_id" : 19,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11765,14 +12549,14 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [16],
+          "action_ids" : [22],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
           "base_default_next" : "tbl_act_7",
           "next_tables" : {
             "FabricIngress.filtering.set_forwarding_type" : "tbl_act_7"
           },
           "default_entry" : {
-            "action_id" : 16,
+            "action_id" : 22,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
@@ -11788,27 +12572,27 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [49],
+          "action_ids" : [55],
           "actions" : ["act_15"],
           "base_default_next" : "node_19",
           "next_tables" : {
             "act_15" : "node_19"
           },
           "default_entry" : {
-            "action_id" : 49,
+            "action_id" : 55,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.spgw_ingress.s1u_filter_table",
+          "name" : "FabricIngress.spgw_ingress.uplink_filter_table",
           "id" : 11,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 83,
+            "line" : 84,
             "column" : 10,
-            "source_fragment" : "s1u_filter_table"
+            "source_fragment" : "uplink_filter_table"
           },
           "key" : [
             {
@@ -11848,14 +12632,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [41],
+          "action_ids" : [47],
           "actions" : ["act_7"],
           "base_default_next" : "node_23",
           "next_tables" : {
             "act_7" : "node_23"
           },
           "default_entry" : {
-            "action_id" : 41,
+            "action_id" : 47,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11871,14 +12655,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [42],
+          "action_ids" : [48],
           "actions" : ["act_8"],
           "base_default_next" : "node_23",
           "next_tables" : {
             "act_8" : "node_23"
           },
           "default_entry" : {
-            "action_id" : 42,
+            "action_id" : 48,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11889,7 +12673,7 @@
           "id" : 14,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 149,
+            "line" : 187,
             "column" : 16,
             "source_fragment" : "mark_to_drop(standard_metadata)"
           },
@@ -11900,14 +12684,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43],
+          "action_ids" : [49],
           "actions" : ["act_9"],
           "base_default_next" : "tbl_act_11",
           "next_tables" : {
             "act_9" : "tbl_act_11"
           },
           "default_entry" : {
-            "action_id" : 43,
+            "action_id" : 49,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11918,7 +12702,7 @@
           "id" : 15,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 151,
+            "line" : 189,
             "column" : 39,
             "source_fragment" : "="
           },
@@ -11929,14 +12713,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [44],
+          "action_ids" : [50],
           "actions" : ["act_10"],
           "base_default_next" : "tbl_spgw_ingress_gtpu_decap",
           "next_tables" : {
             "act_10" : "tbl_spgw_ingress_gtpu_decap"
           },
           "default_entry" : {
-            "action_id" : 44,
+            "action_id" : 50,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11947,7 +12731,7 @@
           "id" : 16,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 152,
+            "line" : 190,
             "column" : 12,
             "source_fragment" : "gtpu_decap()"
           },
@@ -11958,44 +12742,44 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [10],
+          "action_ids" : [12],
           "actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
           "base_default_next" : "node_33",
           "next_tables" : {
             "FabricIngress.spgw_ingress.gtpu_decap" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 10,
+            "action_id" : 12,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.spgw_ingress.dl_sess_lookup",
+          "name" : "FabricIngress.spgw_ingress.downlink_filter_table",
           "id" : 17,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 70,
+            "line" : 73,
             "column" : 10,
-            "source_fragment" : "dl_sess_lookup"
+            "source_fragment" : "downlink_filter_table"
           },
           "key" : [
             {
-              "match_type" : "exact",
-              "name" : "ipv4_dst",
+              "match_type" : "lpm",
+              "name" : "ipv4_prefix",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             }
           ],
-          "match_type" : "exact",
+          "match_type" : "lpm",
           "type" : "simple",
           "max_size" : 1024,
-          "with_counters" : true,
+          "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [11, 0],
-          "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "nop"],
+          "action_ids" : [0],
+          "actions" : ["nop"],
           "base_default_next" : null,
           "next_tables" : {
             "__HIT__" : "tbl_act_12",
@@ -12018,14 +12802,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45],
+          "action_ids" : [51],
           "actions" : ["act_11"],
           "base_default_next" : "node_30",
           "next_tables" : {
             "act_11" : "node_30"
           },
           "default_entry" : {
-            "action_id" : 45,
+            "action_id" : 51,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12041,14 +12825,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [46],
+          "action_ids" : [52],
           "actions" : ["act_12"],
           "base_default_next" : "node_30",
           "next_tables" : {
             "act_12" : "node_30"
           },
           "default_entry" : {
-            "action_id" : 46,
+            "action_id" : 52,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12059,7 +12843,7 @@
           "id" : 20,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 154,
+            "line" : 192,
             "column" : 39,
             "source_fragment" : "="
           },
@@ -12070,14 +12854,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [47],
+          "action_ids" : [53],
           "actions" : ["act_13"],
           "base_default_next" : "node_33",
           "next_tables" : {
             "act_13" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 47,
+            "action_id" : 53,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12088,7 +12872,7 @@
           "id" : 21,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 156,
+            "line" : 194,
             "column" : 39,
             "source_fragment" : "= SPGW_DIR_UNKNOWN; ..."
           },
@@ -12099,25 +12883,313 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [48],
+          "action_ids" : [54],
           "actions" : ["act_14"],
           "base_default_next" : "node_33",
           "next_tables" : {
             "act_14" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 48,
+            "action_id" : 54,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_16",
+          "name" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
           "id" : 22,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 175,
+            "line" : 111,
+            "column" : 10,
+            "source_fragment" : "uplink_pdr_lookup"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "tunnel_ipv4_dst",
+              "target" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr21"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "teid",
+              "target" : ["scalars", "fabric_metadata_t._spgw_teid19"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "ue_addr",
+              "target" : ["ipv4", "src_addr"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [14, 11],
+          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes", "NoAction"],
+          "base_default_next" : "node_39",
+          "next_tables" : {
+            "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_39",
+            "NoAction" : "node_39"
+          },
+          "default_entry" : {
+            "action_id" : 11,
+            "action_const" : false,
+            "action_data" : [],
+            "action_entry_const" : false
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
+          "id" : 23,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 103,
+            "column" : 10,
+            "source_fragment" : "downlink_pdr_lookup"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ue_addr",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [13, 10],
+          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes", "NoAction"],
+          "base_default_next" : "node_39",
+          "next_tables" : {
+            "FabricIngress.spgw_ingress.set_pdr_attributes" : "node_39",
+            "NoAction" : "node_39"
+          },
+          "default_entry" : {
+            "action_id" : 10,
+            "action_const" : false,
+            "action_data" : [],
+            "action_entry_const" : false
+          }
+        },
+        {
+          "name" : "tbl_act_16",
+          "id" : 24,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 206,
+            "column" : 12,
+            "source_fragment" : "return"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [56],
+          "actions" : ["act_16"],
+          "base_default_next" : "node_39",
+          "next_tables" : {
+            "act_16" : "node_39"
+          },
+          "default_entry" : {
+            "action_id" : 56,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw_ingress.flexible_pdr_lookup",
+          "id" : 25,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 123,
+            "column" : 10,
+            "source_fragment" : "flexible_pdr_lookup"
+          },
+          "key" : [
+            {
+              "match_type" : "ternary",
+              "name" : "spgw_direction",
+              "target" : ["scalars", "fabric_metadata_t._spgw_direction17"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "tunnel_ipv4_dst",
+              "target" : ["scalars", "fabric_metadata_t._spgw_tunnel_dst_addr21"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "teid",
+              "target" : ["scalars", "fabric_metadata_t._spgw_teid19"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "ipv4_src",
+              "target" : ["ipv4", "src_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "ipv4_dst",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "ip_proto",
+              "target" : ["ipv4", "protocol"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "l4_sport",
+              "target" : ["scalars", "fabric_metadata_t._l4_sport13"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "l4_dport",
+              "target" : ["scalars", "fabric_metadata_t._l4_dport14"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [15],
+          "actions" : ["FabricIngress.spgw_ingress.set_pdr_attributes"],
+          "base_default_next" : "tbl_act_17",
+          "next_tables" : {
+            "FabricIngress.spgw_ingress.set_pdr_attributes" : "tbl_act_17"
+          },
+          "default_entry" : {
+            "action_id" : 15,
+            "action_const" : true,
+            "action_data" : ["0x0", "0x0"],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_17",
+          "id" : 26,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 213,
+            "column" : 8,
+            "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [57],
+          "actions" : ["act_17"],
+          "base_default_next" : "FabricIngress.spgw_ingress.far_lookup",
+          "next_tables" : {
+            "act_17" : "FabricIngress.spgw_ingress.far_lookup"
+          },
+          "default_entry" : {
+            "action_id" : 57,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.spgw_ingress.far_lookup",
+          "id" : 27,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 168,
+            "column" : 10,
+            "source_fragment" : "far_lookup"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "far_id",
+              "target" : ["scalars", "fabric_metadata_t._spgw_far_id23"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [16, 17],
+          "actions" : ["FabricIngress.spgw_ingress.load_normal_far_attributes", "FabricIngress.spgw_ingress.load_tunnel_far_attributes"],
+          "base_default_next" : "node_44",
+          "next_tables" : {
+            "FabricIngress.spgw_ingress.load_normal_far_attributes" : "node_44",
+            "FabricIngress.spgw_ingress.load_tunnel_far_attributes" : "node_44"
+          },
+          "default_entry" : {
+            "action_id" : 16,
+            "action_const" : true,
+            "action_data" : ["0x1", "0x0"],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_18",
+          "id" : 28,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 223,
+            "column" : 40,
+            "source_fragment" : "= true; ..."
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [58],
+          "actions" : ["act_18"],
+          "base_default_next" : "tbl_act_19",
+          "next_tables" : {
+            "act_18" : "tbl_act_19"
+          },
+          "default_entry" : {
+            "action_id" : 58,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_19",
+          "id" : 29,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 232,
             "column" : 34,
             "source_fragment" : "="
           },
@@ -12128,14 +13200,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [50],
-          "actions" : ["act_16"],
-          "base_default_next" : "node_35",
+          "action_ids" : [59],
+          "actions" : ["act_19"],
+          "base_default_next" : "node_47",
           "next_tables" : {
-            "act_16" : "node_35"
+            "act_19" : "node_47"
           },
           "default_entry" : {
-            "action_id" : 50,
+            "action_id" : 59,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12143,7 +13215,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.bridging",
-          "id" : 23,
+          "id" : 30,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 46,
@@ -12170,7 +13242,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [17, 3],
+          "action_ids" : [23, 3],
           "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -12186,7 +13258,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.mpls",
-          "id" : 24,
+          "id" : 31,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 71,
@@ -12207,7 +13279,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [18, 4],
+          "action_ids" : [24, 4],
           "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -12223,7 +13295,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v4",
-          "id" : 25,
+          "id" : 32,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 108,
@@ -12234,7 +13306,7 @@
             {
               "match_type" : "lpm",
               "name" : "ipv4_dst",
-              "target" : ["ipv4", "dst_addr"],
+              "target" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"],
               "mask" : null
             }
           ],
@@ -12244,7 +13316,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [19, 20, 5],
+          "action_ids" : [25, 26, 5],
           "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -12261,7 +13333,7 @@
         },
         {
           "name" : "FabricIngress.acl.acl",
-          "id" : 26,
+          "id" : 33,
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 60,
@@ -12348,18 +13420,18 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [21, 22, 23, 24, 25],
+          "action_ids" : [27, 28, 29, 30, 31],
           "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.set_clone_session_id", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
-          "base_default_next" : "node_43",
+          "base_default_next" : "node_55",
           "next_tables" : {
-            "FabricIngress.acl.set_next_id_acl" : "node_43",
-            "FabricIngress.acl.punt_to_cpu" : "node_43",
-            "FabricIngress.acl.set_clone_session_id" : "node_43",
-            "FabricIngress.acl.drop" : "node_43",
-            "FabricIngress.acl.nop_acl" : "node_43"
+            "FabricIngress.acl.set_next_id_acl" : "node_55",
+            "FabricIngress.acl.punt_to_cpu" : "node_55",
+            "FabricIngress.acl.set_clone_session_id" : "node_55",
+            "FabricIngress.acl.drop" : "node_55",
+            "FabricIngress.acl.nop_acl" : "node_55"
           },
           "default_entry" : {
-            "action_id" : 25,
+            "action_id" : 31,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12367,7 +13439,7 @@
         },
         {
           "name" : "FabricIngress.next.xconnect",
-          "id" : 27,
+          "id" : 34,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 119,
@@ -12394,7 +13466,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [27, 28, 7],
+          "action_ids" : [33, 34, 7],
           "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
           "base_default_next" : "FabricIngress.next.hashed",
           "next_tables" : {
@@ -12411,7 +13483,7 @@
         },
         {
           "name" : "FabricIngress.next.hashed",
-          "id" : 28,
+          "id" : 35,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 202,
@@ -12433,7 +13505,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [29, 30, 31, 8],
+          "action_ids" : [35, 36, 37, 8],
           "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
           "base_default_next" : "FabricIngress.next.multicast",
           "next_tables" : {
@@ -12445,7 +13517,7 @@
         },
         {
           "name" : "FabricIngress.next.multicast",
-          "id" : 29,
+          "id" : 36,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 236,
@@ -12466,7 +13538,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [32, 9],
+          "action_ids" : [38, 9],
           "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
           "base_default_next" : "FabricIngress.next.next_vlan",
           "next_tables" : {
@@ -12482,7 +13554,7 @@
         },
         {
           "name" : "FabricIngress.next.next_vlan",
-          "id" : 30,
+          "id" : 37,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 86,
@@ -12503,12 +13575,12 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [26, 6],
+          "action_ids" : [32, 6],
           "actions" : ["FabricIngress.next.set_vlan", "nop"],
-          "base_default_next" : "node_48",
+          "base_default_next" : "node_60",
           "next_tables" : {
-            "FabricIngress.next.set_vlan" : "node_48",
-            "nop" : "node_48"
+            "FabricIngress.next.set_vlan" : "node_60",
+            "nop" : "node_60"
           },
           "default_entry" : {
             "action_id" : 6,
@@ -12518,8 +13590,8 @@
           }
         },
         {
-          "name" : "tbl_act_17",
-          "id" : 31,
+          "name" : "tbl_act_20",
+          "id" : 38,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 31,
@@ -12533,22 +13605,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [51],
-          "actions" : ["act_17"],
-          "base_default_next" : "node_50",
+          "action_ids" : [60],
+          "actions" : ["act_20"],
+          "base_default_next" : "node_62",
           "next_tables" : {
-            "act_17" : "node_50"
+            "act_20" : "node_62"
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 60,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_18",
-          "id" : 32,
+          "name" : "tbl_act_21",
+          "id" : 39,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 34,
@@ -12562,14 +13634,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52],
-          "actions" : ["act_18"],
+          "action_ids" : [61],
+          "actions" : ["act_21"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_18" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "act_21" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 61,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12577,7 +13649,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_source",
-          "id" : 33,
+          "id" : 40,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 46,
@@ -12598,7 +13670,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [12, 2],
+          "action_ids" : [18, 2],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "nop"],
           "base_default_next" : null,
           "next_tables" : {
@@ -12629,11 +13701,11 @@
             "input" : [
               {
                 "type" : "field",
-                "value" : ["ipv4", "dst_addr"]
+                "value" : ["scalars", "fabric_metadata_t._ipv4_src_addr15"]
               },
               {
                 "type" : "field",
-                "value" : ["ipv4", "src_addr"]
+                "value" : ["scalars", "fabric_metadata_t._ipv4_dst_addr16"]
               },
               {
                 "type" : "field",
@@ -12657,7 +13729,7 @@
           "id" : 0,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 30,
+            "line" : 34,
             "column" : 12,
             "source_fragment" : "! is_gtpu_encapped"
           },
@@ -12711,7 +13783,7 @@
           "id" : 2,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 34,
+            "line" : 38,
             "column" : 12,
             "source_fragment" : "inner_udp.isValid()"
           },
@@ -12810,7 +13882,7 @@
           "id" : 6,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 144,
+            "line" : 181,
             "column" : 12,
             "source_fragment" : "gtpu.isValid()"
           },
@@ -12825,17 +13897,17 @@
               }
             }
           },
-          "true_next" : "FabricIngress.spgw_ingress.s1u_filter_table",
-          "false_next" : "FabricIngress.spgw_ingress.dl_sess_lookup"
+          "true_next" : "FabricIngress.spgw_ingress.uplink_filter_table",
+          "false_next" : "FabricIngress.spgw_ingress.downlink_filter_table"
         },
         {
           "name" : "node_23",
           "id" : 7,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 148,
+            "line" : 185,
             "column" : 16,
-            "source_fragment" : "!s1u_filter_table.apply().hit"
+            "source_fragment" : "!uplink_filter_table.apply().hit"
           },
           "expression" : {
             "type" : "expression",
@@ -12896,13 +13968,155 @@
               }
             }
           },
-          "true_next" : "tbl_act_16",
-          "false_next" : "node_35"
+          "true_next" : "node_34",
+          "false_next" : "node_39"
         },
         {
-          "name" : "node_35",
+          "name" : "node_34",
           "id" : 10,
           "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 201,
+            "column" : 12,
+            "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_UPLINK"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x01"
+              }
+            }
+          },
+          "true_next" : "FabricIngress.spgw_ingress.uplink_pdr_lookup",
+          "false_next" : "node_36"
+        },
+        {
+          "name" : "node_36",
+          "id" : 11,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 203,
+            "column" : 19,
+            "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x02"
+              }
+            }
+          },
+          "true_next" : "FabricIngress.spgw_ingress.downlink_pdr_lookup",
+          "false_next" : "tbl_act_16"
+        },
+        {
+          "name" : "node_39",
+          "id" : 12,
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "spgw_ingress_hasReturned"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "node_40",
+          "false_next" : "node_47"
+        },
+        {
+          "name" : "node_40",
+          "id" : 13,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 209,
+            "column" : 12,
+            "source_fragment" : "fabric_meta.spgw.pdr_hit == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t._spgw_pdr_hit24"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "true_next" : "FabricIngress.spgw_ingress.flexible_pdr_lookup",
+          "false_next" : "tbl_act_17"
+        },
+        {
+          "name" : "node_44",
+          "id" : 14,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 220,
+            "column" : 12,
+            "source_fragment" : "fabric_meta.spgw.far_dropped == true"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t._spgw_far_dropped25"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : true
+              }
+            }
+          },
+          "true_next" : "tbl_act_18",
+          "false_next" : "tbl_act_19"
+        },
+        {
+          "name" : "node_47",
+          "id" : 15,
+          "source_info" : {
             "filename" : "fabric.p4",
             "line" : 71,
             "column" : 12,
@@ -12929,12 +14143,12 @@
               }
             }
           },
-          "true_next" : "node_36",
+          "true_next" : "node_48",
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_36",
-          "id" : 11,
+          "name" : "node_48",
+          "id" : 16,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 150,
@@ -12956,11 +14170,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.bridging",
-          "false_next" : "node_38"
+          "false_next" : "node_50"
         },
         {
-          "name" : "node_38",
-          "id" : 12,
+          "name" : "node_50",
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 151,
@@ -12982,11 +14196,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.mpls",
-          "false_next" : "node_40"
+          "false_next" : "node_52"
         },
         {
-          "name" : "node_40",
-          "id" : 13,
+          "name" : "node_52",
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 152,
@@ -13011,8 +14225,8 @@
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_43",
-          "id" : 14,
+          "name" : "node_55",
+          "id" : 19,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 75,
@@ -13044,8 +14258,8 @@
           "true_next" : "FabricIngress.next.xconnect"
         },
         {
-          "name" : "node_48",
-          "id" : 15,
+          "name" : "node_60",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 30,
@@ -13066,12 +14280,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_17",
-          "false_next" : "node_50"
+          "true_next" : "tbl_act_20",
+          "false_next" : "node_62"
         },
         {
-          "name" : "node_50",
-          "id" : 16,
+          "name" : "node_62",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 33,
@@ -13092,7 +14306,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_18",
+          "true_next" : "tbl_act_21",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         }
       ]
@@ -13106,11 +14320,11 @@
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_55",
+      "init_table" : "node_67",
       "tables" : [
         {
-          "name" : "tbl_act_19",
-          "id" : 34,
+          "name" : "tbl_act_22",
+          "id" : 41,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 41,
@@ -13124,22 +14338,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [97],
-          "actions" : ["act_19"],
-          "base_default_next" : "node_57",
+          "action_ids" : [106],
+          "actions" : ["act_22"],
+          "base_default_next" : "node_69",
           "next_tables" : {
-            "act_19" : "node_57"
+            "act_22" : "node_69"
           },
           "default_entry" : {
-            "action_id" : 97,
+            "action_id" : 106,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_20",
-          "id" : 35,
+          "name" : "tbl_act_23",
+          "id" : 42,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 44,
@@ -13153,22 +14367,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [98],
-          "actions" : ["act_20"],
-          "base_default_next" : "node_59",
+          "action_ids" : [107],
+          "actions" : ["act_23"],
+          "base_default_next" : "node_71",
           "next_tables" : {
-            "act_20" : "node_59"
+            "act_23" : "node_71"
           },
           "default_entry" : {
-            "action_id" : 98,
+            "action_id" : 107,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_21",
-          "id" : 36,
+          "name" : "tbl_act_24",
+          "id" : 43,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 337,
@@ -13182,14 +14396,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [99],
-          "actions" : ["act_21"],
-          "base_default_next" : "node_61",
+          "action_ids" : [108],
+          "actions" : ["act_24"],
+          "base_default_next" : "node_73",
           "next_tables" : {
-            "act_21" : "node_61"
+            "act_24" : "node_73"
           },
           "default_entry" : {
-            "action_id" : 99,
+            "action_id" : 108,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13197,7 +14411,7 @@
         },
         {
           "name" : "tbl_egress_next_pop_mpls_if_present",
-          "id" : 37,
+          "id" : 44,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 341,
@@ -13211,14 +14425,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [93],
+          "action_ids" : [102],
           "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.pop_mpls_if_present" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 93,
+            "action_id" : 102,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13226,7 +14440,7 @@
         },
         {
           "name" : "tbl_egress_next_set_mpls",
-          "id" : 38,
+          "id" : 45,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 343,
@@ -13240,14 +14454,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [94],
+          "action_ids" : [103],
           "actions" : ["FabricEgress.egress_next.set_mpls"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "FabricEgress.egress_next.set_mpls" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 94,
+            "action_id" : 103,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13255,7 +14469,7 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 39,
+          "id" : 46,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 320,
@@ -13282,23 +14496,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [96, 55],
+          "action_ids" : [105, 64],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_22",
-            "__MISS__" : "tbl_act_23"
+            "__HIT__" : "tbl_act_25",
+            "__MISS__" : "tbl_act_26"
           },
           "default_entry" : {
-            "action_id" : 55,
+            "action_id" : 64,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_22",
-          "id" : 40,
+          "name" : "tbl_act_25",
+          "id" : 47,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13306,22 +14520,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [100],
-          "actions" : ["act_22"],
-          "base_default_next" : "node_68",
+          "action_ids" : [109],
+          "actions" : ["act_25"],
+          "base_default_next" : "node_80",
           "next_tables" : {
-            "act_22" : "node_68"
+            "act_25" : "node_80"
           },
           "default_entry" : {
-            "action_id" : 100,
+            "action_id" : 109,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_23",
-          "id" : 41,
+          "name" : "tbl_act_26",
+          "id" : 48,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13329,14 +14543,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [101],
-          "actions" : ["act_23"],
-          "base_default_next" : "node_68",
+          "action_ids" : [110],
+          "actions" : ["act_26"],
+          "base_default_next" : "node_80",
           "next_tables" : {
-            "act_23" : "node_68"
+            "act_26" : "node_80"
           },
           "default_entry" : {
-            "action_id" : 101,
+            "action_id" : 110,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13344,7 +14558,7 @@
         },
         {
           "name" : "tbl_egress_next_push_vlan",
-          "id" : 42,
+          "id" : 49,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 360,
@@ -13358,22 +14572,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [95],
+          "action_ids" : [104],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
-          "base_default_next" : "node_71",
+          "base_default_next" : "node_83",
           "next_tables" : {
-            "FabricEgress.egress_next.push_vlan" : "node_71"
+            "FabricEgress.egress_next.push_vlan" : "node_83"
           },
           "default_entry" : {
-            "action_id" : 95,
+            "action_id" : 104,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_24",
-          "id" : 43,
+          "name" : "tbl_act_27",
+          "id" : 50,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 369,
@@ -13387,22 +14601,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [103],
-          "actions" : ["act_25"],
-          "base_default_next" : "node_73",
+          "action_ids" : [112],
+          "actions" : ["act_28"],
+          "base_default_next" : "node_85",
           "next_tables" : {
-            "act_25" : "node_73"
+            "act_28" : "node_85"
           },
           "default_entry" : {
-            "action_id" : 103,
+            "action_id" : 112,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_25",
-          "id" : 44,
+          "name" : "tbl_act_28",
+          "id" : 51,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 370,
@@ -13416,22 +14630,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [102],
-          "actions" : ["act_24"],
-          "base_default_next" : "node_79",
+          "action_ids" : [111],
+          "actions" : ["act_27"],
+          "base_default_next" : "tbl_act_31",
           "next_tables" : {
-            "act_24" : "node_79"
+            "act_27" : "tbl_act_31"
           },
           "default_entry" : {
-            "action_id" : 102,
+            "action_id" : 111,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_26",
-          "id" : 45,
+          "name" : "tbl_act_29",
+          "id" : 52,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 373,
@@ -13445,22 +14659,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [105],
-          "actions" : ["act_27"],
-          "base_default_next" : "node_77",
+          "action_ids" : [114],
+          "actions" : ["act_30"],
+          "base_default_next" : "node_89",
           "next_tables" : {
-            "act_27" : "node_77"
+            "act_30" : "node_89"
           },
           "default_entry" : {
-            "action_id" : 105,
+            "action_id" : 114,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_27",
-          "id" : 46,
+          "name" : "tbl_act_30",
+          "id" : 53,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 374,
@@ -13474,14 +14688,43 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [104],
-          "actions" : ["act_26"],
-          "base_default_next" : "node_79",
+          "action_ids" : [113],
+          "actions" : ["act_29"],
+          "base_default_next" : "tbl_act_31",
           "next_tables" : {
-            "act_26" : "node_79"
+            "act_29" : "tbl_act_31"
           },
           "default_entry" : {
-            "action_id" : 104,
+            "action_id" : 113,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_31",
+          "id" : 54,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 288,
+            "column" : 8,
+            "source_fragment" : "pdr_counter.count(fabric_meta.spgw.ctr_id)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [115],
+          "actions" : ["act_31"],
+          "base_default_next" : "node_92",
+          "next_tables" : {
+            "act_31" : "node_92"
+          },
+          "default_entry" : {
+            "action_id" : 115,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13489,10 +14732,10 @@
         },
         {
           "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 47,
+          "id" : 55,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 228,
+            "line" : 291,
             "column" : 12,
             "source_fragment" : "gtpu_encap()"
           },
@@ -13503,14 +14746,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [58],
+          "action_ids" : [67],
           "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : "node_81",
+          "base_default_next" : "node_94",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : "node_81"
+            "FabricEgress.spgw_egress.gtpu_encap" : "node_94"
           },
           "default_entry" : {
-            "action_id" : 58,
+            "action_id" : 67,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13518,7 +14761,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 48,
+          "id" : 56,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 66,
@@ -13557,23 +14800,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [59, 53],
+          "action_ids" : [68, 62],
           "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
-          "base_default_next" : "node_84",
+          "base_default_next" : "node_97",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_84",
-            "nop" : "node_84"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_97",
+            "nop" : "node_97"
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 62,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_28",
-          "id" : 49,
+          "name" : "tbl_act_32",
+          "id" : 57,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13581,14 +14824,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [106],
-          "actions" : ["act_28"],
+          "action_ids" : [116],
+          "actions" : ["act_32"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_28" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act_32" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 106,
+            "action_id" : 116,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13596,7 +14839,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 50,
+          "id" : 58,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 315,
@@ -13617,23 +14860,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [60, 54],
+          "action_ids" : [69, 63],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_87",
+          "base_default_next" : "node_100",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_87",
-            "nop" : "node_87"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_100",
+            "nop" : "node_100"
           },
           "default_entry" : {
-            "action_id" : 54,
+            "action_id" : 63,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_29",
-          "id" : 51,
+          "name" : "tbl_act_33",
+          "id" : 59,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 420,
@@ -13647,14 +14890,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [107],
-          "actions" : ["act_29"],
-          "base_default_next" : "node_89",
+          "action_ids" : [117],
+          "actions" : ["act_33"],
+          "base_default_next" : "node_102",
           "next_tables" : {
-            "act_29" : "node_89"
+            "act_33" : "node_102"
           },
           "default_entry" : {
-            "action_id" : 107,
+            "action_id" : 117,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13662,7 +14905,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 52,
+          "id" : 60,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 331,
@@ -13683,7 +14926,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 56],
+          "action_ids" : [70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 65],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15", "NoAction"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
           "next_tables" : {
@@ -13706,7 +14949,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 56,
+            "action_id" : 65,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -13726,7 +14969,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 61,
+                "action_id" : 70,
                 "action_data" : []
               },
               "priority" : 1
@@ -13745,7 +14988,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 62,
+                "action_id" : 71,
                 "action_data" : []
               },
               "priority" : 2
@@ -13764,7 +15007,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 63,
+                "action_id" : 72,
                 "action_data" : []
               },
               "priority" : 3
@@ -13783,7 +15026,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 64,
+                "action_id" : 73,
                 "action_data" : []
               },
               "priority" : 4
@@ -13802,7 +15045,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 65,
+                "action_id" : 74,
                 "action_data" : []
               },
               "priority" : 5
@@ -13821,7 +15064,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 66,
+                "action_id" : 75,
                 "action_data" : []
               },
               "priority" : 6
@@ -13840,7 +15083,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 67,
+                "action_id" : 76,
                 "action_data" : []
               },
               "priority" : 7
@@ -13859,7 +15102,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 68,
+                "action_id" : 77,
                 "action_data" : []
               },
               "priority" : 8
@@ -13878,7 +15121,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 69,
+                "action_id" : 78,
                 "action_data" : []
               },
               "priority" : 9
@@ -13897,7 +15140,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 70,
+                "action_id" : 79,
                 "action_data" : []
               },
               "priority" : 10
@@ -13916,7 +15159,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 71,
+                "action_id" : 80,
                 "action_data" : []
               },
               "priority" : 11
@@ -13935,7 +15178,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 72,
+                "action_id" : 81,
                 "action_data" : []
               },
               "priority" : 12
@@ -13954,7 +15197,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 73,
+                "action_id" : 82,
                 "action_data" : []
               },
               "priority" : 13
@@ -13973,7 +15216,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 74,
+                "action_id" : 83,
                 "action_data" : []
               },
               "priority" : 14
@@ -13992,7 +15235,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 75,
+                "action_id" : 84,
                 "action_data" : []
               },
               "priority" : 15
@@ -14011,7 +15254,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 76,
+                "action_id" : 85,
                 "action_data" : []
               },
               "priority" : 16
@@ -14020,7 +15263,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 53,
+          "id" : 61,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 375,
@@ -14041,30 +15284,30 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 57],
+          "action_ids" : [86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 66],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
-          "base_default_next" : "tbl_act_30",
+          "base_default_next" : "tbl_act_34",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_30",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_30",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_30",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_30",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_30",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_30",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_30",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_30",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_30",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_30",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_30",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_30",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_30",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_30",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_30",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_30",
-            "NoAction" : "tbl_act_30"
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_34",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_34",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_34",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_34",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_34",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_34",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_34",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_34",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_34",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_34",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_34",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_34",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_34",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_34",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_34",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_34",
+            "NoAction" : "tbl_act_34"
           },
           "default_entry" : {
-            "action_id" : 57,
+            "action_id" : 66,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -14084,7 +15327,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 77,
+                "action_id" : 86,
                 "action_data" : []
               },
               "priority" : 1
@@ -14103,7 +15346,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 78,
+                "action_id" : 87,
                 "action_data" : []
               },
               "priority" : 2
@@ -14122,7 +15365,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 79,
+                "action_id" : 88,
                 "action_data" : []
               },
               "priority" : 3
@@ -14141,7 +15384,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 80,
+                "action_id" : 89,
                 "action_data" : []
               },
               "priority" : 4
@@ -14160,7 +15403,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 81,
+                "action_id" : 90,
                 "action_data" : []
               },
               "priority" : 5
@@ -14179,7 +15422,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 82,
+                "action_id" : 91,
                 "action_data" : []
               },
               "priority" : 6
@@ -14198,7 +15441,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 83,
+                "action_id" : 92,
                 "action_data" : []
               },
               "priority" : 7
@@ -14217,7 +15460,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 84,
+                "action_id" : 93,
                 "action_data" : []
               },
               "priority" : 8
@@ -14236,7 +15479,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 85,
+                "action_id" : 94,
                 "action_data" : []
               },
               "priority" : 9
@@ -14255,7 +15498,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 86,
+                "action_id" : 95,
                 "action_data" : []
               },
               "priority" : 10
@@ -14274,7 +15517,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 87,
+                "action_id" : 96,
                 "action_data" : []
               },
               "priority" : 11
@@ -14293,7 +15536,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 88,
+                "action_id" : 97,
                 "action_data" : []
               },
               "priority" : 12
@@ -14312,7 +15555,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 89,
+                "action_id" : 98,
                 "action_data" : []
               },
               "priority" : 13
@@ -14331,7 +15574,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 90,
+                "action_id" : 99,
                 "action_data" : []
               },
               "priority" : 14
@@ -14350,7 +15593,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 91,
+                "action_id" : 100,
                 "action_data" : []
               },
               "priority" : 15
@@ -14369,7 +15612,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 92,
+                "action_id" : 101,
                 "action_data" : []
               },
               "priority" : 16
@@ -14377,8 +15620,8 @@
           ]
         },
         {
-          "name" : "tbl_act_30",
-          "id" : 54,
+          "name" : "tbl_act_34",
+          "id" : 62,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 425,
@@ -14392,22 +15635,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [109],
-          "actions" : ["act_31"],
-          "base_default_next" : "node_93",
+          "action_ids" : [119],
+          "actions" : ["act_35"],
+          "base_default_next" : "node_106",
           "next_tables" : {
-            "act_31" : "node_93"
+            "act_35" : "node_106"
           },
           "default_entry" : {
-            "action_id" : 109,
+            "action_id" : 119,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_31",
-          "id" : 55,
+          "name" : "tbl_act_35",
+          "id" : 63,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 428,
@@ -14421,22 +15664,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [108],
-          "actions" : ["act_30"],
-          "base_default_next" : "node_95",
+          "action_ids" : [118],
+          "actions" : ["act_34"],
+          "base_default_next" : "node_108",
           "next_tables" : {
-            "act_30" : "node_95"
+            "act_34" : "node_108"
           },
           "default_entry" : {
-            "action_id" : 108,
+            "action_id" : 118,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_32",
-          "id" : 56,
+          "name" : "tbl_act_36",
+          "id" : 64,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 431,
@@ -14450,22 +15693,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [110],
-          "actions" : ["act_32"],
-          "base_default_next" : "node_97",
+          "action_ids" : [120],
+          "actions" : ["act_36"],
+          "base_default_next" : "node_110",
           "next_tables" : {
-            "act_32" : "node_97"
+            "act_36" : "node_110"
           },
           "default_entry" : {
-            "action_id" : 110,
+            "action_id" : 120,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_33",
-          "id" : 57,
+          "name" : "tbl_act_37",
+          "id" : 65,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 434,
@@ -14479,14 +15722,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [111],
-          "actions" : ["act_33"],
+          "action_ids" : [121],
+          "actions" : ["act_37"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_33" : null
+            "act_37" : null
           },
           "default_entry" : {
-            "action_id" : 111,
+            "action_id" : 121,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14496,8 +15739,8 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_55",
-          "id" : 17,
+          "name" : "node_67",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 39,
@@ -14525,12 +15768,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_19",
-          "false_next" : "node_57"
+          "true_next" : "tbl_act_22",
+          "false_next" : "node_69"
         },
         {
-          "name" : "node_57",
-          "id" : 18,
+          "name" : "node_69",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 43,
@@ -14551,12 +15794,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_20",
-          "false_next" : "node_59"
+          "true_next" : "tbl_act_23",
+          "false_next" : "node_71"
         },
         {
-          "name" : "node_59",
-          "id" : 19,
+          "name" : "node_71",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 335,
@@ -14604,12 +15847,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_21",
-          "false_next" : "node_61"
+          "true_next" : "tbl_act_24",
+          "false_next" : "node_73"
         },
         {
-          "name" : "node_61",
-          "id" : 20,
+          "name" : "node_73",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 340,
@@ -14630,12 +15873,12 @@
               }
             }
           },
-          "true_next" : "node_62",
+          "true_next" : "node_74",
           "false_next" : "tbl_egress_next_set_mpls"
         },
         {
-          "name" : "node_62",
-          "id" : 21,
+          "name" : "node_74",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 341,
@@ -14657,8 +15900,8 @@
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_68",
-          "id" : 22,
+          "name" : "node_80",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 357,
@@ -14683,12 +15926,12 @@
               }
             }
           },
-          "true_next" : "node_69",
-          "false_next" : "node_71"
+          "true_next" : "node_81",
+          "false_next" : "node_83"
         },
         {
-          "name" : "node_69",
-          "id" : 23,
+          "name" : "node_81",
+          "id" : 28,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 359,
@@ -14710,11 +15953,11 @@
             }
           },
           "true_next" : "tbl_egress_next_push_vlan",
-          "false_next" : "node_71"
+          "false_next" : "node_83"
         },
         {
-          "name" : "node_71",
-          "id" : 24,
+          "name" : "node_83",
+          "id" : 29,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 368,
@@ -14732,12 +15975,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_24",
-          "false_next" : "node_75"
+          "true_next" : "tbl_act_27",
+          "false_next" : "node_87"
         },
         {
-          "name" : "node_73",
-          "id" : 25,
+          "name" : "node_85",
+          "id" : 30,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 370,
@@ -14758,12 +16001,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_25",
-          "false_next" : "node_79"
+          "true_next" : "tbl_act_28",
+          "false_next" : "tbl_act_31"
         },
         {
-          "name" : "node_75",
-          "id" : 26,
+          "name" : "node_87",
+          "id" : 31,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 372,
@@ -14781,12 +16024,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_26",
-          "false_next" : "node_79"
+          "true_next" : "tbl_act_29",
+          "false_next" : "tbl_act_31"
         },
         {
-          "name" : "node_77",
-          "id" : 27,
+          "name" : "node_89",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 374,
@@ -14807,38 +16050,45 @@
               }
             }
           },
-          "true_next" : "tbl_act_27",
-          "false_next" : "node_79"
+          "true_next" : "tbl_act_30",
+          "false_next" : "tbl_act_31"
         },
         {
-          "name" : "node_79",
-          "id" : 28,
+          "name" : "node_92",
+          "id" : 33,
           "source_info" : {
             "filename" : "include/spgw.p4",
-            "line" : 227,
+            "line" : 290,
             "column" : 12,
-            "source_fragment" : "fabric_meta.spgw.direction == SPGW_DIR_DOWNLINK"
+            "source_fragment" : "fabric_meta.spgw.outer_header_creation == true"
           },
           "expression" : {
             "type" : "expression",
             "value" : {
               "op" : "==",
               "left" : {
-                "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t._spgw_direction15"]
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t._spgw_outer_header_creation27"]
+                  }
+                }
               },
               "right" : {
-                "type" : "hexstr",
-                "value" : "0x02"
+                "type" : "bool",
+                "value" : true
               }
             }
           },
           "true_next" : "tbl_spgw_egress_gtpu_encap",
-          "false_next" : "node_81"
+          "false_next" : "node_94"
         },
         {
-          "name" : "node_81",
-          "id" : 29,
+          "name" : "node_94",
+          "id" : 34,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 102,
@@ -14914,11 +16164,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_82"
+          "true_next" : "node_95"
         },
         {
-          "name" : "node_82",
-          "id" : 30,
+          "name" : "node_95",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 106,
@@ -14936,7 +16186,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_source20"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_source28"]
                   }
                 }
               },
@@ -14947,11 +16197,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_84"
+          "false_next" : "node_97"
         },
         {
-          "name" : "node_84",
-          "id" : 31,
+          "name" : "node_97",
+          "id" : 36,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 110,
@@ -14970,11 +16220,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_28"
+          "true_next" : "tbl_act_32"
         },
         {
-          "name" : "node_87",
-          "id" : 32,
+          "name" : "node_100",
+          "id" : 37,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 419,
@@ -14992,7 +16242,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit21"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit29"]
                   }
                 }
               },
@@ -15002,12 +16252,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_29",
-          "false_next" : "node_89"
+          "true_next" : "tbl_act_33",
+          "false_next" : "node_102"
         },
         {
-          "name" : "node_89",
-          "id" : 33,
+          "name" : "node_102",
+          "id" : 38,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -15030,8 +16280,8 @@
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003"
         },
         {
-          "name" : "node_93",
-          "id" : 34,
+          "name" : "node_106",
+          "id" : 39,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 427,
@@ -15049,12 +16299,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_31",
-          "false_next" : "node_95"
+          "true_next" : "tbl_act_35",
+          "false_next" : "node_108"
         },
         {
-          "name" : "node_95",
-          "id" : 35,
+          "name" : "node_108",
+          "id" : 40,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 430,
@@ -15072,12 +16322,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_32",
-          "false_next" : "node_97"
+          "true_next" : "tbl_act_36",
+          "false_next" : "node_110"
         },
         {
-          "name" : "node_97",
-          "id" : 36,
+          "name" : "node_110",
+          "id" : 41,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 433,
@@ -15096,7 +16346,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_33"
+          "true_next" : "tbl_act_37"
         }
       ]
     }
@@ -15133,7 +16383,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "include/spgw.p4",
-        "line" : 243,
+        "line" : 306,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },