diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
index 882a624..eb927ad 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
@@ -33,90 +33,140 @@
     }
 
     // Header field IDs
-    public static final PiMatchFieldId HDR_ICMP_CODE =
-            PiMatchFieldId.of("icmp_code");
     public static final PiMatchFieldId HDR_IG_PORT =
             PiMatchFieldId.of("ig_port");
-    public static final PiMatchFieldId HDR_ETH_DST =
-            PiMatchFieldId.of("eth_dst");
-    public static final PiMatchFieldId HDR_GTP_IPV4_DST =
-            PiMatchFieldId.of("gtp_ipv4_dst");
     public static final PiMatchFieldId HDR_VLAN_IS_VALID =
             PiMatchFieldId.of("vlan_is_valid");
-    public static final PiMatchFieldId HDR_IPV4_DST =
-            PiMatchFieldId.of("ipv4_dst");
-    public static final PiMatchFieldId HDR_INT_IS_VALID =
-            PiMatchFieldId.of("int_is_valid");
-    public static final PiMatchFieldId HDR_EG_PORT =
-            PiMatchFieldId.of("eg_port");
-    public static final PiMatchFieldId HDR_EG_SPEC =
-            PiMatchFieldId.of("eg_spec");
+    public static final PiMatchFieldId HDR_IPV6_SRC_NET_ID =
+            PiMatchFieldId.of("ipv6_src_net_id");
+    public static final PiMatchFieldId HDR_C_TAG = PiMatchFieldId.of("c_tag");
     public static final PiMatchFieldId HDR_IPV4_SRC =
             PiMatchFieldId.of("ipv4_src");
     public static final PiMatchFieldId HDR_IPV6_DST =
             PiMatchFieldId.of("ipv6_dst");
-    public static final PiMatchFieldId HDR_ETH_TYPE =
-            PiMatchFieldId.of("eth_type");
-    public static final PiMatchFieldId HDR_MPLS_LABEL =
-            PiMatchFieldId.of("mpls_label");
-    public static final PiMatchFieldId HDR_ETH_SRC =
-            PiMatchFieldId.of("eth_src");
-    public static final PiMatchFieldId HDR_IP_PROTO =
-            PiMatchFieldId.of("ip_proto");
     public static final PiMatchFieldId HDR_L4_DPORT =
             PiMatchFieldId.of("l4_dport");
-    public static final PiMatchFieldId HDR_NEXT_ID =
-            PiMatchFieldId.of("next_id");
-    public static final PiMatchFieldId HDR_ICMP_TYPE =
-            PiMatchFieldId.of("icmp_type");
+    public static final PiMatchFieldId HDR_PPPOE_CODE =
+            PiMatchFieldId.of("pppoe_code");
+    public static final PiMatchFieldId HDR_IPV6_SRC =
+            PiMatchFieldId.of("ipv6_src");
+    public static final PiMatchFieldId HDR_ETH_SRC =
+            PiMatchFieldId.of("eth_src");
+    public static final PiMatchFieldId HDR_S_TAG = PiMatchFieldId.of("s_tag");
     public static final PiMatchFieldId HDR_VLAN_ID =
             PiMatchFieldId.of("vlan_id");
+    public static final PiMatchFieldId HDR_ETH_DST =
+            PiMatchFieldId.of("eth_dst");
+    public static final PiMatchFieldId HDR_ICMP_TYPE =
+            PiMatchFieldId.of("icmp_type");
+    public static final PiMatchFieldId HDR_IPV4_DST =
+            PiMatchFieldId.of("ipv4_dst");
+    public static final PiMatchFieldId HDR_IPV6_TRAFFIC_CLASS =
+            PiMatchFieldId.of("ipv6_traffic_class");
+    public static final PiMatchFieldId HDR_IPV6_DST_NET_ID =
+            PiMatchFieldId.of("ipv6_dst_net_id");
+    public static final PiMatchFieldId HDR_ETH_TYPE =
+            PiMatchFieldId.of("eth_type");
+    public static final PiMatchFieldId HDR_NEXT_ID =
+            PiMatchFieldId.of("next_id");
     public static final PiMatchFieldId HDR_L4_SPORT =
             PiMatchFieldId.of("l4_sport");
+    public static final PiMatchFieldId HDR_ICMP_CODE =
+            PiMatchFieldId.of("icmp_code");
+    public static final PiMatchFieldId HDR_IPV4_ECN =
+            PiMatchFieldId.of("ipv4_ecn");
+    public static final PiMatchFieldId HDR_PPPOE_SESSION_ID =
+            PiMatchFieldId.of("pppoe_session_id");
+    public static final PiMatchFieldId HDR_EG_SPEC =
+            PiMatchFieldId.of("eg_spec");
+    public static final PiMatchFieldId HDR_LINE_ID =
+            PiMatchFieldId.of("line_id");
+    public static final PiMatchFieldId HDR_IPV4_DSCP =
+            PiMatchFieldId.of("ipv4_dscp");
+    public static final PiMatchFieldId HDR_EG_PORT =
+            PiMatchFieldId.of("eg_port");
+    public static final PiMatchFieldId HDR_GTP_IPV4_DST =
+            PiMatchFieldId.of("gtp_ipv4_dst");
+    public static final PiMatchFieldId HDR_INT_IS_VALID =
+            PiMatchFieldId.of("int_is_valid");
+    public static final PiMatchFieldId HDR_MPLS_LABEL =
+            PiMatchFieldId.of("mpls_label");
+    public static final PiMatchFieldId HDR_IP_PROTO =
+            PiMatchFieldId.of("ip_proto");
+    public static final PiMatchFieldId HDR_PPPOE_PROTOCOL =
+            PiMatchFieldId.of("pppoe_protocol");
     // Table IDs
-    public static final PiTableId FABRIC_INGRESS_NEXT_MULTICAST =
-            PiTableId.of("FabricIngress.next.multicast");
     public static final PiTableId FABRIC_INGRESS_NEXT_HASHED =
             PiTableId.of("FabricIngress.next.hashed");
-    public static final PiTableId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_SOURCE_TB_INT_SOURCE =
-            PiTableId.of("FabricEgress.process_int_main.process_int_source.tb_int_source");
-    public static final PiTableId FABRIC_INGRESS_FORWARDING_MPLS =
-            PiTableId.of("FabricIngress.forwarding.mpls");
-    public static final PiTableId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SINK =
-            PiTableId.of("FabricIngress.process_set_source_sink.tb_set_sink");
-    public static final PiTableId FABRIC_INGRESS_FORWARDING_ROUTING_V4 =
-            PiTableId.of("FabricIngress.forwarding.routing_v4");
     public static final PiTableId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_TRANSIT_TB_INT_INSERT =
             PiTableId.of("FabricEgress.process_int_main.process_int_transit.tb_int_insert");
-    public static final PiTableId FABRIC_INGRESS_ACL_ACL =
-            PiTableId.of("FabricIngress.acl.acl");
-    public static final PiTableId FABRIC_INGRESS_NEXT_XCONNECT =
-            PiTableId.of("FabricIngress.next.xconnect");
+    public static final PiTableId FABRIC_EGRESS_BNG_EGRESS_DOWNSTREAM_T_SESSION_ENCAP =
+            PiTableId.of("FabricEgress.bng_egress.downstream.t_session_encap");
     public static final PiTableId FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER =
             PiTableId.of("FabricIngress.filtering.fwd_classifier");
-    public static final PiTableId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SOURCE =
-            PiTableId.of("FabricIngress.process_set_source_sink.tb_set_source");
-    public static final PiTableId FABRIC_INGRESS_FORWARDING_BRIDGING =
-            PiTableId.of("FabricIngress.forwarding.bridging");
-    public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_S1U_FILTER_TABLE =
-            PiTableId.of("FabricIngress.spgw_ingress.s1u_filter_table");
-    public static final PiTableId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_REPORT_TB_GENERATE_REPORT =
-            PiTableId.of("FabricEgress.process_int_main.process_int_report.tb_generate_report");
-    public static final PiTableId FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN =
-            PiTableId.of("FabricIngress.filtering.ingress_port_vlan");
-    public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_DL_SESS_LOOKUP =
-            PiTableId.of("FabricIngress.spgw_ingress.dl_sess_lookup");
-    public static final PiTableId FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN =
-            PiTableId.of("FabricEgress.egress_next.egress_vlan");
+    public static final PiTableId FABRIC_INGRESS_NEXT_XCONNECT =
+            PiTableId.of("FabricIngress.next.xconnect");
     public static final PiTableId FABRIC_INGRESS_NEXT_NEXT_VLAN =
             PiTableId.of("FabricIngress.next.next_vlan");
     public static final PiTableId FABRIC_INGRESS_NEXT_SIMPLE =
             PiTableId.of("FabricIngress.next.simple");
+    public static final PiTableId FABRIC_INGRESS_NEXT_MULTICAST =
+            PiTableId.of("FabricIngress.next.multicast");
+    public static final PiTableId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_SOURCE_TB_INT_SOURCE =
+            PiTableId.of("FabricEgress.process_int_main.process_int_source.tb_int_source");
     public static final PiTableId FABRIC_INGRESS_FORWARDING_ROUTING_V6 =
             PiTableId.of("FabricIngress.forwarding.routing_v6");
+    public static final PiTableId FABRIC_INGRESS_FORWARDING_MPLS =
+            PiTableId.of("FabricIngress.forwarding.mpls");
+    public static final PiTableId FABRIC_INGRESS_FORWARDING_ROUTING_V4 =
+            PiTableId.of("FabricIngress.forwarding.routing_v4");
+    public static final PiTableId FABRIC_INGRESS_ACL_ACL =
+            PiTableId.of("FabricIngress.acl.acl");
+    public static final PiTableId FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN =
+            PiTableId.of("FabricIngress.filtering.ingress_port_vlan");
+    public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_T_PPPOE_CP =
+            PiTableId.of("FabricIngress.bng_ingress.upstream.t_pppoe_cp");
+    public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_T_PPPOE_TERM_V4 =
+            PiTableId.of("FabricIngress.bng_ingress.upstream.t_pppoe_term_v4");
+    public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_S1U_FILTER_TABLE =
+            PiTableId.of("FabricIngress.spgw_ingress.s1u_filter_table");
+    public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_T_LINE_MAP_V6 =
+            PiTableId.of("FabricIngress.bng_ingress.downstream.t_line_map_v6");
+    public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_T_LINE_MAP_V4 =
+            PiTableId.of("FabricIngress.bng_ingress.downstream.t_line_map_v4");
+    public static final PiTableId FABRIC_INGRESS_FORWARDING_BRIDGING =
+            PiTableId.of("FabricIngress.forwarding.bridging");
+    public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_T_LINE_MAP =
+            PiTableId.of("FabricIngress.bng_ingress.upstream.t_line_map");
+    public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_DL_SESS_LOOKUP =
+            PiTableId.of("FabricIngress.spgw_ingress.dl_sess_lookup");
+    public static final PiTableId FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN =
+            PiTableId.of("FabricEgress.egress_next.egress_vlan");
+    public static final PiTableId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SINK =
+            PiTableId.of("FabricIngress.process_set_source_sink.tb_set_sink");
+    public static final PiTableId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_REPORT_TB_GENERATE_REPORT =
+            PiTableId.of("FabricEgress.process_int_main.process_int_report.tb_generate_report");
+    public static final PiTableId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SOURCE =
+            PiTableId.of("FabricIngress.process_set_source_sink.tb_set_source");
+    public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_T_QOS_V6 =
+            PiTableId.of("FabricIngress.bng_ingress.downstream.t_qos_v6");
+    public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_T_QOS_V4 =
+            PiTableId.of("FabricIngress.bng_ingress.downstream.t_qos_v4");
+    public static final PiTableId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_T_PPPOE_TERM_V6 =
+            PiTableId.of("FabricIngress.bng_ingress.upstream.t_pppoe_term_v6");
     // Indirect Counter IDs
+    public static final PiCounterId FABRIC_EGRESS_BNG_EGRESS_DOWNSTREAM_C_LINE_TX =
+            PiCounterId.of("FabricEgress.bng_egress.downstream.c_line_tx");
     public static final PiCounterId FABRIC_INGRESS_PORT_COUNTERS_CONTROL_EGRESS_PORT_COUNTER =
             PiCounterId.of("FabricIngress.port_counters_control.egress_port_counter");
+    public static final PiCounterId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_C_DROPPED =
+            PiCounterId.of("FabricIngress.bng_ingress.upstream.c_dropped");
+    public static final PiCounterId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_C_CONTROL =
+            PiCounterId.of("FabricIngress.bng_ingress.upstream.c_control");
+    public static final PiCounterId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_C_TERMINATED =
+            PiCounterId.of("FabricIngress.bng_ingress.upstream.c_terminated");
+    public static final PiCounterId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_C_LINE_RX =
+            PiCounterId.of("FabricIngress.bng_ingress.downstream.c_line_rx");
     public static final PiCounterId FABRIC_INGRESS_PORT_COUNTERS_CONTROL_INGRESS_PORT_COUNTER =
             PiCounterId.of("FabricIngress.port_counters_control.ingress_port_counter");
     // Direct Counter IDs
@@ -159,6 +209,8 @@
             PiActionId.of("FabricIngress.next.set_next_id_xconnect");
     public static final PiActionId FABRIC_INGRESS_FORWARDING_NOP_ROUTING_V4 =
             PiActionId.of("FabricIngress.forwarding.nop_routing_v4");
+    public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_QOS_BESTEFF =
+            PiActionId.of("FabricIngress.bng_ingress.downstream.qos_besteff");
     public static final PiActionId FABRIC_INGRESS_FILTERING_PERMIT_WITH_INTERNAL_VLAN =
             PiActionId.of("FabricIngress.filtering.permit_with_internal_vlan");
     public static final PiActionId FABRIC_INGRESS_NEXT_ROUTING_HASHED =
@@ -171,12 +223,14 @@
             PiActionId.of("FabricEgress.process_int_main.process_int_transit.init_metadata");
     public static final PiActionId FABRIC_INGRESS_ACL_DROP =
             PiActionId.of("FabricIngress.acl.drop");
-    public static final PiActionId FABRIC_INGRESS_NEXT_SET_VLAN =
-            PiActionId.of("FabricIngress.next.set_vlan");
+    public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_PUNT_TO_CPU =
+            PiActionId.of("FabricIngress.bng_ingress.upstream.punt_to_cpu");
+    public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_SET_LINE =
+            PiActionId.of("FabricIngress.bng_ingress.upstream.set_line");
     public static final PiActionId FABRIC_INGRESS_ACL_NOP_ACL =
             PiActionId.of("FabricIngress.acl.nop_acl");
-    public static final PiActionId FABRIC_INGRESS_NEXT_OUTPUT_XCONNECT =
-            PiActionId.of("FabricIngress.next.output_xconnect");
+    public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_TERM_DISABLED =
+            PiActionId.of("FabricIngress.bng_ingress.upstream.term_disabled");
     public static final PiActionId FABRIC_INGRESS_ACL_SET_NEXT_ID_ACL =
             PiActionId.of("FabricIngress.acl.set_next_id_acl");
     public static final PiActionId FABRIC_INGRESS_FILTERING_PERMIT =
@@ -189,20 +243,34 @@
             PiActionId.of("FabricIngress.next.routing_simple");
     public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_SET_DL_SESS_INFO =
             PiActionId.of("FabricIngress.spgw_ingress.set_dl_sess_info");
+    public static final PiActionId FABRIC_EGRESS_BNG_EGRESS_DOWNSTREAM_ENCAP_V4 =
+            PiActionId.of("FabricEgress.bng_egress.downstream.encap_v4");
     public static final PiActionId FABRIC_INGRESS_NEXT_OUTPUT_HASHED =
             PiActionId.of("FabricIngress.next.output_hashed");
     public static final PiActionId FABRIC_INGRESS_FORWARDING_POP_MPLS_AND_NEXT =
             PiActionId.of("FabricIngress.forwarding.pop_mpls_and_next");
+    public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_SET_LINE_NEXT =
+            PiActionId.of("FabricIngress.bng_ingress.downstream.set_line_next");
+    public static final PiActionId FABRIC_EGRESS_BNG_EGRESS_DOWNSTREAM_ENCAP_V6 =
+            PiActionId.of("FabricEgress.bng_egress.downstream.encap_v6");
     public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_SIMPLE =
             PiActionId.of("FabricIngress.next.mpls_routing_simple");
     public static final PiActionId FABRIC_INGRESS_ACL_PUNT_TO_CPU =
             PiActionId.of("FabricIngress.acl.punt_to_cpu");
+    public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_QOS_PRIO =
+            PiActionId.of("FabricIngress.bng_ingress.downstream.qos_prio");
+    public static final PiActionId FABRIC_INGRESS_NEXT_SET_VLAN =
+            PiActionId.of("FabricIngress.next.set_vlan");
     public static final PiActionId FABRIC_EGRESS_EGRESS_NEXT_POP_VLAN =
             PiActionId.of("FabricEgress.egress_next.pop_vlan");
     public static final PiActionId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_INT_SET_SINK =
             PiActionId.of("FabricIngress.process_set_source_sink.int_set_sink");
     public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_HASHED =
             PiActionId.of("FabricIngress.next.mpls_routing_hashed");
+    public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_TERM_ENABLED_V6 =
+            PiActionId.of("FabricIngress.bng_ingress.upstream.term_enabled_v6");
+    public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_UPSTREAM_TERM_ENABLED_V4 =
+            PiActionId.of("FabricIngress.bng_ingress.upstream.term_enabled_v4");
     public static final PiActionId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_INT_SET_SOURCE =
             PiActionId.of("FabricIngress.process_set_source_sink.int_set_source");
     public static final PiActionId NOP = PiActionId.of("nop");
@@ -212,44 +280,52 @@
             PiActionId.of("FabricIngress.acl.clone_to_cpu");
     public static final PiActionId FABRIC_INGRESS_FILTERING_DENY =
             PiActionId.of("FabricIngress.filtering.deny");
+    public static final PiActionId FABRIC_INGRESS_NEXT_SET_MCAST_GROUP_ID =
+            PiActionId.of("FabricIngress.next.set_mcast_group_id");
     public static final PiActionId FABRIC_INGRESS_FILTERING_SET_FORWARDING_TYPE =
             PiActionId.of("FabricIngress.filtering.set_forwarding_type");
+    public static final PiActionId FABRIC_INGRESS_BNG_INGRESS_DOWNSTREAM_SET_LINE_DROP =
+            PiActionId.of("FabricIngress.bng_ingress.downstream.set_line_drop");
     public static final PiActionId FABRIC_EGRESS_PROCESS_INT_MAIN_PROCESS_INT_REPORT_DO_REPORT_ENCAPSULATION =
             PiActionId.of("FabricEgress.process_int_main.process_int_report.do_report_encapsulation");
     public static final PiActionId NO_ACTION = PiActionId.of("NoAction");
-    public static final PiActionId FABRIC_INGRESS_NEXT_SET_MCAST_GROUP_ID =
-            PiActionId.of("FabricIngress.next.set_mcast_group_id");
+    public static final PiActionId FABRIC_INGRESS_NEXT_OUTPUT_XCONNECT =
+            PiActionId.of("FabricIngress.next.output_xconnect");
     // Action Param IDs
-    public static final PiActionParamId DMAC = PiActionParamId.of("dmac");
+    public static final PiActionParamId MON_PORT =
+            PiActionParamId.of("mon_port");
+    public static final PiActionParamId C_TAG = PiActionParamId.of("c_tag");
+    public static final PiActionParamId S1U_SGW_ADDR =
+            PiActionParamId.of("s1u_sgw_addr");
+    public static final PiActionParamId SMAC = PiActionParamId.of("smac");
+    public static final PiActionParamId VLAN_ID = PiActionParamId.of("vlan_id");
+    public static final PiActionParamId LABEL = PiActionParamId.of("label");
+    public static final PiActionParamId SRC_IP = PiActionParamId.of("src_ip");
+    public static final PiActionParamId NEXT_ID = PiActionParamId.of("next_id");
     public static final PiActionParamId INS_CNT = PiActionParamId.of("ins_cnt");
+    public static final PiActionParamId SRC_MAC = PiActionParamId.of("src_mac");
+    public static final PiActionParamId DMAC = PiActionParamId.of("dmac");
+    public static final PiActionParamId PPPOE_SESSION_ID =
+            PiActionParamId.of("pppoe_session_id");
+    public static final PiActionParamId MON_MAC = PiActionParamId.of("mon_mac");
     public static final PiActionParamId MON_IP = PiActionParamId.of("mon_ip");
-    public static final PiActionParamId TEID = PiActionParamId.of("teid");
-    public static final PiActionParamId INS_MASK0407 =
-            PiActionParamId.of("ins_mask0407");
+    public static final PiActionParamId SWITCH_ID =
+            PiActionParamId.of("switch_id");
     public static final PiActionParamId INS_MASK0003 =
             PiActionParamId.of("ins_mask0003");
+    public static final PiActionParamId LINE_ID = PiActionParamId.of("line_id");
+    public static final PiActionParamId FWD_TYPE =
+            PiActionParamId.of("fwd_type");
+    public static final PiActionParamId INS_MASK0407 =
+            PiActionParamId.of("ins_mask0407");
+    public static final PiActionParamId TEID = PiActionParamId.of("teid");
     public static final PiActionParamId S1U_ENB_ADDR =
             PiActionParamId.of("s1u_enb_addr");
     public static final PiActionParamId PORT_NUM =
             PiActionParamId.of("port_num");
-    public static final PiActionParamId S1U_SGW_ADDR =
-            PiActionParamId.of("s1u_sgw_addr");
-    public static final PiActionParamId LABEL = PiActionParamId.of("label");
-    public static final PiActionParamId SMAC = PiActionParamId.of("smac");
-    public static final PiActionParamId MON_PORT =
-            PiActionParamId.of("mon_port");
-    public static final PiActionParamId FWD_TYPE =
-            PiActionParamId.of("fwd_type");
-    public static final PiActionParamId MON_MAC = PiActionParamId.of("mon_mac");
-    public static final PiActionParamId SRC_MAC = PiActionParamId.of("src_mac");
-    public static final PiActionParamId NEXT_ID = PiActionParamId.of("next_id");
     public static final PiActionParamId GROUP_ID =
             PiActionParamId.of("group_id");
-    public static final PiActionParamId SWITCH_ID =
-            PiActionParamId.of("switch_id");
     public static final PiActionParamId MAX_HOP = PiActionParamId.of("max_hop");
-    public static final PiActionParamId VLAN_ID = PiActionParamId.of("vlan_id");
-    public static final PiActionParamId SRC_IP = PiActionParamId.of("src_ip");
     // Action Profile IDs
     public static final PiActionProfileId FABRIC_INGRESS_NEXT_HASHED_SELECTOR =
             PiActionProfileId.of("FabricIngress.next.hashed_selector");
@@ -258,4 +334,4 @@
             PiPacketMetadataId.of("ingress_port");
     public static final PiPacketMetadataId EGRESS_PORT =
             PiPacketMetadataId.of("egress_port");
-}
+}
\ No newline at end of file
diff --git a/pipelines/fabric/src/main/resources/.gitignore b/pipelines/fabric/src/main/resources/.gitignore
index 07ae761..fcd51a7 100644
--- a/pipelines/fabric/src/main/resources/.gitignore
+++ b/pipelines/fabric/src/main/resources/.gitignore
@@ -1,2 +1,3 @@
 p4c-out/*/tofino
 p4c-out/**/graphs
+p4c-out/**/_pp.p4
diff --git a/pipelines/fabric/src/main/resources/Makefile b/pipelines/fabric/src/main/resources/Makefile
index 4daca72..7658b18 100644
--- a/pipelines/fabric/src/main/resources/Makefile
+++ b/pipelines/fabric/src/main/resources/Makefile
@@ -6,6 +6,9 @@
 fabric-spgw:
 	@./bmv2-compile.sh "fabric-spgw" "-DWITH_SPGW"
 
+fabric-bng:
+	@./bmv2-compile.sh "fabric-bng" "-DWITH_BNG"
+
 fabric-int:
 	@./bmv2-compile.sh "fabric-int" "-DWITH_INT_SOURCE -DWITH_INT_TRANSIT"
 
@@ -14,13 +17,14 @@
 
 fabric-full:
 	@./bmv2-compile.sh "fabric-full" " -DWITH_MULTICAST -DWITH_IPV6 \
-		-DWITH_SIMPLE_NEXT -DWITH_HASHED_NEXT -DWITH_SPGW \
+		-DWITH_SIMPLE_NEXT -DWITH_HASHED_NEXT -DWITH_BNG -DWITH_SPGW \
 		-DWITH_INT_SOURCE -DWITH_INT_TRANSIT -DWITH_INT_SINK"
 
 constants:
-	onos-gen-p4-constants \
-		-o $(ONOS_ROOT)/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java \
-		fabric p4c-out/fabric-full/bmv2/default/p4info.txt
+	docker run -v $(ONOS_ROOT):/onos -w /onos/tools/dev/bin \
+		--entrypoint ./onos-gen-p4-constants opennetworking/p4mn:stable \
+		-o /onos/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java \
+		fabric /onos/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
 
 clean:
 	rm -rf p4c-out/*/bmv2
diff --git a/pipelines/fabric/src/main/resources/bmv2-compile.sh b/pipelines/fabric/src/main/resources/bmv2-compile.sh
index d9ea018..f77e287 100755
--- a/pipelines/fabric/src/main/resources/bmv2-compile.sh
+++ b/pipelines/fabric/src/main/resources/bmv2-compile.sh
@@ -7,23 +7,38 @@
 
 PROFILE=$1
 OTHER_PP_FLAGS=$2
-OUT_DIR=./p4c-out/${PROFILE}/bmv2/default
 
+SRC_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+OUT_DIR=${SRC_DIR}/p4c-out/${PROFILE}/bmv2/default
 
 mkdir -p ${OUT_DIR}
 mkdir -p ${OUT_DIR}/graphs
 
 echo
 echo "## Compiling profile ${PROFILE} in ${OUT_DIR}..."
-(set -x; p4c-bm2-ss --arch v1model \
-        -o ${OUT_DIR}/bmv2.json \
+
+dockerImage=ccasconeonf/p4c
+dockerRun="docker run --rm -w ${SRC_DIR} -v ${SRC_DIR}:${SRC_DIR} -v ${OUT_DIR}:${OUT_DIR} ${dockerImage}"
+
+# Generate preprocessed P4 source (for debugging).
+(set -x; ${dockerRun} p4c-bm2-ss --arch v1model \
         ${BMV2_PP_FLAGS} ${OTHER_PP_FLAGS} \
-        --p4runtime-files ${OUT_DIR}/p4info.txt \
-        fabric.p4)
-(set -x; p4c-graphs ${BMV2_PP_FLAGS} ${OTHER_PP_FLAGS} --graphs-dir ${OUT_DIR}/graphs fabric.p4)
+        --pp ${OUT_DIR}/_pp.p4 fabric.p4)
+
+# Generate BMv2 JSON and P4Info.
+(set -x; ${dockerRun} p4c-bm2-ss --arch v1model -o ${OUT_DIR}/bmv2.json \
+        ${BMV2_PP_FLAGS} ${OTHER_PP_FLAGS} \
+        --p4runtime-files ${OUT_DIR}/p4info.txt fabric.p4)
+
+# Graphs.
+(set -x; ${dockerRun} p4c-graphs ${BMV2_PP_FLAGS} ${OTHER_PP_FLAGS} \
+        --graphs-dir ${OUT_DIR}/graphs fabric.p4)
+
+# Convert .dot graphs to PDFs.
 for f in ${OUT_DIR}/graphs/*.dot; do
-    (set -x; dot -Tpdf ${f} > ${f}.pdf)
+    (set -x; ${dockerRun} dot -Tpdf ${f} > ${f}.pdf)
     rm -f ${f}
 done
 
+# CPU port.
 (set -x; echo ${BMV2_CPU_PORT} > ${OUT_DIR}/cpu_port.txt)
diff --git a/pipelines/fabric/src/main/resources/fabric.p4 b/pipelines/fabric/src/main/resources/fabric.p4
index 8cb09b0..fede305 100644
--- a/pipelines/fabric/src/main/resources/fabric.p4
+++ b/pipelines/fabric/src/main/resources/fabric.p4
@@ -35,6 +35,10 @@
 #include "include/spgw.p4"
 #endif // WITH_SPGW
 
+#ifdef WITH_BNG
+#include "include/bng.p4"
+#endif // WITH_BNG
+
 #ifdef WITH_INT
 #include "include/int/int_main.p4"
 #endif // WITH_INT
@@ -64,6 +68,9 @@
         spgw_ingress.apply(hdr.gtpu_ipv4, hdr.gtpu_udp, hdr.gtpu,
                            hdr.ipv4, hdr.udp, fabric_metadata, standard_metadata);
 #endif // WITH_SPGW
+#ifdef WITH_BNG
+        bng_ingress.apply(hdr, fabric_metadata, standard_metadata);
+#endif // WITH_BNG
         if (fabric_metadata.skip_forwarding == _FALSE) {
             forwarding.apply(hdr, fabric_metadata, standard_metadata);
         }
@@ -97,6 +104,9 @@
         spgw_egress.apply(hdr.ipv4, hdr.gtpu_ipv4, hdr.gtpu_udp, hdr.gtpu,
                           fabric_metadata, standard_metadata);
 #endif // WITH_SPGW
+#ifdef WITH_BNG
+        bng_egress.apply(hdr, fabric_metadata, standard_metadata);
+#endif // WITH_BNG
 #ifdef WITH_INT
         process_int_main.apply(hdr, fabric_metadata, standard_metadata);
 #endif
diff --git a/pipelines/fabric/src/main/resources/include/bng.p4 b/pipelines/fabric/src/main/resources/include/bng.p4
new file mode 100644
index 0000000..9e56fe4
--- /dev/null
+++ b/pipelines/fabric/src/main/resources/include/bng.p4
@@ -0,0 +1,391 @@
+/*
+ * Copyright 2019-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+ /*
+  * BNG processor implementation. Provides upstream and downstream termination
+  * based on double VLAN tags (s_tag, c_tag) and PPPoE.
+  *
+  * This implementation is based on the P4 Service Edge (p4se) contribution from
+  * Deutsche Telekom:
+  * https://github.com/opencord/p4se
+  */
+
+#ifndef __BNG__
+#define __BNG__
+
+#define BNG_MAX_SUBSC 8192
+#define BNG_MAX_NET_PER_SUBSC 4
+#define BNG_MAX_SUBSC_NET BNG_MAX_NET_PER_SUBSC * BNG_MAX_SUBSC
+
+#define BNG_SUBSC_IPV6_NET_PREFIX_LEN 64
+
+control bng_ingress_upstream(
+        inout parsed_headers_t hdr,
+        inout fabric_metadata_t fmeta,
+        inout standard_metadata_t smeta) {
+
+    counter(BNG_MAX_SUBSC, CounterType.packets) c_terminated;
+    counter(BNG_MAX_SUBSC, CounterType.packets) c_dropped;
+    counter(BNG_MAX_SUBSC, CounterType.packets) c_control;
+
+    vlan_id_t s_tag = hdr.vlan_tag.vlan_id;
+    vlan_id_t c_tag = hdr.inner_vlan_tag.vlan_id;
+
+    // TABLE: t_line_map
+    // Maps double VLAN tags to line ID. Line IDs are used to uniquelly identify
+    // a subscriber.
+
+    action set_line(bit<32> line_id) {
+        fmeta.bng.line_id = line_id;
+    }
+
+    table t_line_map {
+        actions = {
+            @defaultonly nop;
+            set_line;
+        }
+        key = {
+            s_tag: exact @name("s_tag");
+            c_tag: exact @name("c_tag");
+        }
+        size = BNG_MAX_SUBSC;
+        const default_action = nop;
+    }
+
+    // TABLE: t_pppoe_cp
+    // Punt to CPU for PPPeE control packets.
+
+    action punt_to_cpu() {
+        smeta.egress_spec = CPU_PORT;
+        fmeta.skip_forwarding = _TRUE;
+        fmeta.skip_next = _TRUE;
+        c_control.count(fmeta.bng.line_id);
+    }
+
+    table t_pppoe_cp {
+        key = {
+            hdr.pppoe.code     : exact   @name("pppoe_code");
+            hdr.pppoe.protocol : ternary @name("pppoe_protocol");
+        }
+        actions = {
+            punt_to_cpu;
+            @defaultonly nop;
+        }
+        size = 16;
+        const default_action = nop;
+    }
+
+    // TABLE: PPPoE termination for IPv4
+    // Check subscriber IPv4 source address, line_id, and pppoe_session_id
+    // (antispoofing), if line is enabled, pop PPPoE and double VLANs.
+
+    @hidden
+    action term_enabled(bit<16> eth_type) {
+        hdr.ethernet.eth_type = eth_type;
+        fmeta.eth_type = eth_type;
+        hdr.pppoe.setInvalid();
+        hdr.vlan_tag.setInvalid();
+        hdr.inner_vlan_tag.setInvalid();
+        c_terminated.count(fmeta.bng.line_id);
+    }
+
+    action term_disabled() {
+        fmeta.bng.type = BNG_TYPE_INVALID;
+        fmeta.skip_forwarding = _TRUE;
+        fmeta.skip_next = _TRUE;
+        mark_to_drop(smeta);
+        c_dropped.count(fmeta.bng.line_id);
+    }
+
+    action term_enabled_v4() {
+        term_enabled(ETHERTYPE_IPV4);
+    }
+
+    table t_pppoe_term_v4 {
+        key = {
+            fmeta.bng.line_id    : exact @name("line_id");
+            hdr.ipv4.src_addr    : exact @name("ipv4_src");
+            hdr.pppoe.session_id : exact @name("pppoe_session_id");
+        }
+        actions = {
+            term_enabled_v4;
+            @defaultonly term_disabled;
+        }
+        size = BNG_MAX_SUBSC_NET;
+        const default_action = term_disabled;
+    }
+
+#ifdef WITH_IPV6
+    action term_enabled_v6() {
+        term_enabled(ETHERTYPE_IPV6);
+    }
+
+    table t_pppoe_term_v6 {
+        key = {
+            fmeta.bng.line_id         : exact @name("line_id");
+            hdr.ipv6.src_addr[127:64] : exact @name("ipv6_src_net_id");
+            hdr.pppoe.session_id      : exact @name("pppoe_session_id");
+        }
+        actions = {
+            term_enabled_v6;
+            @defaultonly term_disabled;
+        }
+        size = BNG_MAX_SUBSC_NET;
+        const default_action = term_disabled;
+    }
+#endif // WITH_IPV6
+
+    apply {
+        // If table miss, line_id will be 0 (default metadata value).
+        t_line_map.apply();
+
+        if (t_pppoe_cp.apply().hit) {
+            return;
+        }
+
+        if (hdr.ipv4.isValid()) {
+            t_pppoe_term_v4.apply();
+        }
+#ifdef WITH_IPV6
+        else if (hdr.ipv6.isValid()) {
+            t_pppoe_term_v6.apply();
+        }
+#endif // WITH_IPV6
+    }
+}
+
+control bng_ingress_downstream(
+        inout parsed_headers_t hdr,
+        inout fabric_metadata_t fmeta,
+        inout standard_metadata_t smeta) {
+
+    counter(BNG_MAX_SUBSC, CounterType.packets_and_bytes) c_line_rx;
+
+    meter(BNG_MAX_SUBSC, MeterType.bytes) m_besteff;
+    meter(BNG_MAX_SUBSC, MeterType.bytes) m_prio;
+
+    // Downstream line map tables.
+    // Map IP dest address to line ID and next ID. Setting a next ID here
+    // allows to skip the fabric.p4 forwarding stage later.
+
+    @hidden
+    action set_line(bit<32> line_id) {
+        fmeta.bng.type = BNG_TYPE_DOWNSTREAM;
+        fmeta.bng.line_id = line_id;
+        c_line_rx.count(line_id);
+    }
+
+    action set_line_next(bit<32> line_id, next_id_t next_id) {
+        set_line(line_id);
+        fmeta.next_id = next_id;
+        fmeta.skip_forwarding = _TRUE;
+    }
+
+    action set_line_drop(bit<32> line_id) {
+        set_line(line_id);
+        fmeta.skip_forwarding = _TRUE;
+        fmeta.skip_next = _TRUE;
+        mark_to_drop(smeta);
+    }
+
+    table t_line_map_v4 {
+        key = {
+            hdr.ipv4.dst_addr: exact @name("ipv4_dst");
+        }
+        actions = {
+            @defaultonly nop;
+            set_line_next;
+            set_line_drop;
+        }
+        size = BNG_MAX_SUBSC_NET;
+        const default_action = nop;
+    }
+
+#ifdef WITH_IPV6
+    table t_line_map_v6 {
+        key = {
+            hdr.ipv6.dst_addr[127:64]: exact @name("ipv6_dst_net_id");
+        }
+        actions = {
+            @defaultonly nop;
+            set_line_next;
+            set_line_drop;
+        }
+        size = BNG_MAX_SUBSC_NET;
+        const default_action = nop;
+    }
+#endif // WITH_IPV6
+
+    // Downstream QoS tables.
+    // Provide coarse metering before prioritazion in the OLT. By default
+    // everything is tagged and metered as best-effort traffic.
+
+    action qos_prio() {
+        m_prio.execute_meter((bit<32>)fmeta.bng.line_id,
+                             fmeta.bng.ds_meter_result);
+    }
+
+    action qos_besteff() {
+        m_besteff.execute_meter((bit<32>)fmeta.bng.line_id,
+                                fmeta.bng.ds_meter_result);
+    }
+
+    table t_qos_v4 {
+        key = {
+            fmeta.bng.line_id : ternary @name("line_id");
+            hdr.ipv4.src_addr : lpm     @name("ipv4_src");
+            hdr.ipv4.dscp     : ternary @name("ipv4_dscp");
+            hdr.ipv4.ecn      : ternary @name("ipv4_ecn");
+        }
+        actions = {
+            qos_prio;
+            qos_besteff;
+        }
+        size = 256;
+        const default_action = qos_besteff;
+    }
+
+#ifdef WITH_IPV6
+    table t_qos_v6 {
+        key = {
+            fmeta.bng.line_id      : ternary @name("line_id");
+            hdr.ipv6.src_addr      : lpm     @name("ipv6_src");
+            hdr.ipv6.traffic_class : ternary @name("ipv6_traffic_class");
+        }
+        actions = {
+            qos_prio;
+            qos_besteff;
+        }
+        size = 256;
+        const default_action = qos_besteff;
+    }
+#endif // WITH_IPV6
+
+    apply {
+        // IPv4
+        if (hdr.ipv4.isValid()) {
+            if (t_line_map_v4.apply().hit) {
+                // Apply QoS only to subscriber traffic. This makes sense only
+                // if the downstream ports are used to receive IP traffic NOT
+                // destined to subscribers, e.g. to services in the compute
+                // nodes.
+                t_qos_v4.apply();
+            }
+        }
+#ifdef WITH_IPV6
+        // IPv6
+        else if (hdr.ipv6.isValid()) {
+            if (t_line_map_v6.apply().hit) {
+                t_qos_v6.apply();
+            }
+        }
+#endif // WITH_IPV6
+    }
+}
+
+control bng_egress_downstream(
+        inout parsed_headers_t hdr,
+        inout fabric_metadata_t fmeta,
+        inout standard_metadata_t smeta) {
+
+    counter(BNG_MAX_SUBSC, CounterType.packets_and_bytes) c_line_tx;
+
+    @hidden
+    action encap(vlan_id_t c_tag, bit<16> pppoe_session_id) {
+        // s_tag (outer VLAN) should be already set via the next_vlan table.
+        // Here we add c_tag (inner VLAN) and PPPoE.
+        hdr.vlan_tag.eth_type = ETHERTYPE_VLAN;
+        hdr.inner_vlan_tag.setValid();
+        hdr.inner_vlan_tag.vlan_id = c_tag;
+        hdr.inner_vlan_tag.eth_type = ETHERTYPE_PPPOES;
+        hdr.pppoe.setValid();
+        hdr.pppoe.version = 4w1;
+        hdr.pppoe.type_id = 4w1;
+        hdr.pppoe.code = 8w0; // 0 means session stage.
+        hdr.pppoe.session_id = pppoe_session_id;
+        c_line_tx.count(fmeta.bng.line_id);
+    }
+
+    action encap_v4(vlan_id_t c_tag, bit<16> pppoe_session_id) {
+        encap(c_tag, pppoe_session_id);
+        hdr.pppoe.length = hdr.ipv4.total_len + 16w2;
+        hdr.pppoe.protocol = PPPOE_PROTOCOL_IP4;
+    }
+
+#ifdef WITH_IPV6
+    action encap_v6(vlan_id_t c_tag, bit<16> pppoe_session_id) {
+        encap(c_tag, pppoe_session_id);
+        hdr.pppoe.length = hdr.ipv6.payload_len + 16w42;
+        hdr.pppoe.protocol = PPPOE_PROTOCOL_IP6;
+    }
+#endif // WITH_IPV6
+
+    table t_session_encap {
+        key = {
+            fmeta.bng.line_id : exact @name("line_id");
+        }
+        actions = {
+            @defaultonly nop;
+            encap_v4;
+#ifdef WITH_IPV6
+            encap_v6;
+#endif // WITH_IPV6
+        }
+        size = BNG_MAX_SUBSC;
+        const default_action = nop();
+    }
+
+    apply {
+        t_session_encap.apply();
+    }
+}
+
+control bng_ingress(
+        inout parsed_headers_t hdr,
+        inout fabric_metadata_t fmeta,
+        inout standard_metadata_t smeta) {
+
+    bng_ingress_upstream() upstream;
+    bng_ingress_downstream() downstream;
+
+    apply {
+        if (hdr.pppoe.isValid()) {
+            fmeta.bng.type = BNG_TYPE_UPSTREAM;
+            upstream.apply(hdr, fmeta, smeta);
+        }
+        else {
+            // We are not sure the pkt is a BNG downstream one, first we need to
+            // verify the IP dst matches the IP addr of a subscriber...
+            downstream.apply(hdr, fmeta, smeta);
+        }
+    }
+}
+
+control bng_egress(
+        inout parsed_headers_t hdr,
+        inout fabric_metadata_t fmeta,
+        inout standard_metadata_t smeta) {
+
+    bng_egress_downstream() downstream;
+
+    apply {
+        if (fmeta.bng.type == BNG_TYPE_DOWNSTREAM) {
+            downstream.apply(hdr, fmeta, smeta);
+        }
+    }
+}
+
+#endif
diff --git a/pipelines/fabric/src/main/resources/include/define.p4 b/pipelines/fabric/src/main/resources/include/define.p4
index f7a03c3..8f70fb4 100644
--- a/pipelines/fabric/src/main/resources/include/define.p4
+++ b/pipelines/fabric/src/main/resources/include/define.p4
@@ -106,10 +106,15 @@
 const bit<16> ETHERTYPE_QINQ_NON_STD = 0x9100;
 const bit<16> ETHERTYPE_VLAN = 0x8100;
 const bit<16> ETHERTYPE_MPLS = 0x8847;
-const bit<16> ETHERTYPE_MPLS_MULTICAST =0x8848;
+const bit<16> ETHERTYPE_MPLS_MULTICAST = 0x8848;
 const bit<16> ETHERTYPE_IPV4 = 0x0800;
 const bit<16> ETHERTYPE_IPV6 = 0x86dd;
 const bit<16> ETHERTYPE_ARP  = 0x0806;
+const bit<16> ETHERTYPE_PPPOED = 0x8863;
+const bit<16> ETHERTYPE_PPPOES = 0x8864;
+
+const bit<16> PPPOE_PROTOCOL_IP4 = 0x0021;
+const bit<16> PPPOE_PROTOCOL_IP6 = 0x0057;
 
 const bit<8> PROTO_ICMP = 1;
 const bit<8> PROTO_TCP = 6;
diff --git a/pipelines/fabric/src/main/resources/include/header.p4 b/pipelines/fabric/src/main/resources/include/header.p4
index f57e974..5971b38 100644
--- a/pipelines/fabric/src/main/resources/include/header.p4
+++ b/pipelines/fabric/src/main/resources/include/header.p4
@@ -53,6 +53,15 @@
     bit<8> ttl;
 }
 
+header pppoe_t {
+    bit<4>  version;
+    bit<4>  type_id;
+    bit<8>  code;
+    bit<16> session_id;
+    bit<16> length;
+    bit<16> protocol;
+}
+
 header ipv4_t {
     bit<4> version;
     bit<4> ihl;
@@ -140,6 +149,20 @@
 }
 #endif // WITH_SPGW
 
+#ifdef WITH_BNG
+
+typedef bit<2> bng_type_t;
+const bng_type_t BNG_TYPE_INVALID = 2w0x0;
+const bng_type_t BNG_TYPE_UPSTREAM = 2w0x1;
+const bng_type_t BNG_TYPE_DOWNSTREAM = 2w0x2;;
+
+struct bng_meta_t {
+    bit<2>  type; // upstream or downstream
+    bit<32> line_id; // subscriber line
+    bit<32> ds_meter_result; // for downstream metering
+}
+#endif // WITH_BNG
+
 //Custom metadata definition
 struct fabric_metadata_t {
     bit<16>       eth_type;
@@ -162,6 +185,9 @@
 #ifdef WITH_SPGW
     spgw_meta_t   spgw;
 #endif // WITH_SPGW
+#ifdef WITH_BNG
+    bng_meta_t    bng;
+#endif // WITH_BNG
 #ifdef WITH_INT
     int_metadata_t int_meta;
 #endif // WITH_INT
@@ -170,9 +196,12 @@
 struct parsed_headers_t {
     ethernet_t ethernet;
     vlan_tag_t vlan_tag;
-#ifdef WITH_XCONNECT
+#if defined(WITH_XCONNECT) || defined(WITH_BNG)
     vlan_tag_t inner_vlan_tag;
-#endif // WITH_XCONNECT
+#endif // WITH_XCONNECT || WITH_BNG
+#ifdef WITH_BNG
+    pppoe_t pppoe;
+#endif // WITH_BNG
     mpls_t mpls;
 #ifdef WITH_SPGW
     ipv4_t gtpu_ipv4;
diff --git a/pipelines/fabric/src/main/resources/include/parser.p4 b/pipelines/fabric/src/main/resources/include/parser.p4
index 4a2f85c..e0f9fc5 100644
--- a/pipelines/fabric/src/main/resources/include/parser.p4
+++ b/pipelines/fabric/src/main/resources/include/parser.p4
@@ -61,14 +61,14 @@
             ETHERTYPE_IPV6: parse_ipv6;
 #endif // WITH_IPV6
             ETHERTYPE_MPLS: parse_mpls;
-#ifdef WITH_XCONNECT
+#if defined(WITH_XCONNECT) || defined(WITH_BNG)
             ETHERTYPE_VLAN: parse_inner_vlan_tag;
 #endif // WITH_XCONNECT
             default: accept;
         }
     }
 
-#ifdef WITH_XCONNECT
+#if defined(WITH_XCONNECT) || defined(WITH_BNG)
     state parse_inner_vlan_tag {
         packet.extract(hdr.inner_vlan_tag);
         transition select(hdr.inner_vlan_tag.eth_type){
@@ -77,11 +77,28 @@
             ETHERTYPE_IPV6: parse_ipv6;
 #endif // WITH_IPV6
             ETHERTYPE_MPLS: parse_mpls;
+#ifdef WITH_BNG
+            ETHERTYPE_PPPOED: parse_pppoe;
+            ETHERTYPE_PPPOES: parse_pppoe;
+#endif // WITH_BNG
             default: accept;
         }
     }
 #endif // WITH_XCONNECT
 
+#ifdef WITH_BNG
+    state parse_pppoe {
+        packet.extract(hdr.pppoe);
+        transition select(hdr.pppoe.protocol) {
+            PPPOE_PROTOCOL_IP4: parse_ipv4;
+#ifdef WITH_IPV6
+            PPPOE_PROTOCOL_IP6: parse_ipv6;
+#endif // WITH_IPV6
+            default: accept;
+        }
+    }
+#endif // WITH_BNG
+
     state parse_mpls {
         packet.extract(hdr.mpls);
         fabric_metadata.mpls_label = hdr.mpls.label;
@@ -252,9 +269,12 @@
 #endif // WITH_INT_SINK
         packet.emit(hdr.ethernet);
         packet.emit(hdr.vlan_tag);
-#ifdef WITH_XCONNECT
+#if defined(WITH_XCONNECT) || defined(WITH_BNG)
         packet.emit(hdr.inner_vlan_tag);
 #endif // WITH_XCONNECT
+#ifdef WITH_BNG
+        packet.emit(hdr.pppoe);
+#endif // WITH_BNG
         packet.emit(hdr.mpls);
 #ifdef WITH_SPGW
         packet.emit(hdr.gtpu_ipv4);
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
new file mode 100644
index 0000000..3fff434
--- /dev/null
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json
@@ -0,0 +1,6580 @@
+{
+  "header_types" : [
+    {
+      "name" : "scalars_0",
+      "id" : 0,
+      "fields" : [
+        ["tmp_0", 4, false],
+        ["tmp", 32, false],
+        ["tmp_1", 32, false],
+        ["bng_ingress_upstream_tmp", 1, false],
+        ["bng_ingress_downstream_tmp", 1, false],
+        ["bng_ingress_upstream_hasReturned", 1, false],
+        ["egress_next_tmp", 1, false],
+        ["fabric_metadata_t._eth_type0", 16, false],
+        ["fabric_metadata_t._ip_eth_type1", 16, false],
+        ["fabric_metadata_t._vlan_id2", 12, false],
+        ["fabric_metadata_t._vlan_pri3", 3, false],
+        ["fabric_metadata_t._vlan_cfi4", 1, false],
+        ["fabric_metadata_t._mpls_label5", 20, false],
+        ["fabric_metadata_t._mpls_ttl6", 8, false],
+        ["fabric_metadata_t._skip_forwarding7", 1, false],
+        ["fabric_metadata_t._skip_next8", 1, false],
+        ["fabric_metadata_t._fwd_type9", 3, false],
+        ["fabric_metadata_t._next_id10", 32, false],
+        ["fabric_metadata_t._is_multicast11", 1, false],
+        ["fabric_metadata_t._is_controller_packet_out12", 1, false],
+        ["fabric_metadata_t._clone_to_cpu13", 1, false],
+        ["fabric_metadata_t._ip_proto14", 8, false],
+        ["fabric_metadata_t._l4_sport15", 16, false],
+        ["fabric_metadata_t._l4_dport16", 16, false],
+        ["fabric_metadata_t._bng_type17", 2, false],
+        ["fabric_metadata_t._bng_line_id18", 32, false],
+        ["fabric_metadata_t._bng_ds_meter_result19", 32, false],
+        ["_padding_0", 2, false]
+      ]
+    },
+    {
+      "name" : "standard_metadata",
+      "id" : 1,
+      "fields" : [
+        ["ingress_port", 9, false],
+        ["egress_spec", 9, false],
+        ["egress_port", 9, false],
+        ["clone_spec", 32, false],
+        ["instance_type", 32, false],
+        ["drop", 1, false],
+        ["recirculate_port", 16, false],
+        ["packet_length", 32, false],
+        ["enq_timestamp", 32, false],
+        ["enq_qdepth", 19, false],
+        ["deq_timedelta", 32, false],
+        ["deq_qdepth", 19, false],
+        ["ingress_global_timestamp", 48, false],
+        ["egress_global_timestamp", 48, false],
+        ["lf_field_list", 32, false],
+        ["mcast_grp", 16, false],
+        ["resubmit_flag", 32, false],
+        ["egress_rid", 16, false],
+        ["recirculate_flag", 32, false],
+        ["checksum_error", 1, false],
+        ["parser_error", 32, false],
+        ["priority", 3, false],
+        ["_padding", 2, false]
+      ]
+    },
+    {
+      "name" : "ethernet_t",
+      "id" : 2,
+      "fields" : [
+        ["dst_addr", 48, false],
+        ["src_addr", 48, false],
+        ["eth_type", 16, false]
+      ]
+    },
+    {
+      "name" : "vlan_tag_t",
+      "id" : 3,
+      "fields" : [
+        ["pri", 3, false],
+        ["cfi", 1, false],
+        ["vlan_id", 12, false],
+        ["eth_type", 16, false]
+      ]
+    },
+    {
+      "name" : "pppoe_t",
+      "id" : 4,
+      "fields" : [
+        ["version", 4, false],
+        ["type_id", 4, false],
+        ["code", 8, false],
+        ["session_id", 16, false],
+        ["length", 16, false],
+        ["protocol", 16, false]
+      ]
+    },
+    {
+      "name" : "mpls_t",
+      "id" : 5,
+      "fields" : [
+        ["label", 20, false],
+        ["tc", 3, false],
+        ["bos", 1, false],
+        ["ttl", 8, false]
+      ]
+    },
+    {
+      "name" : "ipv4_t",
+      "id" : 6,
+      "fields" : [
+        ["version", 4, false],
+        ["ihl", 4, false],
+        ["dscp", 6, false],
+        ["ecn", 2, false],
+        ["total_len", 16, false],
+        ["identification", 16, false],
+        ["flags", 3, false],
+        ["frag_offset", 13, false],
+        ["ttl", 8, false],
+        ["protocol", 8, false],
+        ["hdr_checksum", 16, false],
+        ["src_addr", 32, false],
+        ["dst_addr", 32, false]
+      ]
+    },
+    {
+      "name" : "tcp_t",
+      "id" : 7,
+      "fields" : [
+        ["sport", 16, false],
+        ["dport", 16, false],
+        ["seq_no", 32, false],
+        ["ack_no", 32, false],
+        ["data_offset", 4, false],
+        ["res", 3, false],
+        ["ecn", 3, false],
+        ["ctrl", 6, false],
+        ["window", 16, false],
+        ["checksum", 16, false],
+        ["urgent_ptr", 16, false]
+      ]
+    },
+    {
+      "name" : "udp_t",
+      "id" : 8,
+      "fields" : [
+        ["sport", 16, false],
+        ["dport", 16, false],
+        ["len", 16, false],
+        ["checksum", 16, false]
+      ]
+    },
+    {
+      "name" : "icmp_t",
+      "id" : 9,
+      "fields" : [
+        ["icmp_type", 8, false],
+        ["icmp_code", 8, false],
+        ["checksum", 16, false],
+        ["identifier", 16, false],
+        ["sequence_number", 16, false],
+        ["timestamp", 64, false]
+      ]
+    },
+    {
+      "name" : "packet_out_header_t",
+      "id" : 10,
+      "fields" : [
+        ["egress_port", 9, false],
+        ["_pad", 7, false]
+      ]
+    },
+    {
+      "name" : "packet_in_header_t",
+      "id" : 11,
+      "fields" : [
+        ["ingress_port", 9, false],
+        ["_pad", 7, false]
+      ]
+    }
+  ],
+  "headers" : [
+    {
+      "name" : "scalars",
+      "id" : 0,
+      "header_type" : "scalars_0",
+      "metadata" : true,
+      "pi_omit" : true
+    },
+    {
+      "name" : "standard_metadata",
+      "id" : 1,
+      "header_type" : "standard_metadata",
+      "metadata" : true,
+      "pi_omit" : true
+    },
+    {
+      "name" : "ethernet",
+      "id" : 2,
+      "header_type" : "ethernet_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "vlan_tag",
+      "id" : 3,
+      "header_type" : "vlan_tag_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "inner_vlan_tag",
+      "id" : 4,
+      "header_type" : "vlan_tag_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "pppoe",
+      "id" : 5,
+      "header_type" : "pppoe_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "mpls",
+      "id" : 6,
+      "header_type" : "mpls_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "ipv4",
+      "id" : 7,
+      "header_type" : "ipv4_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "tcp",
+      "id" : 8,
+      "header_type" : "tcp_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "udp",
+      "id" : 9,
+      "header_type" : "udp_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "icmp",
+      "id" : 10,
+      "header_type" : "icmp_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "packet_out",
+      "id" : 11,
+      "header_type" : "packet_out_header_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "packet_in",
+      "id" : 12,
+      "header_type" : "packet_in_header_t",
+      "metadata" : false,
+      "pi_omit" : true
+    }
+  ],
+  "header_stacks" : [],
+  "header_union_types" : [],
+  "header_unions" : [],
+  "header_union_stacks" : [],
+  "field_lists" : [],
+  "errors" : [
+    ["NoError", 1],
+    ["PacketTooShort", 2],
+    ["NoMatch", 3],
+    ["StackOutOfBounds", 4],
+    ["HeaderTooShort", 5],
+    ["ParserTimeout", 6],
+    ["ParserInvalidArgument", 7]
+  ],
+  "enums" : [],
+  "parsers" : [
+    {
+      "name" : "parser",
+      "id" : 0,
+      "init_state" : "start",
+      "parse_states" : [
+        {
+          "name" : "start",
+          "id" : 0,
+          "parser_ops" : [],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x00ff",
+              "mask" : null,
+              "next_state" : "parse_packet_out"
+            },
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : "parse_ethernet"
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "ingress_port"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_packet_out",
+          "id" : 1,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "packet_out"
+                }
+              ],
+              "op" : "extract"
+            }
+          ],
+          "transitions" : [
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : "parse_ethernet"
+            }
+          ],
+          "transition_key" : []
+        },
+        {
+          "name" : "parse_ethernet",
+          "id" : 2,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "ethernet"
+                }
+              ],
+              "op" : "extract"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t._eth_type0"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["ethernet", "eth_type"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x0ffe"
+                }
+              ],
+              "op" : "set"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x8100",
+              "mask" : null,
+              "next_state" : "parse_vlan_tag"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8847",
+              "mask" : null,
+              "next_state" : "parse_mpls"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800",
+              "mask" : null,
+              "next_state" : "parse_ipv4"
+            },
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_vlan_tag",
+          "id" : 3,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "vlan_tag"
+                }
+              ],
+              "op" : "extract"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x0800",
+              "mask" : null,
+              "next_state" : "parse_ipv4"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8847",
+              "mask" : null,
+              "next_state" : "parse_mpls"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100",
+              "mask" : null,
+              "next_state" : "parse_inner_vlan_tag"
+            },
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_inner_vlan_tag",
+          "id" : 4,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "inner_vlan_tag"
+                }
+              ],
+              "op" : "extract"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x0800",
+              "mask" : null,
+              "next_state" : "parse_ipv4"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8847",
+              "mask" : null,
+              "next_state" : "parse_mpls"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8863",
+              "mask" : null,
+              "next_state" : "parse_pppoe"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8864",
+              "mask" : null,
+              "next_state" : "parse_pppoe"
+            },
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["inner_vlan_tag", "eth_type"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_pppoe",
+          "id" : 5,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "pppoe"
+                }
+              ],
+              "op" : "extract"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x0021",
+              "mask" : null,
+              "next_state" : "parse_ipv4"
+            },
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "protocol"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_mpls",
+          "id" : 6,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "mpls"
+                }
+              ],
+              "op" : "extract"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["mpls", "label"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["mpls", "ttl"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_0"]
+                },
+                {
+                  "type" : "lookahead",
+                  "value" : [0, 4]
+                }
+              ],
+              "op" : "set"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x04",
+              "mask" : null,
+              "next_state" : "parse_ipv4"
+            },
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : "parse_ethernet"
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "tmp_0"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_ipv4",
+          "id" : 7,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "ipv4"
+                }
+              ],
+              "op" : "extract"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["ipv4", "protocol"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type1"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x0800"
+                }
+              ],
+              "op" : "set"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x06",
+              "mask" : null,
+              "next_state" : "parse_tcp"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x11",
+              "mask" : null,
+              "next_state" : "parse_udp"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01",
+              "mask" : null,
+              "next_state" : "parse_icmp"
+            },
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["ipv4", "protocol"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_tcp",
+          "id" : 8,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "tcp"
+                }
+              ],
+              "op" : "extract"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["tcp", "sport"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["tcp", "dport"]
+                }
+              ],
+              "op" : "set"
+            }
+          ],
+          "transitions" : [
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : []
+        },
+        {
+          "name" : "parse_udp",
+          "id" : 9,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "udp"
+                }
+              ],
+              "op" : "extract"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["udp", "sport"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["udp", "dport"]
+                }
+              ],
+              "op" : "set"
+            }
+          ],
+          "transitions" : [
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["udp", "dport"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_icmp",
+          "id" : 10,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "icmp"
+                }
+              ],
+              "op" : "extract"
+            }
+          ],
+          "transitions" : [
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : []
+        }
+      ]
+    }
+  ],
+  "parse_vsets" : [],
+  "deparsers" : [
+    {
+      "name" : "deparser",
+      "id" : 0,
+      "source_info" : {
+        "filename" : "include/parser.p4",
+        "line" : 260,
+        "column" : 8,
+        "source_fragment" : "FabricDeparser"
+      },
+      "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "pppoe", "mpls", "ipv4", "tcp", "udp", "icmp"]
+    }
+  ],
+  "meter_arrays" : [
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.m_besteff",
+      "id" : 0,
+      "source_info" : {
+        "filename" : "include/bng.p4",
+        "line" : 176,
+        "column" : 33,
+        "source_fragment" : "m_besteff"
+      },
+      "is_direct" : false,
+      "size" : 8192,
+      "rate_count" : 2,
+      "type" : "bytes"
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.m_prio",
+      "id" : 1,
+      "source_info" : {
+        "filename" : "include/bng.p4",
+        "line" : 177,
+        "column" : 33,
+        "source_fragment" : "m_prio"
+      },
+      "is_direct" : false,
+      "size" : 8192,
+      "rate_count" : 2,
+      "type" : "bytes"
+    }
+  ],
+  "counter_arrays" : [
+    {
+      "name" : "FabricIngress.bng_ingress.upstream.c_terminated",
+      "id" : 0,
+      "source_info" : {
+        "filename" : "include/bng.p4",
+        "line" : 40,
+        "column" : 39,
+        "source_fragment" : "c_terminated"
+      },
+      "size" : 8192,
+      "is_direct" : false
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.upstream.c_dropped",
+      "id" : 1,
+      "source_info" : {
+        "filename" : "include/bng.p4",
+        "line" : 41,
+        "column" : 39,
+        "source_fragment" : "c_dropped"
+      },
+      "size" : 8192,
+      "is_direct" : false
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.upstream.c_control",
+      "id" : 2,
+      "source_info" : {
+        "filename" : "include/bng.p4",
+        "line" : 42,
+        "column" : 39,
+        "source_fragment" : "c_control"
+      },
+      "size" : 8192,
+      "is_direct" : false
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.c_line_rx",
+      "id" : 3,
+      "source_info" : {
+        "filename" : "include/bng.p4",
+        "line" : 174,
+        "column" : 49,
+        "source_fragment" : "c_line_rx"
+      },
+      "size" : 8192,
+      "is_direct" : false
+    },
+    {
+      "name" : "FabricIngress.filtering.ingress_port_vlan_counter",
+      "id" : 4,
+      "is_direct" : true,
+      "binding" : "FabricIngress.filtering.ingress_port_vlan",
+      "source_info" : {
+        "filename" : "include/control/filtering.p4",
+        "line" : 31,
+        "column" : 50,
+        "source_fragment" : "ingress_port_vlan_counter"
+      }
+    },
+    {
+      "name" : "FabricIngress.filtering.fwd_classifier_counter",
+      "id" : 5,
+      "is_direct" : true,
+      "binding" : "FabricIngress.filtering.fwd_classifier",
+      "source_info" : {
+        "filename" : "include/control/filtering.p4",
+        "line" : 80,
+        "column" : 50,
+        "source_fragment" : "fwd_classifier_counter"
+      }
+    },
+    {
+      "name" : "FabricIngress.forwarding.bridging_counter",
+      "id" : 6,
+      "is_direct" : true,
+      "binding" : "FabricIngress.forwarding.bridging",
+      "source_info" : {
+        "filename" : "include/control/forwarding.p4",
+        "line" : 36,
+        "column" : 50,
+        "source_fragment" : "bridging_counter"
+      }
+    },
+    {
+      "name" : "FabricIngress.forwarding.mpls_counter",
+      "id" : 7,
+      "is_direct" : true,
+      "binding" : "FabricIngress.forwarding.mpls",
+      "source_info" : {
+        "filename" : "include/control/forwarding.p4",
+        "line" : 63,
+        "column" : 50,
+        "source_fragment" : "mpls_counter"
+      }
+    },
+    {
+      "name" : "FabricIngress.forwarding.routing_v4_counter",
+      "id" : 8,
+      "is_direct" : true,
+      "binding" : "FabricIngress.forwarding.routing_v4",
+      "source_info" : {
+        "filename" : "include/control/forwarding.p4",
+        "line" : 87,
+        "column" : 50,
+        "source_fragment" : "routing_v4_counter"
+      }
+    },
+    {
+      "name" : "FabricIngress.acl.acl_counter",
+      "id" : 9,
+      "is_direct" : true,
+      "binding" : "FabricIngress.acl.acl",
+      "source_info" : {
+        "filename" : "include/control/acl.p4",
+        "line" : 30,
+        "column" : 50,
+        "source_fragment" : "acl_counter"
+      }
+    },
+    {
+      "name" : "FabricIngress.next.next_vlan_counter",
+      "id" : 10,
+      "is_direct" : true,
+      "binding" : "FabricIngress.next.next_vlan",
+      "source_info" : {
+        "filename" : "include/control/next.p4",
+        "line" : 67,
+        "column" : 50,
+        "source_fragment" : "next_vlan_counter"
+      }
+    },
+    {
+      "name" : "FabricIngress.next.xconnect_counter",
+      "id" : 11,
+      "is_direct" : true,
+      "binding" : "FabricIngress.next.xconnect",
+      "source_info" : {
+        "filename" : "include/control/next.p4",
+        "line" : 92,
+        "column" : 50,
+        "source_fragment" : "xconnect_counter"
+      }
+    },
+    {
+      "name" : "FabricIngress.next.hashed_counter",
+      "id" : 12,
+      "is_direct" : true,
+      "binding" : "FabricIngress.next.hashed",
+      "source_info" : {
+        "filename" : "include/control/next.p4",
+        "line" : 166,
+        "column" : 50,
+        "source_fragment" : "hashed_counter"
+      }
+    },
+    {
+      "name" : "FabricIngress.next.multicast_counter",
+      "id" : 13,
+      "is_direct" : true,
+      "binding" : "FabricIngress.next.multicast",
+      "source_info" : {
+        "filename" : "include/control/next.p4",
+        "line" : 210,
+        "column" : 50,
+        "source_fragment" : "multicast_counter"
+      }
+    },
+    {
+      "name" : "FabricIngress.port_counters_control.egress_port_counter",
+      "id" : 14,
+      "source_info" : {
+        "filename" : "include/control/port_counter.p4",
+        "line" : 26,
+        "column" : 48,
+        "source_fragment" : "egress_port_counter"
+      },
+      "size" : 511,
+      "is_direct" : false
+    },
+    {
+      "name" : "FabricIngress.port_counters_control.ingress_port_counter",
+      "id" : 15,
+      "source_info" : {
+        "filename" : "include/control/port_counter.p4",
+        "line" : 27,
+        "column" : 48,
+        "source_fragment" : "ingress_port_counter"
+      },
+      "size" : 511,
+      "is_direct" : false
+    },
+    {
+      "name" : "FabricEgress.bng_egress.downstream.c_line_tx",
+      "id" : 16,
+      "source_info" : {
+        "filename" : "include/bng.p4",
+        "line" : 305,
+        "column" : 49,
+        "source_fragment" : "c_line_tx"
+      },
+      "size" : 8192,
+      "is_direct" : false
+    },
+    {
+      "name" : "FabricEgress.egress_next.egress_vlan_counter",
+      "id" : 17,
+      "is_direct" : true,
+      "binding" : "FabricEgress.egress_next.egress_vlan",
+      "source_info" : {
+        "filename" : "include/control/next.p4",
+        "line" : 283,
+        "column" : 50,
+        "source_fragment" : "egress_vlan_counter"
+      }
+    }
+  ],
+  "register_arrays" : [],
+  "calculations" : [
+    {
+      "name" : "calc",
+      "id" : 0,
+      "source_info" : {
+        "filename" : "include/checksum.p4",
+        "line" : 28,
+        "column" : 8,
+        "source_fragment" : "update_checksum(hdr.ipv4.isValid(), ..."
+      },
+      "algo" : "csum16",
+      "input" : [
+        {
+          "type" : "field",
+          "value" : ["ipv4", "version"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "ihl"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "dscp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "ecn"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "total_len"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "identification"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "flags"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "frag_offset"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "ttl"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "protocol"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "src_addr"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "dst_addr"]
+        }
+      ]
+    },
+    {
+      "name" : "calc_0",
+      "id" : 1,
+      "source_info" : {
+        "filename" : "include/checksum.p4",
+        "line" : 57,
+        "column" : 8,
+        "source_fragment" : "verify_checksum(hdr.ipv4.isValid(), ..."
+      },
+      "algo" : "csum16",
+      "input" : [
+        {
+          "type" : "field",
+          "value" : ["ipv4", "version"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "ihl"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "dscp"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "ecn"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "total_len"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "identification"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "flags"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "frag_offset"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "ttl"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "protocol"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "src_addr"]
+        },
+        {
+          "type" : "field",
+          "value" : ["ipv4", "dst_addr"]
+        }
+      ]
+    }
+  ],
+  "learn_lists" : [],
+  "actions" : [
+    {
+      "name" : "nop",
+      "id" : 0,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 1,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 2,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 3,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 4,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 5,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 6,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 7,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 8,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 9,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.upstream.set_line",
+      "id" : 10,
+      "runtime_data" : [
+        {
+          "name" : "line_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 52,
+            "column" : 26,
+            "source_fragment" : "= line_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.upstream.punt_to_cpu",
+      "id" : 11,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00ff"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 72,
+            "column" : 8,
+            "source_fragment" : "smeta.egress_spec = 255"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 73,
+            "column" : 30,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 74,
+            "column" : 24,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.bng_ingress.upstream.c_control"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "c_control.count(fmeta.bng.line_id)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.upstream.term_disabled",
+      "id" : 12,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_type17"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../header.p4",
+            "line" : 155,
+            "column" : 36,
+            "source_fragment" : "2w0x0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 107,
+            "column" : 30,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 108,
+            "column" : 24,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "mark_to_drop",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "standard_metadata"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 109,
+            "column" : 8,
+            "source_fragment" : "mark_to_drop(smeta)"
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.bng_ingress.upstream.c_dropped"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 110,
+            "column" : 8,
+            "source_fragment" : "c_dropped.count(fmeta.bng.line_id)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.upstream.term_enabled_v4",
+      "id" : 13,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 110,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 110,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "pppoe"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 99,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 100,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 101,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_vlan_tag.setInvalid()"
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.bng_ingress.upstream.c_terminated"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 102,
+            "column" : 8,
+            "source_fragment" : "c_terminated.count(fmeta.bng.line_id)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.set_line_next",
+      "id" : 14,
+      "runtime_data" : [
+        {
+          "name" : "line_id",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_type17"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x02"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../header.p4",
+            "line" : 157,
+            "column" : 39,
+            "source_fragment" : "2w0x2;; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 186,
+            "column" : 26,
+            "source_fragment" : "= line_id; ..."
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.bng_ingress.downstream.c_line_rx"
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 187,
+            "column" : 8,
+            "source_fragment" : "c_line_rx.count(line_id)"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 192,
+            "column" : 22,
+            "source_fragment" : "= next_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 193,
+            "column" : 30,
+            "source_fragment" : "= true; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.set_line_drop",
+      "id" : 15,
+      "runtime_data" : [
+        {
+          "name" : "line_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_type17"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x02"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../header.p4",
+            "line" : 157,
+            "column" : 39,
+            "source_fragment" : "2w0x2;; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 186,
+            "column" : 26,
+            "source_fragment" : "= line_id; ..."
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.bng_ingress.downstream.c_line_rx"
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 187,
+            "column" : 8,
+            "source_fragment" : "c_line_rx.count(line_id)"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 198,
+            "column" : 30,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 199,
+            "column" : 24,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "mark_to_drop",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "standard_metadata"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 200,
+            "column" : 8,
+            "source_fragment" : "mark_to_drop(smeta)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.qos_prio",
+      "id" : 16,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "execute_meter",
+          "parameters" : [
+            {
+              "type" : "meter_array",
+              "value" : "FabricIngress.bng_ingress.downstream.m_prio"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result19"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 238,
+            "column" : 8,
+            "source_fragment" : "m_prio.execute_meter((bit<32>)fmeta.bng.line_id, ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
+      "id" : 17,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "execute_meter",
+          "parameters" : [
+            {
+              "type" : "meter_array",
+              "value" : "FabricIngress.bng_ingress.downstream.m_besteff"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result19"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 243,
+            "column" : 8,
+            "source_fragment" : "m_besteff.execute_meter((bit<32>)fmeta.bng.line_id, ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.filtering.deny",
+      "id" : 18,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 36,
+            "column" : 40,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 37,
+            "column" : 34,
+            "source_fragment" : "= true; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.filtering.permit",
+      "id" : 19,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.filtering.permit_with_internal_vlan",
+      "id" : 20,
+      "runtime_data" : [
+        {
+          "name" : "vlan_id",
+          "bitwidth" : 12
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 47,
+            "column" : 32,
+            "source_fragment" : "= vlan_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.filtering.set_forwarding_type",
+      "id" : 21,
+      "runtime_data" : [
+        {
+          "name" : "fwd_type",
+          "bitwidth" : 3
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 83,
+            "column" : 33,
+            "source_fragment" : "= fwd_type; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.forwarding.set_next_id_bridging",
+      "id" : 22,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 30,
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.forwarding.pop_mpls_and_next",
+      "id" : 23,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 66,
+            "column" : 35,
+            "source_fragment" : "= 0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 30,
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
+      "id" : 24,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 30,
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.forwarding.nop_routing_v4",
+      "id" : 25,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.acl.set_next_id_acl",
+      "id" : 26,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/acl.p4",
+            "line" : 33,
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.acl.punt_to_cpu",
+      "id" : 27,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00ff"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/acl.p4",
+            "line" : 39,
+            "column" : 8,
+            "source_fragment" : "standard_metadata.egress_spec = 255"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/acl.p4",
+            "line" : 40,
+            "column" : 34,
+            "source_fragment" : "= true; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.acl.clone_to_cpu",
+      "id" : 28,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/acl.p4",
+            "line" : 46,
+            "column" : 37,
+            "source_fragment" : "= true; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.acl.drop",
+      "id" : 29,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "mark_to_drop",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "standard_metadata"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/acl.p4",
+            "line" : 51,
+            "column" : 8,
+            "source_fragment" : "mark_to_drop(standard_metadata)"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/acl.p4",
+            "line" : 52,
+            "column" : 34,
+            "source_fragment" : "= true; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.acl.nop_acl",
+      "id" : 30,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.next.set_vlan",
+      "id" : 31,
+      "runtime_data" : [
+        {
+          "name" : "vlan_id",
+          "bitwidth" : 12
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 70,
+            "column" : 32,
+            "source_fragment" : "= vlan_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_xconnect",
+      "id" : 32,
+      "runtime_data" : [
+        {
+          "name" : "port_num",
+          "bitwidth" : 9
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 31,
+            "column" : 5,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.set_next_id_xconnect",
+      "id" : 33,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 100,
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_hashed",
+      "id" : 34,
+      "runtime_data" : [
+        {
+          "name" : "port_num",
+          "bitwidth" : 9
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 31,
+            "column" : 5,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.routing_hashed",
+      "id" : 35,
+      "runtime_data" : [
+        {
+          "name" : "port_num",
+          "bitwidth" : 9
+        },
+        {
+          "name" : "smac",
+          "bitwidth" : 48
+        },
+        {
+          "name" : "dmac",
+          "bitwidth" : 48
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "src_addr"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 36,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "dst_addr"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 2
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 31,
+            "column" : 5,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.mpls_routing_hashed",
+      "id" : 36,
+      "runtime_data" : [
+        {
+          "name" : "port_num",
+          "bitwidth" : 9
+        },
+        {
+          "name" : "smac",
+          "bitwidth" : 48
+        },
+        {
+          "name" : "dmac",
+          "bitwidth" : 48
+        },
+        {
+          "name" : "label",
+          "bitwidth" : 20
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 46,
+            "column" : 35,
+            "source_fragment" : "= label; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "src_addr"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 36,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "dst_addr"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 2
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 31,
+            "column" : 5,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.set_mcast_group_id",
+      "id" : 37,
+      "runtime_data" : [
+        {
+          "name" : "group_id",
+          "bitwidth" : 16
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "mcast_grp"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 213,
+            "column" : 8,
+            "source_fragment" : "standard_metadata.mcast_grp = group_id"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 214,
+            "column" : 37,
+            "source_fragment" : "= true; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act",
+      "id" : 38,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "field",
+              "value" : ["packet_out", "egress_port"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 25,
+            "column" : 12,
+            "source_fragment" : "standard_metadata.egress_spec = hdr.packet_out.egress_port"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "packet_out"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 26,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_out.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out12"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 27,
+            "column" : 53,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "exit",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 29,
+            "column" : 12,
+            "source_fragment" : "exit"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_0",
+      "id" : 39,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 105,
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.eth_type; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "vlan_id"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 106,
+            "column" : 36,
+            "source_fragment" : "= hdr.vlan_tag.vlan_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._vlan_pri3"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "pri"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 107,
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.pri; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._vlan_cfi4"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "cfi"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 108,
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.cfi; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_1",
+      "id" : 40,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x41"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 115,
+            "column" : 37,
+            "source_fragment" : "= DEFAULT_MPLS_TTL + 1; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_2",
+      "id" : 41,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_type17"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../header.p4",
+            "line" : 156,
+            "column" : 37,
+            "source_fragment" : "2w0x1; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "bng_ingress_upstream_hasReturned"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_3",
+      "id" : 42,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "bng_ingress_upstream_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_4",
+      "id" : 43,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "bng_ingress_upstream_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_5",
+      "id" : 44,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "bng_ingress_upstream_hasReturned"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 155,
+            "column" : 12,
+            "source_fragment" : "return"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_6",
+      "id" : 45,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "bng_ingress_downstream_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_7",
+      "id" : 46,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "bng_ingress_downstream_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_8",
+      "id" : 47,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_spec"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 31,
+            "column" : 38,
+            "source_fragment" : "(bit<32>)standard_metadata.egress_spec"
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.port_counters_control.egress_port_counter"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "tmp"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 31,
+            "column" : 12,
+            "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_9",
+      "id" : 48,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "tmp_1"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 34,
+            "column" : 39,
+            "source_fragment" : "(bit<32>)standard_metadata.ingress_port"
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.port_counters_control.ingress_port_counter"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "tmp_1"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 34,
+            "column" : 12,
+            "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "nop",
+      "id" : 49,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 50,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricEgress.bng_egress.downstream.encap_v4",
+      "id" : 51,
+      "runtime_data" : [
+        {
+          "name" : "c_tag",
+          "bitwidth" : 12
+        },
+        {
+          "name" : "pppoe_session_id",
+          "bitwidth" : 16
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 107,
+            "column" : 31,
+            "source_fragment" : "0x8100; ..."
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 312,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_vlan_tag.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["inner_vlan_tag", "vlan_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 313,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_vlan_tag.vlan_id = c_tag; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["inner_vlan_tag", "eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8864"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 114,
+            "column" : 33,
+            "source_fragment" : "0x8864; ..."
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "pppoe"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 315,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "version"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 316,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.version = 4w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "type_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 317,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.type_id = 4w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "code"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 318,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.code = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "session_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 319,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.session_id = pppoe_session_id; ..."
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricEgress.bng_egress.downstream.c_line_tx"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id18"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 320,
+            "column" : 8,
+            "source_fragment" : "c_line_tx.count(fmeta.bng.line_id)"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "length"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["ipv4", "total_len"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0002"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 325,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.length = hdr.ipv4.total_len + 16w2"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "protocol"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0021"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 116,
+            "column" : 35,
+            "source_fragment" : "0x0021; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.pop_mpls_if_present",
+      "id" : 52,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "mpls"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 252,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.setInvalid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type1"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 254,
+            "column" : 33,
+            "source_fragment" : "= fabric_metadata.ip_eth_type; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.set_mpls",
+      "id" : 53,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "mpls"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 259,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "label"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 260,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "tc"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 261,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.tc = 3w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "bos"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 262,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.bos = 1w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 263,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl; // Decrement after push. ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8847"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 108,
+            "column" : 31,
+            "source_fragment" : "0x8847; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.push_vlan",
+      "id" : 54,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 271,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "cfi"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._vlan_cfi4"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 272,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "pri"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._vlan_pri3"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 273,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 274,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "vlan_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 275,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 107,
+            "column" : 31,
+            "source_fragment" : "0x8100; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.pop_vlan",
+      "id" : 55,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 286,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type; ..."
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 287,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_10",
+      "id" : 56,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "exit",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 41,
+            "column" : 12,
+            "source_fragment" : "exit"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_11",
+      "id" : 57,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "mark_to_drop",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "standard_metadata"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 47,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop(standard_metadata)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_12",
+      "id" : 58,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "packet_in"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 49,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_in.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["packet_in", "ingress_port"]
+            },
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "ingress_port"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 50,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
+          }
+        },
+        {
+          "op" : "exit",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 52,
+            "column" : 12,
+            "source_fragment" : "exit"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_13",
+      "id" : 59,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "mark_to_drop",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "standard_metadata"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 308,
+            "column" : 12,
+            "source_fragment" : "mark_to_drop(standard_metadata)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_14",
+      "id" : 60,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "egress_next_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_15",
+      "id" : 61,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "egress_next_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_16",
+      "id" : 62,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "mark_to_drop",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "standard_metadata"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 327,
+            "column" : 35,
+            "source_fragment" : "mark_to_drop(standard_metadata)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_17",
+      "id" : 63,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["mpls", "ttl"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 326,
+            "column" : 12,
+            "source_fragment" : "hdr.mpls.ttl = hdr.mpls.ttl - 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_18",
+      "id" : 64,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "mark_to_drop",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "standard_metadata"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 331,
+            "column" : 39,
+            "source_fragment" : "mark_to_drop(standard_metadata)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_19",
+      "id" : 65,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ipv4", "ttl"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["ipv4", "ttl"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 330,
+            "column" : 16,
+            "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
+          }
+        }
+      ]
+    }
+  ],
+  "pipelines" : [
+    {
+      "name" : "ingress",
+      "id" : 0,
+      "source_info" : {
+        "filename" : "fabric.p4",
+        "line" : 46,
+        "column" : 8,
+        "source_fragment" : "FabricIngress"
+      },
+      "init_table" : "node_2",
+      "tables" : [
+        {
+          "name" : "tbl_act",
+          "id" : 0,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 25,
+            "column" : 42,
+            "source_fragment" : "= hdr.packet_out.egress_port; ..."
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [38],
+          "actions" : ["act"],
+          "base_default_next" : "node_4",
+          "next_tables" : {
+            "act" : "node_4"
+          },
+          "default_entry" : {
+            "action_id" : 38,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_0",
+          "id" : 1,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 105,
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.eth_type; ..."
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [39],
+          "actions" : ["act_0"],
+          "base_default_next" : "node_6",
+          "next_tables" : {
+            "act_0" : "node_6"
+          },
+          "default_entry" : {
+            "action_id" : 39,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_1",
+          "id" : 2,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 115,
+            "column" : 37,
+            "source_fragment" : "="
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [40],
+          "actions" : ["act_1"],
+          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
+          "next_tables" : {
+            "act_1" : "FabricIngress.filtering.ingress_port_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 40,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.filtering.ingress_port_vlan",
+          "id" : 3,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 51,
+            "column" : 10,
+            "source_fragment" : "ingress_port_vlan"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "vlan_is_valid",
+              "target" : ["vlan_tag", "$valid$"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "vlan_id",
+              "target" : ["vlan_tag", "vlan_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [18, 19, 20],
+          "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
+          "base_default_next" : "FabricIngress.filtering.fwd_classifier",
+          "next_tables" : {
+            "FabricIngress.filtering.deny" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.permit" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
+          },
+          "default_entry" : {
+            "action_id" : 18,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.filtering.fwd_classifier",
+          "id" : 4,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 87,
+            "column" : 10,
+            "source_fragment" : "fwd_classifier"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "eth_dst",
+              "target" : ["ethernet", "dst_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "eth_type",
+              "target" : ["scalars", "fabric_metadata_t._eth_type0"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [21],
+          "actions" : ["FabricIngress.filtering.set_forwarding_type"],
+          "base_default_next" : "node_10",
+          "next_tables" : {
+            "FabricIngress.filtering.set_forwarding_type" : "node_10"
+          },
+          "default_entry" : {
+            "action_id" : 21,
+            "action_const" : true,
+            "action_data" : ["0x0"],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_2",
+          "id" : 5,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 367,
+            "column" : 27,
+            "source_fragment" : "="
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [41],
+          "actions" : ["act_2"],
+          "base_default_next" : "FabricIngress.bng_ingress.upstream.t_line_map",
+          "next_tables" : {
+            "act_2" : "FabricIngress.bng_ingress.upstream.t_line_map"
+          },
+          "default_entry" : {
+            "action_id" : 41,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.bng_ingress.upstream.t_line_map",
+          "id" : 6,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 55,
+            "column" : 10,
+            "source_fragment" : "t_line_map"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "s_tag",
+              "target" : ["vlan_tag", "vlan_id"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "c_tag",
+              "target" : ["inner_vlan_tag", "vlan_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 8192,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [0, 10],
+          "actions" : ["nop", "FabricIngress.bng_ingress.upstream.set_line"],
+          "base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
+          "next_tables" : {
+            "nop" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
+            "FabricIngress.bng_ingress.upstream.set_line" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
+          },
+          "default_entry" : {
+            "action_id" : 0,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
+          "id" : 7,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 78,
+            "column" : 10,
+            "source_fragment" : "t_pppoe_cp"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "pppoe_code",
+              "target" : ["pppoe", "code"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "pppoe_protocol",
+              "target" : ["pppoe", "protocol"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 16,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [11, 1],
+          "actions" : ["FabricIngress.bng_ingress.upstream.punt_to_cpu", "nop"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "__HIT__" : "tbl_act_3",
+            "__MISS__" : "tbl_act_4"
+          },
+          "default_entry" : {
+            "action_id" : 1,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_3",
+          "id" : 8,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [42],
+          "actions" : ["act_3"],
+          "base_default_next" : "node_16",
+          "next_tables" : {
+            "act_3" : "node_16"
+          },
+          "default_entry" : {
+            "action_id" : 42,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_4",
+          "id" : 9,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [43],
+          "actions" : ["act_4"],
+          "base_default_next" : "node_16",
+          "next_tables" : {
+            "act_4" : "node_16"
+          },
+          "default_entry" : {
+            "action_id" : 43,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_5",
+          "id" : 10,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 155,
+            "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" : [44],
+          "actions" : ["act_5"],
+          "base_default_next" : "node_18",
+          "next_tables" : {
+            "act_5" : "node_18"
+          },
+          "default_entry" : {
+            "action_id" : 44,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4",
+          "id" : 11,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 117,
+            "column" : 10,
+            "source_fragment" : "t_pppoe_term_v4"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "line_id",
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id18"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "ipv4_src",
+              "target" : ["ipv4", "src_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "pppoe_session_id",
+              "target" : ["pppoe", "session_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 32768,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [13, 12],
+          "actions" : ["FabricIngress.bng_ingress.upstream.term_enabled_v4", "FabricIngress.bng_ingress.upstream.term_disabled"],
+          "base_default_next" : "node_27",
+          "next_tables" : {
+            "FabricIngress.bng_ingress.upstream.term_enabled_v4" : "node_27",
+            "FabricIngress.bng_ingress.upstream.term_disabled" : "node_27"
+          },
+          "default_entry" : {
+            "action_id" : 12,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.bng_ingress.downstream.t_line_map_v4",
+          "id" : 12,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 203,
+            "column" : 10,
+            "source_fragment" : "t_line_map_v4"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ipv4_dst",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 32768,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [2, 14, 15],
+          "actions" : ["nop", "FabricIngress.bng_ingress.downstream.set_line_next", "FabricIngress.bng_ingress.downstream.set_line_drop"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "__HIT__" : "tbl_act_6",
+            "__MISS__" : "tbl_act_7"
+          },
+          "default_entry" : {
+            "action_id" : 2,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_6",
+          "id" : 13,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [45],
+          "actions" : ["act_6"],
+          "base_default_next" : "node_25",
+          "next_tables" : {
+            "act_6" : "node_25"
+          },
+          "default_entry" : {
+            "action_id" : 45,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_7",
+          "id" : 14,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [46],
+          "actions" : ["act_7"],
+          "base_default_next" : "node_25",
+          "next_tables" : {
+            "act_7" : "node_25"
+          },
+          "default_entry" : {
+            "action_id" : 46,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.bng_ingress.downstream.t_qos_v4",
+          "id" : 15,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 247,
+            "column" : 10,
+            "source_fragment" : "t_qos_v4"
+          },
+          "key" : [
+            {
+              "match_type" : "ternary",
+              "name" : "line_id",
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id18"],
+              "mask" : null
+            },
+            {
+              "match_type" : "lpm",
+              "name" : "ipv4_src",
+              "target" : ["ipv4", "src_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "ipv4_dscp",
+              "target" : ["ipv4", "dscp"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "ipv4_ecn",
+              "target" : ["ipv4", "ecn"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 256,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [16, 17],
+          "actions" : ["FabricIngress.bng_ingress.downstream.qos_prio", "FabricIngress.bng_ingress.downstream.qos_besteff"],
+          "base_default_next" : "node_27",
+          "next_tables" : {
+            "FabricIngress.bng_ingress.downstream.qos_prio" : "node_27",
+            "FabricIngress.bng_ingress.downstream.qos_besteff" : "node_27"
+          },
+          "default_entry" : {
+            "action_id" : 17,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.forwarding.bridging",
+          "id" : 16,
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 46,
+            "column" : 10,
+            "source_fragment" : "bridging"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "vlan_id",
+              "target" : ["scalars", "fabric_metadata_t._vlan_id2"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "eth_dst",
+              "target" : ["ethernet", "dst_addr"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [22, 3],
+          "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
+          "next_tables" : {
+            "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
+          },
+          "default_entry" : {
+            "action_id" : 3,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.forwarding.mpls",
+          "id" : 17,
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 71,
+            "column" : 10,
+            "source_fragment" : "mpls"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "mpls_label",
+              "target" : ["scalars", "fabric_metadata_t._mpls_label5"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [23, 4],
+          "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
+          "next_tables" : {
+            "FabricIngress.forwarding.pop_mpls_and_next" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
+          },
+          "default_entry" : {
+            "action_id" : 4,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.forwarding.routing_v4",
+          "id" : 18,
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 101,
+            "column" : 10,
+            "source_fragment" : "routing_v4"
+          },
+          "key" : [
+            {
+              "match_type" : "lpm",
+              "name" : "ipv4_dst",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "lpm",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [24, 25, 5],
+          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
+          "next_tables" : {
+            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.acl.acl",
+            "FabricIngress.forwarding.nop_routing_v4" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
+          },
+          "default_entry" : {
+            "action_id" : 5,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.acl.acl",
+          "id" : 19,
+          "source_info" : {
+            "filename" : "include/control/acl.p4",
+            "line" : 60,
+            "column" : 10,
+            "source_fragment" : "acl"
+          },
+          "key" : [
+            {
+              "match_type" : "ternary",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "ip_proto",
+              "target" : ["scalars", "fabric_metadata_t._ip_proto14"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "l4_sport",
+              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "l4_dport",
+              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "eth_src",
+              "target" : ["ethernet", "dst_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "eth_dst",
+              "target" : ["ethernet", "src_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "vlan_id",
+              "target" : ["vlan_tag", "vlan_id"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "eth_type",
+              "target" : ["scalars", "fabric_metadata_t._eth_type0"],
+              "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" : "icmp_type",
+              "target" : ["icmp", "icmp_type"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "icmp_code",
+              "target" : ["icmp", "icmp_code"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [26, 27, 28, 29, 30],
+          "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.clone_to_cpu", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
+          "base_default_next" : "node_35",
+          "next_tables" : {
+            "FabricIngress.acl.set_next_id_acl" : "node_35",
+            "FabricIngress.acl.punt_to_cpu" : "node_35",
+            "FabricIngress.acl.clone_to_cpu" : "node_35",
+            "FabricIngress.acl.drop" : "node_35",
+            "FabricIngress.acl.nop_acl" : "node_35"
+          },
+          "default_entry" : {
+            "action_id" : 30,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.xconnect",
+          "id" : 20,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 104,
+            "column" : 10,
+            "source_fragment" : "xconnect"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [32, 33, 7],
+          "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
+          "base_default_next" : "FabricIngress.next.hashed",
+          "next_tables" : {
+            "FabricIngress.next.output_xconnect" : "FabricIngress.next.hashed",
+            "FabricIngress.next.set_next_id_xconnect" : "FabricIngress.next.hashed",
+            "nop" : "FabricIngress.next.hashed"
+          },
+          "default_entry" : {
+            "action_id" : 7,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.hashed",
+          "id" : 21,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 184,
+            "column" : 10,
+            "source_fragment" : "hashed"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "indirect_ws",
+          "action_profile" : "FabricIngress.next.hashed_selector",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [34, 35, 36, 8],
+          "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
+          "base_default_next" : "FabricIngress.next.multicast",
+          "next_tables" : {
+            "FabricIngress.next.output_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.routing_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.mpls_routing_hashed" : "FabricIngress.next.multicast",
+            "nop" : "FabricIngress.next.multicast"
+          }
+        },
+        {
+          "name" : "FabricIngress.next.multicast",
+          "id" : 22,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 218,
+            "column" : 10,
+            "source_fragment" : "multicast"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [37, 9],
+          "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
+          "base_default_next" : "FabricIngress.next.next_vlan",
+          "next_tables" : {
+            "FabricIngress.next.set_mcast_group_id" : "FabricIngress.next.next_vlan",
+            "nop" : "FabricIngress.next.next_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 9,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.next_vlan",
+          "id" : 23,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 74,
+            "column" : 10,
+            "source_fragment" : "next_vlan"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [31, 6],
+          "actions" : ["FabricIngress.next.set_vlan", "nop"],
+          "base_default_next" : "node_40",
+          "next_tables" : {
+            "FabricIngress.next.set_vlan" : "node_40",
+            "nop" : "node_40"
+          },
+          "default_entry" : {
+            "action_id" : 6,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_8",
+          "id" : 24,
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 31,
+            "column" : 12,
+            "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [47],
+          "actions" : ["act_8"],
+          "base_default_next" : "node_42",
+          "next_tables" : {
+            "act_8" : "node_42"
+          },
+          "default_entry" : {
+            "action_id" : 47,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_9",
+          "id" : 25,
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 34,
+            "column" : 12,
+            "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [48],
+          "actions" : ["act_9"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "act_9" : null
+          },
+          "default_entry" : {
+            "action_id" : 48,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        }
+      ],
+      "action_profiles" : [
+        {
+          "name" : "FabricIngress.next.hashed_selector",
+          "id" : 0,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 165,
+            "column" : 57,
+            "source_fragment" : "hashed_selector"
+          },
+          "max_size" : 1024,
+          "selector" : {
+            "algo" : "crc16",
+            "input" : [
+              {
+                "type" : "field",
+                "value" : ["ipv4", "dst_addr"]
+              },
+              {
+                "type" : "field",
+                "value" : ["ipv4", "src_addr"]
+              },
+              {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
+              },
+              {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
+              },
+              {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
+              }
+            ]
+          }
+        }
+      ],
+      "conditionals" : [
+        {
+          "name" : "node_2",
+          "id" : 0,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 24,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_out.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["packet_out", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act",
+          "false_next" : "node_4"
+        },
+        {
+          "name" : "node_4",
+          "id" : 1,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 104,
+            "column" : 12,
+            "source_fragment" : "hdr.vlan_tag.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["vlan_tag", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_0",
+          "false_next" : "node_6"
+        },
+        {
+          "name" : "node_6",
+          "id" : 2,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 110,
+            "column" : 12,
+            "source_fragment" : "!hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["mpls", "$valid$"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "tbl_act_1",
+          "false_next" : "FabricIngress.filtering.ingress_port_vlan"
+        },
+        {
+          "name" : "node_10",
+          "id" : 3,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 366,
+            "column" : 12,
+            "source_fragment" : "hdr.pppoe.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["pppoe", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_2",
+          "false_next" : "node_21"
+        },
+        {
+          "name" : "node_16",
+          "id" : 4,
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["scalars", "bng_ingress_upstream_tmp"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_5",
+          "false_next" : "node_18"
+        },
+        {
+          "name" : "node_18",
+          "id" : 5,
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "bng_ingress_upstream_hasReturned"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "node_19",
+          "false_next" : "node_27"
+        },
+        {
+          "name" : "node_19",
+          "id" : 6,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 158,
+            "column" : 12,
+            "source_fragment" : "hdr.ipv4.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv4", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4",
+          "false_next" : "node_27"
+        },
+        {
+          "name" : "node_21",
+          "id" : 7,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 280,
+            "column" : 12,
+            "source_fragment" : "hdr.ipv4.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv4", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "FabricIngress.bng_ingress.downstream.t_line_map_v4",
+          "false_next" : "node_27"
+        },
+        {
+          "name" : "node_25",
+          "id" : 8,
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["scalars", "bng_ingress_downstream_tmp"]
+              }
+            }
+          },
+          "true_next" : "FabricIngress.bng_ingress.downstream.t_qos_v4",
+          "false_next" : "node_27"
+        },
+        {
+          "name" : "node_27",
+          "id" : 9,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 74,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.skip_forwarding == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "true_next" : "node_28",
+          "false_next" : "FabricIngress.acl.acl"
+        },
+        {
+          "name" : "node_28",
+          "id" : 10,
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 141,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "true_next" : "FabricIngress.forwarding.bridging",
+          "false_next" : "node_30"
+        },
+        {
+          "name" : "node_30",
+          "id" : 11,
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 142,
+            "column" : 17,
+            "source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x01"
+              }
+            }
+          },
+          "true_next" : "FabricIngress.forwarding.mpls",
+          "false_next" : "node_32"
+        },
+        {
+          "name" : "node_32",
+          "id" : 12,
+          "source_info" : {
+            "filename" : "include/control/forwarding.p4",
+            "line" : 143,
+            "column" : 17,
+            "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x02"
+              }
+            }
+          },
+          "true_next" : "FabricIngress.forwarding.routing_v4",
+          "false_next" : "FabricIngress.acl.acl"
+        },
+        {
+          "name" : "node_35",
+          "id" : 13,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 78,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.skip_next == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t._skip_next8"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "false_next" : null,
+          "true_next" : "FabricIngress.next.xconnect"
+        },
+        {
+          "name" : "node_40",
+          "id" : 14,
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 30,
+            "column" : 12,
+            "source_fragment" : "standard_metadata.egress_spec < 511"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "<",
+              "left" : {
+                "type" : "field",
+                "value" : ["standard_metadata", "egress_spec"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x01ff"
+              }
+            }
+          },
+          "true_next" : "tbl_act_8",
+          "false_next" : "node_42"
+        },
+        {
+          "name" : "node_42",
+          "id" : 15,
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 33,
+            "column" : 12,
+            "source_fragment" : "standard_metadata.ingress_port < 511"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "<",
+              "left" : {
+                "type" : "field",
+                "value" : ["standard_metadata", "ingress_port"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x01ff"
+              }
+            }
+          },
+          "false_next" : null,
+          "true_next" : "tbl_act_9"
+        }
+      ]
+    },
+    {
+      "name" : "egress",
+      "id" : 1,
+      "source_info" : {
+        "filename" : "fabric.p4",
+        "line" : 92,
+        "column" : 8,
+        "source_fragment" : "FabricEgress"
+      },
+      "init_table" : "node_46",
+      "tables" : [
+        {
+          "name" : "tbl_act_10",
+          "id" : 26,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 41,
+            "column" : 12,
+            "source_fragment" : "exit"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [56],
+          "actions" : ["act_10"],
+          "base_default_next" : "node_48",
+          "next_tables" : {
+            "act_10" : "node_48"
+          },
+          "default_entry" : {
+            "action_id" : 56,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_11",
+          "id" : 27,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 47,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop(standard_metadata)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [57],
+          "actions" : ["act_11"],
+          "base_default_next" : "tbl_act_12",
+          "next_tables" : {
+            "act_11" : "tbl_act_12"
+          },
+          "default_entry" : {
+            "action_id" : 57,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_12",
+          "id" : 28,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 49,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_in.setValid(); ..."
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [58],
+          "actions" : ["act_12"],
+          "base_default_next" : "node_52",
+          "next_tables" : {
+            "act_12" : "node_52"
+          },
+          "default_entry" : {
+            "action_id" : 58,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_13",
+          "id" : 29,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 308,
+            "column" : 12,
+            "source_fragment" : "mark_to_drop(standard_metadata)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [59],
+          "actions" : ["act_13"],
+          "base_default_next" : "node_54",
+          "next_tables" : {
+            "act_13" : "node_54"
+          },
+          "default_entry" : {
+            "action_id" : 59,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_pop_mpls_if_present",
+          "id" : 30,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 312,
+            "column" : 36,
+            "source_fragment" : "pop_mpls_if_present()"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [52],
+          "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" : 52,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_set_mpls",
+          "id" : 31,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 314,
+            "column" : 12,
+            "source_fragment" : "set_mpls()"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [53],
+          "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" : 53,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricEgress.egress_next.egress_vlan",
+          "id" : 32,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 291,
+            "column" : 10,
+            "source_fragment" : "egress_vlan"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "vlan_id",
+              "target" : ["scalars", "fabric_metadata_t._vlan_id2"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "eg_port",
+              "target" : ["standard_metadata", "egress_port"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [55, 50],
+          "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "__HIT__" : "tbl_act_14",
+            "__MISS__" : "tbl_act_15"
+          },
+          "default_entry" : {
+            "action_id" : 50,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_14",
+          "id" : 33,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [60],
+          "actions" : ["act_14"],
+          "base_default_next" : "node_61",
+          "next_tables" : {
+            "act_14" : "node_61"
+          },
+          "default_entry" : {
+            "action_id" : 60,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_15",
+          "id" : 34,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [61],
+          "actions" : ["act_15"],
+          "base_default_next" : "node_61",
+          "next_tables" : {
+            "act_15" : "node_61"
+          },
+          "default_entry" : {
+            "action_id" : 61,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_push_vlan",
+          "id" : 35,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 16,
+            "source_fragment" : "push_vlan()"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [54],
+          "actions" : ["FabricEgress.egress_next.push_vlan"],
+          "base_default_next" : "node_64",
+          "next_tables" : {
+            "FabricEgress.egress_next.push_vlan" : "node_64"
+          },
+          "default_entry" : {
+            "action_id" : 54,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_16",
+          "id" : 36,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 326,
+            "column" : 25,
+            "source_fragment" : "="
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [63],
+          "actions" : ["act_17"],
+          "base_default_next" : "node_66",
+          "next_tables" : {
+            "act_17" : "node_66"
+          },
+          "default_entry" : {
+            "action_id" : 63,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_17",
+          "id" : 37,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 327,
+            "column" : 35,
+            "source_fragment" : "mark_to_drop(standard_metadata)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [62],
+          "actions" : ["act_16"],
+          "base_default_next" : "node_72",
+          "next_tables" : {
+            "act_16" : "node_72"
+          },
+          "default_entry" : {
+            "action_id" : 62,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_18",
+          "id" : 38,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 330,
+            "column" : 29,
+            "source_fragment" : "="
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [65],
+          "actions" : ["act_19"],
+          "base_default_next" : "node_70",
+          "next_tables" : {
+            "act_19" : "node_70"
+          },
+          "default_entry" : {
+            "action_id" : 65,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_19",
+          "id" : 39,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 331,
+            "column" : 39,
+            "source_fragment" : "mark_to_drop(standard_metadata)"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [64],
+          "actions" : ["act_18"],
+          "base_default_next" : "node_72",
+          "next_tables" : {
+            "act_18" : "node_72"
+          },
+          "default_entry" : {
+            "action_id" : 64,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricEgress.bng_egress.downstream.t_session_encap",
+          "id" : 40,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 337,
+            "column" : 10,
+            "source_fragment" : "t_session_encap"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "line_id",
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id18"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 8192,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [49, 51],
+          "actions" : ["nop", "FabricEgress.bng_egress.downstream.encap_v4"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "nop" : null,
+            "FabricEgress.bng_egress.downstream.encap_v4" : null
+          },
+          "default_entry" : {
+            "action_id" : 49,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        }
+      ],
+      "action_profiles" : [],
+      "conditionals" : [
+        {
+          "name" : "node_46",
+          "id" : 16,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 39,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.is_controller_packet_out == true"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out12"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : true
+              }
+            }
+          },
+          "true_next" : "tbl_act_10",
+          "false_next" : "node_48"
+        },
+        {
+          "name" : "node_48",
+          "id" : 17,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 43,
+            "column" : 12,
+            "source_fragment" : "standard_metadata.egress_port == 255"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["standard_metadata", "egress_port"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00ff"
+              }
+            }
+          },
+          "true_next" : "node_49",
+          "false_next" : "node_52"
+        },
+        {
+          "name" : "node_49",
+          "id" : 18,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 44,
+            "column" : 16,
+            "source_fragment" : "fabric_metadata.is_multicast == true && ..."
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "and",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "==",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "d2b",
+                      "left" : null,
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              },
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "==",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "d2b",
+                      "left" : null,
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "tbl_act_11",
+          "false_next" : "tbl_act_12"
+        },
+        {
+          "name" : "node_52",
+          "id" : 19,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 306,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.is_multicast == true ..."
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "and",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "==",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "d2b",
+                      "left" : null,
+                      "right" : {
+                        "type" : "field",
+                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              },
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "==",
+                  "left" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "ingress_port"]
+                  },
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["standard_metadata", "egress_port"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "tbl_act_13",
+          "false_next" : "node_54"
+        },
+        {
+          "name" : "node_54",
+          "id" : 20,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 311,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.mpls_label == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x000000"
+              }
+            }
+          },
+          "true_next" : "node_55",
+          "false_next" : "tbl_egress_next_set_mpls"
+        },
+        {
+          "name" : "node_55",
+          "id" : 21,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 312,
+            "column" : 16,
+            "source_fragment" : "hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["mpls", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_egress_next_pop_mpls_if_present",
+          "false_next" : "FabricEgress.egress_next.egress_vlan"
+        },
+        {
+          "name" : "node_61",
+          "id" : 22,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 317,
+            "column" : 12,
+            "source_fragment" : "!egress_vlan.apply().hit"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "egress_next_tmp"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "node_62",
+          "false_next" : "node_64"
+        },
+        {
+          "name" : "node_62",
+          "id" : 23,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 319,
+            "column" : 16,
+            "source_fragment" : "fabric_metadata.vlan_id != DEFAULT_VLAN_ID"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "!=",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x0ffe"
+              }
+            }
+          },
+          "true_next" : "tbl_egress_next_push_vlan",
+          "false_next" : "node_64"
+        },
+        {
+          "name" : "node_64",
+          "id" : 24,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 325,
+            "column" : 12,
+            "source_fragment" : "hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["mpls", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_16",
+          "false_next" : "node_68"
+        },
+        {
+          "name" : "node_66",
+          "id" : 25,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 327,
+            "column" : 16,
+            "source_fragment" : "hdr.mpls.ttl == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["mpls", "ttl"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "true_next" : "tbl_act_17",
+          "false_next" : "node_72"
+        },
+        {
+          "name" : "node_68",
+          "id" : 26,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 329,
+            "column" : 15,
+            "source_fragment" : "hdr.ipv4.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv4", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_18",
+          "false_next" : "node_72"
+        },
+        {
+          "name" : "node_70",
+          "id" : 27,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 331,
+            "column" : 20,
+            "source_fragment" : "hdr.ipv4.ttl == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["ipv4", "ttl"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "true_next" : "tbl_act_19",
+          "false_next" : "node_72"
+        },
+        {
+          "name" : "node_72",
+          "id" : 28,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 386,
+            "column" : 12,
+            "source_fragment" : "fmeta.bng.type == BNG_TYPE_DOWNSTREAM"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._bng_type17"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x02"
+              }
+            }
+          },
+          "false_next" : null,
+          "true_next" : "FabricEgress.bng_egress.downstream.t_session_encap"
+        }
+      ]
+    }
+  ],
+  "checksums" : [
+    {
+      "name" : "cksum",
+      "id" : 0,
+      "source_info" : {
+        "filename" : "include/checksum.p4",
+        "line" : 28,
+        "column" : 8,
+        "source_fragment" : "update_checksum(hdr.ipv4.isValid(), ..."
+      },
+      "target" : ["ipv4", "hdr_checksum"],
+      "type" : "generic",
+      "calculation" : "calc",
+      "verify" : false,
+      "update" : true,
+      "if_cond" : {
+        "type" : "expression",
+        "value" : {
+          "op" : "d2b",
+          "left" : null,
+          "right" : {
+            "type" : "field",
+            "value" : ["ipv4", "$valid$"]
+          }
+        }
+      }
+    },
+    {
+      "name" : "cksum_0",
+      "id" : 1,
+      "source_info" : {
+        "filename" : "include/checksum.p4",
+        "line" : 57,
+        "column" : 8,
+        "source_fragment" : "verify_checksum(hdr.ipv4.isValid(), ..."
+      },
+      "target" : ["ipv4", "hdr_checksum"],
+      "type" : "generic",
+      "calculation" : "calc_0",
+      "verify" : true,
+      "update" : false,
+      "if_cond" : {
+        "type" : "expression",
+        "value" : {
+          "op" : "d2b",
+          "left" : null,
+          "right" : {
+            "type" : "field",
+            "value" : ["ipv4", "$valid$"]
+          }
+        }
+      }
+    }
+  ],
+  "force_arith" : [],
+  "extern_instances" : [],
+  "field_aliases" : [
+    [
+      "queueing_metadata.enq_timestamp",
+      ["standard_metadata", "enq_timestamp"]
+    ],
+    [
+      "queueing_metadata.enq_qdepth",
+      ["standard_metadata", "enq_qdepth"]
+    ],
+    [
+      "queueing_metadata.deq_timedelta",
+      ["standard_metadata", "deq_timedelta"]
+    ],
+    [
+      "queueing_metadata.deq_qdepth",
+      ["standard_metadata", "deq_qdepth"]
+    ],
+    [
+      "intrinsic_metadata.ingress_global_timestamp",
+      ["standard_metadata", "ingress_global_timestamp"]
+    ],
+    [
+      "intrinsic_metadata.egress_global_timestamp",
+      ["standard_metadata", "egress_global_timestamp"]
+    ],
+    [
+      "intrinsic_metadata.lf_field_list",
+      ["standard_metadata", "lf_field_list"]
+    ],
+    [
+      "intrinsic_metadata.mcast_grp",
+      ["standard_metadata", "mcast_grp"]
+    ],
+    [
+      "intrinsic_metadata.resubmit_flag",
+      ["standard_metadata", "resubmit_flag"]
+    ],
+    [
+      "intrinsic_metadata.egress_rid",
+      ["standard_metadata", "egress_rid"]
+    ],
+    [
+      "intrinsic_metadata.recirculate_flag",
+      ["standard_metadata", "recirculate_flag"]
+    ],
+    [
+      "intrinsic_metadata.priority",
+      ["standard_metadata", "priority"]
+    ]
+  ],
+  "program" : "fabric.p4",
+  "__meta__" : {
+    "version" : [2, 18],
+    "compiler" : "https://github.com/p4lang/p4c"
+  }
+}
\ No newline at end of file
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-bng/bmv2/default/cpu_port.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-bng/bmv2/default/cpu_port.txt
new file mode 100644
index 0000000..ace9d03
--- /dev/null
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-bng/bmv2/default/cpu_port.txt
@@ -0,0 +1 @@
+255
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-bng/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-bng/bmv2/default/p4info.txt
new file mode 100644
index 0000000..a9885e2
--- /dev/null
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-bng/bmv2/default/p4info.txt
@@ -0,0 +1,1178 @@
+pkg_info {
+  arch: "v1model"
+}
+tables {
+  preamble {
+    id: 33584710
+    name: "FabricIngress.bng_ingress.upstream.t_line_map"
+    alias: "t_line_map"
+  }
+  match_fields {
+    id: 1
+    name: "s_tag"
+    bitwidth: 12
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "c_tag"
+    bitwidth: 12
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  action_refs {
+    id: 16829434
+  }
+  const_default_action_id: 16819938
+  size: 8192
+}
+tables {
+  preamble {
+    id: 33603300
+    name: "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
+    alias: "t_pppoe_cp"
+  }
+  match_fields {
+    id: 1
+    name: "pppoe_code"
+    bitwidth: 8
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "pppoe_protocol"
+    bitwidth: 16
+    match_type: TERNARY
+  }
+  action_refs {
+    id: 16830893
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 16819938
+  size: 16
+}
+tables {
+  preamble {
+    id: 33595047
+    name: "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4"
+    alias: "t_pppoe_term_v4"
+  }
+  match_fields {
+    id: 1
+    name: "line_id"
+    bitwidth: 32
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "ipv4_src"
+    bitwidth: 32
+    match_type: EXACT
+  }
+  match_fields {
+    id: 3
+    name: "pppoe_session_id"
+    bitwidth: 16
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16780562
+  }
+  action_refs {
+    id: 16785853
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 16785853
+  size: 32768
+}
+tables {
+  preamble {
+    id: 33555367
+    name: "FabricIngress.bng_ingress.downstream.t_line_map_v4"
+    alias: "t_line_map_v4"
+  }
+  match_fields {
+    id: 1
+    name: "ipv4_dst"
+    bitwidth: 32
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  action_refs {
+    id: 16798636
+  }
+  action_refs {
+    id: 16842299
+  }
+  const_default_action_id: 16819938
+  size: 32768
+}
+tables {
+  preamble {
+    id: 33602462
+    name: "FabricIngress.bng_ingress.downstream.t_qos_v4"
+    alias: "t_qos_v4"
+  }
+  match_fields {
+    id: 1
+    name: "line_id"
+    bitwidth: 32
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 2
+    name: "ipv4_src"
+    bitwidth: 32
+    match_type: LPM
+  }
+  match_fields {
+    id: 3
+    name: "ipv4_dscp"
+    bitwidth: 6
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 4
+    name: "ipv4_ecn"
+    bitwidth: 2
+    match_type: TERNARY
+  }
+  action_refs {
+    id: 16830304
+  }
+  action_refs {
+    id: 16804676
+  }
+  const_default_action_id: 16804676
+  size: 256
+}
+tables {
+  preamble {
+    id: 33611649
+    name: "FabricIngress.filtering.ingress_port_vlan"
+    alias: "ingress_port_vlan"
+  }
+  match_fields {
+    id: 1
+    name: "ig_port"
+    bitwidth: 9
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "vlan_is_valid"
+    bitwidth: 1
+    match_type: EXACT
+  }
+  match_fields {
+    id: 3
+    name: "vlan_id"
+    bitwidth: 12
+    match_type: TERNARY
+  }
+  action_refs {
+    id: 16836487
+  }
+  action_refs {
+    id: 16818236
+  }
+  action_refs {
+    id: 16794911
+  }
+  const_default_action_id: 16836487
+  direct_resource_ids: 318815501
+  size: 1024
+}
+tables {
+  preamble {
+    id: 33596298
+    name: "FabricIngress.filtering.fwd_classifier"
+    alias: "fwd_classifier"
+  }
+  match_fields {
+    id: 1
+    name: "ig_port"
+    bitwidth: 9
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "eth_dst"
+    bitwidth: 48
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 3
+    name: "eth_type"
+    bitwidth: 16
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16840921
+  }
+  const_default_action_id: 16840921
+  direct_resource_ids: 318827326
+  size: 1024
+}
+tables {
+  preamble {
+    id: 33596749
+    name: "FabricIngress.forwarding.bridging"
+    alias: "bridging"
+  }
+  match_fields {
+    id: 1
+    name: "vlan_id"
+    bitwidth: 12
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "eth_dst"
+    bitwidth: 48
+    match_type: TERNARY
+  }
+  action_refs {
+    id: 16811012
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 16819938
+  direct_resource_ids: 318770289
+  size: 1024
+}
+tables {
+  preamble {
+    id: 33574274
+    name: "FabricIngress.forwarding.mpls"
+    alias: "mpls"
+  }
+  match_fields {
+    id: 1
+    name: "mpls_label"
+    bitwidth: 20
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16827758
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 16819938
+  direct_resource_ids: 318830507
+  size: 1024
+}
+tables {
+  preamble {
+    id: 33562650
+    name: "FabricIngress.forwarding.routing_v4"
+    alias: "routing_v4"
+  }
+  match_fields {
+    id: 1
+    name: "ipv4_dst"
+    bitwidth: 32
+    match_type: LPM
+  }
+  action_refs {
+    id: 16777434
+  }
+  action_refs {
+    id: 16804187
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 16819938
+  direct_resource_ids: 318811107
+  size: 1024
+}
+tables {
+  preamble {
+    id: 33618978
+    name: "FabricIngress.acl.acl"
+    alias: "acl"
+  }
+  match_fields {
+    id: 1
+    name: "ig_port"
+    bitwidth: 9
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 2
+    name: "ip_proto"
+    bitwidth: 8
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 3
+    name: "l4_sport"
+    bitwidth: 16
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 4
+    name: "l4_dport"
+    bitwidth: 16
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 5
+    name: "eth_src"
+    bitwidth: 48
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 6
+    name: "eth_dst"
+    bitwidth: 48
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 7
+    name: "vlan_id"
+    bitwidth: 12
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 8
+    name: "eth_type"
+    bitwidth: 16
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 9
+    name: "ipv4_src"
+    bitwidth: 32
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 10
+    name: "ipv4_dst"
+    bitwidth: 32
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 11
+    name: "icmp_type"
+    bitwidth: 8
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 12
+    name: "icmp_code"
+    bitwidth: 8
+    match_type: TERNARY
+  }
+  action_refs {
+    id: 16807382
+  }
+  action_refs {
+    id: 16829684
+  }
+  action_refs {
+    id: 16790975
+  }
+  action_refs {
+    id: 16820765
+  }
+  action_refs {
+    id: 16827694
+  }
+  const_default_action_id: 16827694
+  direct_resource_ids: 318801025
+  size: 1024
+}
+tables {
+  preamble {
+    id: 33599709
+    name: "FabricIngress.next.next_vlan"
+    alias: "next_vlan"
+  }
+  match_fields {
+    id: 1
+    name: "next_id"
+    bitwidth: 32
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16790685
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 16819938
+  direct_resource_ids: 318768144
+  size: 1024
+}
+tables {
+  preamble {
+    id: 33596977
+    name: "FabricIngress.next.xconnect"
+    alias: "xconnect"
+  }
+  match_fields {
+    id: 1
+    name: "ig_port"
+    bitwidth: 9
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "next_id"
+    bitwidth: 32
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16842190
+  }
+  action_refs {
+    id: 16837052
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 16819938
+  direct_resource_ids: 318778156
+  size: 1024
+}
+tables {
+  preamble {
+    id: 33608588
+    name: "FabricIngress.next.hashed"
+    alias: "hashed"
+  }
+  match_fields {
+    id: 1
+    name: "next_id"
+    bitwidth: 32
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16815357
+  }
+  action_refs {
+    id: 16791402
+  }
+  action_refs {
+    id: 16779255
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 16819938
+  implementation_id: 285217164
+  direct_resource_ids: 318800532
+  size: 1024
+}
+tables {
+  preamble {
+    id: 33606828
+    name: "FabricIngress.next.multicast"
+    alias: "multicast"
+  }
+  match_fields {
+    id: 1
+    name: "next_id"
+    bitwidth: 32
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16779917
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 16819938
+  direct_resource_ids: 318801752
+  size: 1024
+}
+tables {
+  preamble {
+    id: 33576241
+    name: "FabricEgress.bng_egress.downstream.t_session_encap"
+    alias: "t_session_encap"
+  }
+  match_fields {
+    id: 1
+    name: "line_id"
+    bitwidth: 32
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  action_refs {
+    id: 16784000
+  }
+  const_default_action_id: 16819938
+  size: 8192
+}
+tables {
+  preamble {
+    id: 33599342
+    name: "FabricEgress.egress_next.egress_vlan"
+    alias: "egress_vlan"
+  }
+  match_fields {
+    id: 1
+    name: "vlan_id"
+    bitwidth: 12
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "eg_port"
+    bitwidth: 9
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16790030
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 16819938
+  direct_resource_ids: 318827144
+  size: 1024
+}
+actions {
+  preamble {
+    id: 16819938
+    name: "nop"
+    alias: "nop"
+  }
+}
+actions {
+  preamble {
+    id: 16829434
+    name: "FabricIngress.bng_ingress.upstream.set_line"
+    alias: "set_line"
+  }
+  params {
+    id: 1
+    name: "line_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16830893
+    name: "FabricIngress.bng_ingress.upstream.punt_to_cpu"
+    alias: "upstream.punt_to_cpu"
+  }
+}
+actions {
+  preamble {
+    id: 16785853
+    name: "FabricIngress.bng_ingress.upstream.term_disabled"
+    alias: "term_disabled"
+  }
+}
+actions {
+  preamble {
+    id: 16780562
+    name: "FabricIngress.bng_ingress.upstream.term_enabled_v4"
+    alias: "term_enabled_v4"
+  }
+}
+actions {
+  preamble {
+    id: 16798636
+    name: "FabricIngress.bng_ingress.downstream.set_line_next"
+    alias: "set_line_next"
+  }
+  params {
+    id: 1
+    name: "line_id"
+    bitwidth: 32
+  }
+  params {
+    id: 2
+    name: "next_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16842299
+    name: "FabricIngress.bng_ingress.downstream.set_line_drop"
+    alias: "set_line_drop"
+  }
+  params {
+    id: 1
+    name: "line_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16830304
+    name: "FabricIngress.bng_ingress.downstream.qos_prio"
+    alias: "qos_prio"
+  }
+}
+actions {
+  preamble {
+    id: 16804676
+    name: "FabricIngress.bng_ingress.downstream.qos_besteff"
+    alias: "qos_besteff"
+  }
+}
+actions {
+  preamble {
+    id: 16836487
+    name: "FabricIngress.filtering.deny"
+    alias: "deny"
+  }
+}
+actions {
+  preamble {
+    id: 16818236
+    name: "FabricIngress.filtering.permit"
+    alias: "permit"
+  }
+}
+actions {
+  preamble {
+    id: 16794911
+    name: "FabricIngress.filtering.permit_with_internal_vlan"
+    alias: "permit_with_internal_vlan"
+  }
+  params {
+    id: 1
+    name: "vlan_id"
+    bitwidth: 12
+  }
+}
+actions {
+  preamble {
+    id: 16840921
+    name: "FabricIngress.filtering.set_forwarding_type"
+    alias: "set_forwarding_type"
+  }
+  params {
+    id: 1
+    name: "fwd_type"
+    bitwidth: 3
+  }
+}
+actions {
+  preamble {
+    id: 16811012
+    name: "FabricIngress.forwarding.set_next_id_bridging"
+    alias: "set_next_id_bridging"
+  }
+  params {
+    id: 1
+    name: "next_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16827758
+    name: "FabricIngress.forwarding.pop_mpls_and_next"
+    alias: "pop_mpls_and_next"
+  }
+  params {
+    id: 1
+    name: "next_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16777434
+    name: "FabricIngress.forwarding.set_next_id_routing_v4"
+    alias: "set_next_id_routing_v4"
+  }
+  params {
+    id: 1
+    name: "next_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16804187
+    name: "FabricIngress.forwarding.nop_routing_v4"
+    alias: "nop_routing_v4"
+  }
+}
+actions {
+  preamble {
+    id: 16807382
+    name: "FabricIngress.acl.set_next_id_acl"
+    alias: "set_next_id_acl"
+  }
+  params {
+    id: 1
+    name: "next_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16829684
+    name: "FabricIngress.acl.punt_to_cpu"
+    alias: "acl.punt_to_cpu"
+  }
+}
+actions {
+  preamble {
+    id: 16790975
+    name: "FabricIngress.acl.clone_to_cpu"
+    alias: "clone_to_cpu"
+  }
+}
+actions {
+  preamble {
+    id: 16820765
+    name: "FabricIngress.acl.drop"
+    alias: "drop"
+  }
+}
+actions {
+  preamble {
+    id: 16827694
+    name: "FabricIngress.acl.nop_acl"
+    alias: "nop_acl"
+  }
+}
+actions {
+  preamble {
+    id: 16790685
+    name: "FabricIngress.next.set_vlan"
+    alias: "set_vlan"
+  }
+  params {
+    id: 1
+    name: "vlan_id"
+    bitwidth: 12
+  }
+}
+actions {
+  preamble {
+    id: 16842190
+    name: "FabricIngress.next.output_xconnect"
+    alias: "output_xconnect"
+  }
+  params {
+    id: 1
+    name: "port_num"
+    bitwidth: 9
+  }
+}
+actions {
+  preamble {
+    id: 16837052
+    name: "FabricIngress.next.set_next_id_xconnect"
+    alias: "set_next_id_xconnect"
+  }
+  params {
+    id: 1
+    name: "next_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16815357
+    name: "FabricIngress.next.output_hashed"
+    alias: "output_hashed"
+  }
+  params {
+    id: 1
+    name: "port_num"
+    bitwidth: 9
+  }
+}
+actions {
+  preamble {
+    id: 16791402
+    name: "FabricIngress.next.routing_hashed"
+    alias: "routing_hashed"
+  }
+  params {
+    id: 1
+    name: "port_num"
+    bitwidth: 9
+  }
+  params {
+    id: 2
+    name: "smac"
+    bitwidth: 48
+  }
+  params {
+    id: 3
+    name: "dmac"
+    bitwidth: 48
+  }
+}
+actions {
+  preamble {
+    id: 16779255
+    name: "FabricIngress.next.mpls_routing_hashed"
+    alias: "mpls_routing_hashed"
+  }
+  params {
+    id: 1
+    name: "port_num"
+    bitwidth: 9
+  }
+  params {
+    id: 2
+    name: "smac"
+    bitwidth: 48
+  }
+  params {
+    id: 3
+    name: "dmac"
+    bitwidth: 48
+  }
+  params {
+    id: 4
+    name: "label"
+    bitwidth: 20
+  }
+}
+actions {
+  preamble {
+    id: 16779917
+    name: "FabricIngress.next.set_mcast_group_id"
+    alias: "set_mcast_group_id"
+  }
+  params {
+    id: 1
+    name: "group_id"
+    bitwidth: 16
+  }
+}
+actions {
+  preamble {
+    id: 16784000
+    name: "FabricEgress.bng_egress.downstream.encap_v4"
+    alias: "encap_v4"
+  }
+  params {
+    id: 1
+    name: "c_tag"
+    bitwidth: 12
+  }
+  params {
+    id: 2
+    name: "pppoe_session_id"
+    bitwidth: 16
+  }
+}
+actions {
+  preamble {
+    id: 16790030
+    name: "FabricEgress.egress_next.pop_vlan"
+    alias: "pop_vlan"
+  }
+}
+action_profiles {
+  preamble {
+    id: 285217164
+    name: "FabricIngress.next.hashed_selector"
+    alias: "hashed_selector"
+  }
+  table_ids: 33608588
+  with_selector: true
+  size: 1024
+  max_group_size: 16
+}
+counters {
+  preamble {
+    id: 302022672
+    name: "FabricIngress.bng_ingress.upstream.c_terminated"
+    alias: "c_terminated"
+  }
+  spec {
+    unit: PACKETS
+  }
+  size: 8192
+}
+counters {
+  preamble {
+    id: 302043418
+    name: "FabricIngress.bng_ingress.upstream.c_dropped"
+    alias: "c_dropped"
+  }
+  spec {
+    unit: PACKETS
+  }
+  size: 8192
+}
+counters {
+  preamble {
+    id: 302008909
+    name: "FabricIngress.bng_ingress.upstream.c_control"
+    alias: "c_control"
+  }
+  spec {
+    unit: PACKETS
+  }
+  size: 8192
+}
+counters {
+  preamble {
+    id: 302004781
+    name: "FabricIngress.bng_ingress.downstream.c_line_rx"
+    alias: "c_line_rx"
+  }
+  spec {
+    unit: BOTH
+  }
+  size: 8192
+}
+counters {
+  preamble {
+    id: 302011205
+    name: "FabricIngress.port_counters_control.egress_port_counter"
+    alias: "egress_port_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  size: 511
+}
+counters {
+  preamble {
+    id: 302002771
+    name: "FabricIngress.port_counters_control.ingress_port_counter"
+    alias: "ingress_port_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  size: 511
+}
+counters {
+  preamble {
+    id: 302046535
+    name: "FabricEgress.bng_egress.downstream.c_line_tx"
+    alias: "c_line_tx"
+  }
+  spec {
+    unit: BOTH
+  }
+  size: 8192
+}
+direct_counters {
+  preamble {
+    id: 318815501
+    name: "FabricIngress.filtering.ingress_port_vlan_counter"
+    alias: "ingress_port_vlan_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  direct_table_id: 33611649
+}
+direct_counters {
+  preamble {
+    id: 318827326
+    name: "FabricIngress.filtering.fwd_classifier_counter"
+    alias: "fwd_classifier_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  direct_table_id: 33596298
+}
+direct_counters {
+  preamble {
+    id: 318770289
+    name: "FabricIngress.forwarding.bridging_counter"
+    alias: "bridging_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  direct_table_id: 33596749
+}
+direct_counters {
+  preamble {
+    id: 318830507
+    name: "FabricIngress.forwarding.mpls_counter"
+    alias: "mpls_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  direct_table_id: 33574274
+}
+direct_counters {
+  preamble {
+    id: 318811107
+    name: "FabricIngress.forwarding.routing_v4_counter"
+    alias: "routing_v4_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  direct_table_id: 33562650
+}
+direct_counters {
+  preamble {
+    id: 318801025
+    name: "FabricIngress.acl.acl_counter"
+    alias: "acl_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  direct_table_id: 33618978
+}
+direct_counters {
+  preamble {
+    id: 318768144
+    name: "FabricIngress.next.next_vlan_counter"
+    alias: "next_vlan_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  direct_table_id: 33599709
+}
+direct_counters {
+  preamble {
+    id: 318778156
+    name: "FabricIngress.next.xconnect_counter"
+    alias: "xconnect_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  direct_table_id: 33596977
+}
+direct_counters {
+  preamble {
+    id: 318800532
+    name: "FabricIngress.next.hashed_counter"
+    alias: "hashed_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  direct_table_id: 33608588
+}
+direct_counters {
+  preamble {
+    id: 318801752
+    name: "FabricIngress.next.multicast_counter"
+    alias: "multicast_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  direct_table_id: 33606828
+}
+direct_counters {
+  preamble {
+    id: 318827144
+    name: "FabricEgress.egress_next.egress_vlan_counter"
+    alias: "egress_vlan_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  direct_table_id: 33599342
+}
+meters {
+  preamble {
+    id: 335569952
+    name: "FabricIngress.bng_ingress.downstream.m_besteff"
+    alias: "m_besteff"
+  }
+  spec {
+    unit: BYTES
+  }
+  size: 8192
+}
+meters {
+  preamble {
+    id: 335568260
+    name: "FabricIngress.bng_ingress.downstream.m_prio"
+    alias: "m_prio"
+  }
+  spec {
+    unit: BYTES
+  }
+  size: 8192
+}
+controller_packet_metadata {
+  preamble {
+    id: 67146229
+    name: "packet_in"
+    alias: "packet_in"
+    annotations: "@controller_header(\"packet_in\")"
+  }
+  metadata {
+    id: 1
+    name: "ingress_port"
+    bitwidth: 9
+  }
+  metadata {
+    id: 2
+    name: "_pad"
+    bitwidth: 7
+  }
+}
+controller_packet_metadata {
+  preamble {
+    id: 67121543
+    name: "packet_out"
+    alias: "packet_out"
+    annotations: "@controller_header(\"packet_out\")"
+  }
+  metadata {
+    id: 1
+    name: "egress_port"
+    bitwidth: 9
+  }
+  metadata {
+    id: 2
+    name: "_pad"
+    bitwidth: 7
+  }
+}
+type_info {
+}
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index 9e8f2c9..08b9395 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -12,8 +12,14 @@
         ["tmp_3", 32, false],
         ["spgw_ingress_tmp", 1, false],
         ["spgw_ingress_tmp_0", 1, false],
+        ["bng_ingress_upstream_tmp", 1, false],
+        ["bng_ingress_downstream_tmp", 1, false],
+        ["bng_ingress_downstream_tmp_0", 1, false],
         ["spgw_normalizer_hasReturned", 1, false],
         ["spgw_ingress_hasReturned", 1, false],
+        ["bng_ingress_upstream_hasReturned", 1, false],
+        ["key_0", 64, false],
+        ["key_1", 64, false],
         ["egress_next_tmp", 1, false],
         ["process_int_main_process_int_transit_hasReturned", 1, false],
         ["fabric_metadata_t._eth_type0", 16, false],
@@ -38,15 +44,18 @@
         ["fabric_metadata_t._spgw_teid19", 32, false],
         ["fabric_metadata_t._spgw_s1u_enb_addr20", 32, false],
         ["fabric_metadata_t._spgw_s1u_sgw_addr21", 32, false],
-        ["fabric_metadata_t._int_meta_source22", 1, false],
-        ["fabric_metadata_t._int_meta_transit23", 1, false],
-        ["fabric_metadata_t._int_meta_sink24", 1, false],
-        ["fabric_metadata_t._int_meta_switch_id25", 32, false],
-        ["fabric_metadata_t._int_meta_new_words26", 8, false],
-        ["fabric_metadata_t._int_meta_new_bytes27", 16, false],
-        ["fabric_metadata_t._int_meta_ig_tstamp28", 32, false],
-        ["fabric_metadata_t._int_meta_eg_tstamp29", 32, false],
-        ["_padding_0", 7, false]
+        ["fabric_metadata_t._bng_type22", 2, false],
+        ["fabric_metadata_t._bng_line_id23", 32, false],
+        ["fabric_metadata_t._bng_ds_meter_result24", 32, false],
+        ["fabric_metadata_t._int_meta_source25", 1, false],
+        ["fabric_metadata_t._int_meta_transit26", 1, false],
+        ["fabric_metadata_t._int_meta_sink27", 1, false],
+        ["fabric_metadata_t._int_meta_switch_id28", 32, false],
+        ["fabric_metadata_t._int_meta_new_words29", 8, false],
+        ["fabric_metadata_t._int_meta_new_bytes30", 16, false],
+        ["fabric_metadata_t._int_meta_ig_tstamp31", 32, false],
+        ["fabric_metadata_t._int_meta_eg_tstamp32", 32, false],
+        ["_padding_0", 1, false]
       ]
     },
     {
@@ -98,9 +107,21 @@
       ]
     },
     {
-      "name" : "mpls_t",
+      "name" : "pppoe_t",
       "id" : 4,
       "fields" : [
+        ["version", 4, false],
+        ["type_id", 4, false],
+        ["code", 8, false],
+        ["session_id", 16, false],
+        ["length", 16, false],
+        ["protocol", 16, false]
+      ]
+    },
+    {
+      "name" : "mpls_t",
+      "id" : 5,
+      "fields" : [
         ["label", 20, false],
         ["tc", 3, false],
         ["bos", 1, false],
@@ -109,7 +130,7 @@
     },
     {
       "name" : "ipv4_t",
-      "id" : 5,
+      "id" : 6,
       "fields" : [
         ["version", 4, false],
         ["ihl", 4, false],
@@ -128,7 +149,7 @@
     },
     {
       "name" : "udp_t",
-      "id" : 6,
+      "id" : 7,
       "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
@@ -138,7 +159,7 @@
     },
     {
       "name" : "gtpu_t",
-      "id" : 7,
+      "id" : 8,
       "fields" : [
         ["version", 3, false],
         ["pt", 1, false],
@@ -153,7 +174,7 @@
     },
     {
       "name" : "ipv6_t",
-      "id" : 8,
+      "id" : 9,
       "fields" : [
         ["version", 4, false],
         ["traffic_class", 8, false],
@@ -167,7 +188,7 @@
     },
     {
       "name" : "tcp_t",
-      "id" : 9,
+      "id" : 10,
       "fields" : [
         ["sport", 16, false],
         ["dport", 16, false],
@@ -184,7 +205,7 @@
     },
     {
       "name" : "icmp_t",
-      "id" : 10,
+      "id" : 11,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -196,7 +217,7 @@
     },
     {
       "name" : "packet_out_header_t",
-      "id" : 11,
+      "id" : 12,
       "fields" : [
         ["egress_port", 9, false],
         ["_pad", 7, false]
@@ -204,7 +225,7 @@
     },
     {
       "name" : "packet_in_header_t",
-      "id" : 12,
+      "id" : 13,
       "fields" : [
         ["ingress_port", 9, false],
         ["_pad", 7, false]
@@ -212,7 +233,7 @@
     },
     {
       "name" : "report_fixed_header_t",
-      "id" : 13,
+      "id" : 14,
       "fields" : [
         ["ver", 4, false],
         ["nproto", 4, false],
@@ -227,7 +248,7 @@
     },
     {
       "name" : "intl4_shim_t",
-      "id" : 14,
+      "id" : 15,
       "fields" : [
         ["int_type", 8, false],
         ["rsvd1", 8, false],
@@ -237,7 +258,7 @@
     },
     {
       "name" : "int_header_t",
-      "id" : 15,
+      "id" : 16,
       "fields" : [
         ["ver", 2, false],
         ["rep", 2, false],
@@ -256,14 +277,14 @@
     },
     {
       "name" : "int_switch_id_t",
-      "id" : 16,
+      "id" : 17,
       "fields" : [
         ["switch_id", 32, false]
       ]
     },
     {
       "name" : "int_port_ids_t",
-      "id" : 17,
+      "id" : 18,
       "fields" : [
         ["ingress_port_id", 16, false],
         ["egress_port_id", 16, false]
@@ -271,14 +292,14 @@
     },
     {
       "name" : "int_hop_latency_t",
-      "id" : 18,
+      "id" : 19,
       "fields" : [
         ["hop_latency", 32, false]
       ]
     },
     {
       "name" : "int_q_occupancy_t",
-      "id" : 19,
+      "id" : 20,
       "fields" : [
         ["q_id", 8, false],
         ["q_occupancy", 24, false]
@@ -286,21 +307,21 @@
     },
     {
       "name" : "int_ingress_tstamp_t",
-      "id" : 20,
+      "id" : 21,
       "fields" : [
         ["ingress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_egress_tstamp_t",
-      "id" : 21,
+      "id" : 22,
       "fields" : [
         ["egress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_q_congestion_t",
-      "id" : 22,
+      "id" : 23,
       "fields" : [
         ["q_id", 8, false],
         ["q_congestion", 24, false]
@@ -308,14 +329,14 @@
     },
     {
       "name" : "int_egress_port_tx_util_t",
-      "id" : 23,
+      "id" : 24,
       "fields" : [
         ["egress_port_tx_util", 32, false]
       ]
     },
     {
       "name" : "int_data_t",
-      "id" : 24,
+      "id" : 25,
       "fields" : [
         ["data", "*"]
       ],
@@ -323,7 +344,7 @@
     },
     {
       "name" : "intl4_tail_t",
-      "id" : 25,
+      "id" : 26,
       "fields" : [
         ["next_proto", 8, false],
         ["dest_port", 16, false],
@@ -369,204 +390,211 @@
       "pi_omit" : true
     },
     {
-      "name" : "mpls",
+      "name" : "pppoe",
       "id" : 5,
+      "header_type" : "pppoe_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "mpls",
+      "id" : 6,
       "header_type" : "mpls_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_ipv4",
-      "id" : 6,
+      "id" : 7,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu_udp",
-      "id" : 7,
+      "id" : 8,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "gtpu",
-      "id" : 8,
+      "id" : 9,
       "header_type" : "gtpu_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_ipv4",
-      "id" : 9,
+      "id" : 10,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "inner_udp",
-      "id" : 10,
+      "id" : 11,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv4",
-      "id" : 11,
+      "id" : 12,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv6",
-      "id" : 12,
+      "id" : 13,
       "header_type" : "ipv6_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "tcp",
-      "id" : 13,
+      "id" : 14,
       "header_type" : "tcp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "udp",
-      "id" : 14,
+      "id" : 15,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "icmp",
-      "id" : 15,
+      "id" : 16,
       "header_type" : "icmp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_out",
-      "id" : 16,
+      "id" : 17,
       "header_type" : "packet_out_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_in",
-      "id" : 17,
+      "id" : 18,
       "header_type" : "packet_in_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_ethernet",
-      "id" : 18,
+      "id" : 19,
       "header_type" : "ethernet_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_ipv4",
-      "id" : 19,
+      "id" : 20,
       "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_udp",
-      "id" : 20,
+      "id" : 21,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "report_fixed_header",
-      "id" : 21,
+      "id" : 22,
       "header_type" : "report_fixed_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "intl4_shim",
-      "id" : 22,
+      "id" : 23,
       "header_type" : "intl4_shim_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_header",
-      "id" : 23,
+      "id" : 24,
       "header_type" : "int_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_switch_id",
-      "id" : 24,
+      "id" : 25,
       "header_type" : "int_switch_id_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_port_ids",
-      "id" : 25,
+      "id" : 26,
       "header_type" : "int_port_ids_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_hop_latency",
-      "id" : 26,
+      "id" : 27,
       "header_type" : "int_hop_latency_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_q_occupancy",
-      "id" : 27,
+      "id" : 28,
       "header_type" : "int_q_occupancy_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_ingress_tstamp",
-      "id" : 28,
+      "id" : 29,
       "header_type" : "int_ingress_tstamp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_egress_tstamp",
-      "id" : 29,
+      "id" : 30,
       "header_type" : "int_egress_tstamp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_q_congestion",
-      "id" : 30,
+      "id" : 31,
       "header_type" : "int_q_congestion_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_egress_tx_util",
-      "id" : 31,
+      "id" : 32,
       "header_type" : "int_egress_port_tx_util_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "int_data",
-      "id" : 32,
+      "id" : 33,
       "header_type" : "int_data_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "intl4_tail",
-      "id" : 33,
+      "id" : 34,
       "header_type" : "intl4_tail_t",
       "metadata" : false,
       "pi_omit" : true
@@ -584,13 +612,13 @@
     }
   ],
   "errors" : [
-    ["NoError", 0],
-    ["PacketTooShort", 1],
-    ["NoMatch", 2],
-    ["StackOutOfBounds", 3],
-    ["HeaderTooShort", 4],
-    ["ParserTimeout", 5],
-    ["ParserInvalidArgument", 6]
+    ["NoError", 1],
+    ["PacketTooShort", 2],
+    ["NoMatch", 3],
+    ["StackOutOfBounds", 4],
+    ["HeaderTooShort", 5],
+    ["ParserTimeout", 6],
+    ["ParserInvalidArgument", 7]
   ],
   "enums" : [],
   "parsers" : [
@@ -824,6 +852,18 @@
               "next_state" : "parse_mpls"
             },
             {
+              "type" : "hexstr",
+              "value" : "0x8863",
+              "mask" : null,
+              "next_state" : "parse_pppoe"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8864",
+              "mask" : null,
+              "next_state" : "parse_pppoe"
+            },
+            {
               "value" : "default",
               "mask" : null,
               "next_state" : null
@@ -837,13 +877,53 @@
           ]
         },
         {
-          "name" : "parse_mpls",
+          "name" : "parse_pppoe",
           "id" : 5,
           "parser_ops" : [
             {
               "parameters" : [
                 {
                   "type" : "regular",
+                  "value" : "pppoe"
+                }
+              ],
+              "op" : "extract"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x0021",
+              "mask" : null,
+              "next_state" : "parse_ipv4"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0057",
+              "mask" : null,
+              "next_state" : "parse_ipv6"
+            },
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "protocol"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_mpls",
+          "id" : 6,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
                   "value" : "mpls"
                 }
               ],
@@ -917,7 +997,7 @@
         },
         {
           "name" : "parse_ipv4",
-          "id" : 6,
+          "id" : 7,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1002,7 +1082,7 @@
         },
         {
           "name" : "parse_ipv6",
-          "id" : 7,
+          "id" : 8,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1074,7 +1154,7 @@
         },
         {
           "name" : "parse_tcp",
-          "id" : 8,
+          "id" : 9,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1123,7 +1203,7 @@
         },
         {
           "name" : "parse_udp",
-          "id" : 9,
+          "id" : 10,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1183,7 +1263,7 @@
         },
         {
           "name" : "parse_icmp",
-          "id" : 10,
+          "id" : 11,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1206,7 +1286,7 @@
         },
         {
           "name" : "parse_gtpu",
-          "id" : 11,
+          "id" : 12,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1277,7 +1357,7 @@
         },
         {
           "name" : "do_parse_gtpu",
-          "id" : 12,
+          "id" : 13,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1345,7 +1425,7 @@
         },
         {
           "name" : "parse_inner_udp",
-          "id" : 13,
+          "id" : 14,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1394,7 +1474,7 @@
         },
         {
           "name" : "parse_int",
-          "id" : 14,
+          "id" : 15,
           "parser_ops" : [],
           "transitions" : [
             {
@@ -1418,7 +1498,7 @@
         },
         {
           "name" : "parse_intl4_shim",
-          "id" : 15,
+          "id" : 16,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1461,7 +1541,7 @@
         },
         {
           "name" : "parse_int_data",
-          "id" : 16,
+          "id" : 17,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1557,7 +1637,7 @@
         },
         {
           "name" : "parse_intl4_tail",
-          "id" : 17,
+          "id" : 18,
           "parser_ops" : [
             {
               "parameters" : [
@@ -1588,14 +1668,43 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 243,
+        "line" : 260,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "report_ethernet", "report_ipv4", "report_udp", "report_fixed_header", "ethernet", "vlan_tag", "inner_vlan_tag", "mpls", "gtpu_ipv4", "gtpu_udp", "gtpu", "ipv4", "ipv6", "tcp", "udp", "icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "int_data", "intl4_tail"]
+      "order" : ["packet_in", "report_ethernet", "report_ipv4", "report_udp", "report_fixed_header", "ethernet", "vlan_tag", "inner_vlan_tag", "pppoe", "mpls", "gtpu_ipv4", "gtpu_udp", "gtpu", "ipv4", "ipv6", "tcp", "udp", "icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "int_data", "intl4_tail"]
     }
   ],
-  "meter_arrays" : [],
+  "meter_arrays" : [
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.m_besteff",
+      "id" : 0,
+      "source_info" : {
+        "filename" : "include/bng.p4",
+        "line" : 177,
+        "column" : 33,
+        "source_fragment" : "m_besteff"
+      },
+      "is_direct" : false,
+      "size" : 8192,
+      "rate_count" : 2,
+      "type" : "bytes"
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.m_prio",
+      "id" : 1,
+      "source_info" : {
+        "filename" : "include/bng.p4",
+        "line" : 178,
+        "column" : 33,
+        "source_fragment" : "m_prio"
+      },
+      "is_direct" : false,
+      "size" : 8192,
+      "rate_count" : 2,
+      "type" : "bytes"
+    }
+  ],
   "counter_arrays" : [
     {
       "name" : "FabricIngress.spgw_ingress.ue_counter",
@@ -1610,8 +1719,56 @@
       }
     },
     {
-      "name" : "FabricIngress.process_set_source_sink.counter_set_source",
+      "name" : "FabricIngress.bng_ingress.upstream.c_terminated",
       "id" : 1,
+      "source_info" : {
+        "filename" : "include/bng.p4",
+        "line" : 40,
+        "column" : 39,
+        "source_fragment" : "c_terminated"
+      },
+      "size" : 8192,
+      "is_direct" : false
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.upstream.c_dropped",
+      "id" : 2,
+      "source_info" : {
+        "filename" : "include/bng.p4",
+        "line" : 41,
+        "column" : 39,
+        "source_fragment" : "c_dropped"
+      },
+      "size" : 8192,
+      "is_direct" : false
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.upstream.c_control",
+      "id" : 3,
+      "source_info" : {
+        "filename" : "include/bng.p4",
+        "line" : 42,
+        "column" : 39,
+        "source_fragment" : "c_control"
+      },
+      "size" : 8192,
+      "is_direct" : false
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.c_line_rx",
+      "id" : 4,
+      "source_info" : {
+        "filename" : "include/bng.p4",
+        "line" : 175,
+        "column" : 49,
+        "source_fragment" : "c_line_rx"
+      },
+      "size" : 8192,
+      "is_direct" : false
+    },
+    {
+      "name" : "FabricIngress.process_set_source_sink.counter_set_source",
+      "id" : 5,
       "is_direct" : true,
       "binding" : "FabricIngress.process_set_source_sink.tb_set_source",
       "source_info" : {
@@ -1623,7 +1780,7 @@
     },
     {
       "name" : "FabricIngress.process_set_source_sink.counter_set_sink",
-      "id" : 2,
+      "id" : 6,
       "is_direct" : true,
       "binding" : "FabricIngress.process_set_source_sink.tb_set_sink",
       "source_info" : {
@@ -1635,7 +1792,7 @@
     },
     {
       "name" : "FabricIngress.filtering.ingress_port_vlan_counter",
-      "id" : 3,
+      "id" : 7,
       "is_direct" : true,
       "binding" : "FabricIngress.filtering.ingress_port_vlan",
       "source_info" : {
@@ -1647,7 +1804,7 @@
     },
     {
       "name" : "FabricIngress.filtering.fwd_classifier_counter",
-      "id" : 4,
+      "id" : 8,
       "is_direct" : true,
       "binding" : "FabricIngress.filtering.fwd_classifier",
       "source_info" : {
@@ -1659,7 +1816,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.bridging_counter",
-      "id" : 5,
+      "id" : 9,
       "is_direct" : true,
       "binding" : "FabricIngress.forwarding.bridging",
       "source_info" : {
@@ -1671,7 +1828,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.mpls_counter",
-      "id" : 6,
+      "id" : 10,
       "is_direct" : true,
       "binding" : "FabricIngress.forwarding.mpls",
       "source_info" : {
@@ -1683,7 +1840,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.routing_v4_counter",
-      "id" : 7,
+      "id" : 11,
       "is_direct" : true,
       "binding" : "FabricIngress.forwarding.routing_v4",
       "source_info" : {
@@ -1695,7 +1852,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.routing_v6_counter",
-      "id" : 8,
+      "id" : 12,
       "is_direct" : true,
       "binding" : "FabricIngress.forwarding.routing_v6",
       "source_info" : {
@@ -1707,7 +1864,7 @@
     },
     {
       "name" : "FabricIngress.acl.acl_counter",
-      "id" : 9,
+      "id" : 13,
       "is_direct" : true,
       "binding" : "FabricIngress.acl.acl",
       "source_info" : {
@@ -1719,7 +1876,7 @@
     },
     {
       "name" : "FabricIngress.next.next_vlan_counter",
-      "id" : 10,
+      "id" : 14,
       "is_direct" : true,
       "binding" : "FabricIngress.next.next_vlan",
       "source_info" : {
@@ -1731,7 +1888,7 @@
     },
     {
       "name" : "FabricIngress.next.xconnect_counter",
-      "id" : 11,
+      "id" : 15,
       "is_direct" : true,
       "binding" : "FabricIngress.next.xconnect",
       "source_info" : {
@@ -1743,7 +1900,7 @@
     },
     {
       "name" : "FabricIngress.next.simple_counter",
-      "id" : 12,
+      "id" : 16,
       "is_direct" : true,
       "binding" : "FabricIngress.next.simple",
       "source_info" : {
@@ -1755,7 +1912,7 @@
     },
     {
       "name" : "FabricIngress.next.hashed_counter",
-      "id" : 13,
+      "id" : 17,
       "is_direct" : true,
       "binding" : "FabricIngress.next.hashed",
       "source_info" : {
@@ -1767,7 +1924,7 @@
     },
     {
       "name" : "FabricIngress.next.multicast_counter",
-      "id" : 14,
+      "id" : 18,
       "is_direct" : true,
       "binding" : "FabricIngress.next.multicast",
       "source_info" : {
@@ -1779,7 +1936,7 @@
     },
     {
       "name" : "FabricIngress.port_counters_control.egress_port_counter",
-      "id" : 15,
+      "id" : 19,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
         "line" : 26,
@@ -1791,7 +1948,7 @@
     },
     {
       "name" : "FabricIngress.port_counters_control.ingress_port_counter",
-      "id" : 16,
+      "id" : 20,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
         "line" : 27,
@@ -1802,8 +1959,20 @@
       "is_direct" : false
     },
     {
+      "name" : "FabricEgress.bng_egress.downstream.c_line_tx",
+      "id" : 21,
+      "source_info" : {
+        "filename" : "include/bng.p4",
+        "line" : 304,
+        "column" : 49,
+        "source_fragment" : "c_line_tx"
+      },
+      "size" : 8192,
+      "is_direct" : false
+    },
+    {
       "name" : "FabricEgress.process_int_main.process_int_source.counter_int_source",
-      "id" : 17,
+      "id" : 22,
       "is_direct" : true,
       "binding" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
       "source_info" : {
@@ -1815,7 +1984,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.egress_vlan_counter",
-      "id" : 18,
+      "id" : 23,
       "is_direct" : true,
       "binding" : "FabricEgress.egress_next.egress_vlan",
       "source_info" : {
@@ -2093,9 +2262,33 @@
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.spgw_ingress.gtpu_decap",
+      "name" : "nop",
       "id" : 13,
       "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 14,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 15,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 16,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.gtpu_decap",
+      "id" : 17,
+      "runtime_data" : [],
       "primitives" : [
         {
           "op" : "remove_header",
@@ -2146,7 +2339,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.set_dl_sess_info",
-      "id" : 14,
+      "id" : 18,
       "runtime_data" : [
         {
           "name" : "teid",
@@ -2222,8 +2415,39 @@
       ]
     },
     {
-      "name" : "FabricIngress.process_set_source_sink.int_set_source",
-      "id" : 15,
+      "name" : "FabricIngress.bng_ingress.upstream.set_line",
+      "id" : 19,
+      "runtime_data" : [
+        {
+          "name" : "line_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 52,
+            "column" : 26,
+            "source_fragment" : "= line_id; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.upstream.punt_to_cpu",
+      "id" : 20,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2231,7 +2455,1210 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_source22"]
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00ff"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 72,
+            "column" : 8,
+            "source_fragment" : "smeta.egress_spec = 255"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 73,
+            "column" : 30,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 74,
+            "column" : 24,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.bng_ingress.upstream.c_control"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 75,
+            "column" : 8,
+            "source_fragment" : "c_control.count(fmeta.bng.line_id)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.upstream.term_disabled",
+      "id" : 21,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_type22"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../header.p4",
+            "line" : 155,
+            "column" : 36,
+            "source_fragment" : "2w0x0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 107,
+            "column" : 30,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 108,
+            "column" : 24,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "mark_to_drop",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "standard_metadata"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 109,
+            "column" : 8,
+            "source_fragment" : "mark_to_drop(smeta)"
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.bng_ingress.upstream.c_dropped"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 110,
+            "column" : 8,
+            "source_fragment" : "c_dropped.count(fmeta.bng.line_id)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.upstream.term_disabled",
+      "id" : 22,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_type22"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../header.p4",
+            "line" : 155,
+            "column" : 36,
+            "source_fragment" : "2w0x0; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 107,
+            "column" : 30,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 108,
+            "column" : 24,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "mark_to_drop",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "standard_metadata"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 109,
+            "column" : 8,
+            "source_fragment" : "mark_to_drop(smeta)"
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.bng_ingress.upstream.c_dropped"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 110,
+            "column" : 8,
+            "source_fragment" : "c_dropped.count(fmeta.bng.line_id)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.upstream.term_enabled_v4",
+      "id" : 23,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 110,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0800"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 110,
+            "column" : 31,
+            "source_fragment" : "0x0800; ..."
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "pppoe"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 99,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 100,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 101,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_vlan_tag.setInvalid()"
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.bng_ingress.upstream.c_terminated"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 102,
+            "column" : 8,
+            "source_fragment" : "c_terminated.count(fmeta.bng.line_id)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.upstream.term_enabled_v6",
+      "id" : 24,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x86dd"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 111,
+            "column" : 31,
+            "source_fragment" : "0x86dd; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x86dd"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 111,
+            "column" : 31,
+            "source_fragment" : "0x86dd; ..."
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "pppoe"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 99,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 100,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.setInvalid()"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 101,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_vlan_tag.setInvalid()"
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.bng_ingress.upstream.c_terminated"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 102,
+            "column" : 8,
+            "source_fragment" : "c_terminated.count(fmeta.bng.line_id)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.set_line_next",
+      "id" : 25,
+      "runtime_data" : [
+        {
+          "name" : "line_id",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_type22"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x02"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../header.p4",
+            "line" : 157,
+            "column" : 39,
+            "source_fragment" : "2w0x2;; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 187,
+            "column" : 26,
+            "source_fragment" : "= line_id; ..."
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.bng_ingress.downstream.c_line_rx"
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 188,
+            "column" : 8,
+            "source_fragment" : "c_line_rx.count(line_id)"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 193,
+            "column" : 22,
+            "source_fragment" : "= next_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 194,
+            "column" : 30,
+            "source_fragment" : "= true; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.set_line_next",
+      "id" : 26,
+      "runtime_data" : [
+        {
+          "name" : "line_id",
+          "bitwidth" : 32
+        },
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_type22"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x02"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../header.p4",
+            "line" : 157,
+            "column" : 39,
+            "source_fragment" : "2w0x2;; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 187,
+            "column" : 26,
+            "source_fragment" : "= line_id; ..."
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.bng_ingress.downstream.c_line_rx"
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 188,
+            "column" : 8,
+            "source_fragment" : "c_line_rx.count(line_id)"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 193,
+            "column" : 22,
+            "source_fragment" : "= next_id; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 194,
+            "column" : 30,
+            "source_fragment" : "= true; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.set_line_drop",
+      "id" : 27,
+      "runtime_data" : [
+        {
+          "name" : "line_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_type22"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x02"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../header.p4",
+            "line" : 157,
+            "column" : 39,
+            "source_fragment" : "2w0x2;; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 187,
+            "column" : 26,
+            "source_fragment" : "= line_id; ..."
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.bng_ingress.downstream.c_line_rx"
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 188,
+            "column" : 8,
+            "source_fragment" : "c_line_rx.count(line_id)"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 199,
+            "column" : 30,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 200,
+            "column" : 24,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "mark_to_drop",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "standard_metadata"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 201,
+            "column" : 8,
+            "source_fragment" : "mark_to_drop(smeta)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.set_line_drop",
+      "id" : 28,
+      "runtime_data" : [
+        {
+          "name" : "line_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_type22"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x02"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../header.p4",
+            "line" : 157,
+            "column" : 39,
+            "source_fragment" : "2w0x2;; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 187,
+            "column" : 26,
+            "source_fragment" : "= line_id; ..."
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricIngress.bng_ingress.downstream.c_line_rx"
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 188,
+            "column" : 8,
+            "source_fragment" : "c_line_rx.count(line_id)"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 199,
+            "column" : 30,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 200,
+            "column" : 24,
+            "source_fragment" : "= true; ..."
+          }
+        },
+        {
+          "op" : "mark_to_drop",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "standard_metadata"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 201,
+            "column" : 8,
+            "source_fragment" : "mark_to_drop(smeta)"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.qos_prio",
+      "id" : 29,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "execute_meter",
+          "parameters" : [
+            {
+              "type" : "meter_array",
+              "value" : "FabricIngress.bng_ingress.downstream.m_prio"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result24"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 237,
+            "column" : 8,
+            "source_fragment" : "m_prio.execute_meter((bit<32>)fmeta.bng.line_id, ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.qos_prio",
+      "id" : 30,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "execute_meter",
+          "parameters" : [
+            {
+              "type" : "meter_array",
+              "value" : "FabricIngress.bng_ingress.downstream.m_prio"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result24"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 237,
+            "column" : 8,
+            "source_fragment" : "m_prio.execute_meter((bit<32>)fmeta.bng.line_id, ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
+      "id" : 31,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "execute_meter",
+          "parameters" : [
+            {
+              "type" : "meter_array",
+              "value" : "FabricIngress.bng_ingress.downstream.m_besteff"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result24"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 242,
+            "column" : 8,
+            "source_fragment" : "m_besteff.execute_meter((bit<32>)fmeta.bng.line_id, ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.bng_ingress.downstream.qos_besteff",
+      "id" : 32,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "execute_meter",
+          "parameters" : [
+            {
+              "type" : "meter_array",
+              "value" : "FabricIngress.bng_ingress.downstream.m_besteff"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_ds_meter_result24"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 242,
+            "column" : 8,
+            "source_fragment" : "m_besteff.execute_meter((bit<32>)fmeta.bng.line_id, ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.process_set_source_sink.int_set_source",
+      "id" : 33,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._int_meta_source25"]
             },
             {
               "type" : "expression",
@@ -2259,7 +3686,7 @@
     },
     {
       "name" : "FabricIngress.process_set_source_sink.int_set_sink",
-      "id" : 16,
+      "id" : 34,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2267,7 +3694,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_sink24"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_sink27"]
             },
             {
               "type" : "expression",
@@ -2295,7 +3722,7 @@
     },
     {
       "name" : "FabricIngress.filtering.deny",
-      "id" : 17,
+      "id" : 35,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2360,13 +3787,13 @@
     },
     {
       "name" : "FabricIngress.filtering.permit",
-      "id" : 18,
+      "id" : 36,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.filtering.permit_with_internal_vlan",
-      "id" : 19,
+      "id" : 37,
       "runtime_data" : [
         {
           "name" : "vlan_id",
@@ -2397,7 +3824,7 @@
     },
     {
       "name" : "FabricIngress.filtering.set_forwarding_type",
-      "id" : 20,
+      "id" : 38,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -2428,7 +3855,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
-      "id" : 21,
+      "id" : 39,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2459,7 +3886,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.pop_mpls_and_next",
-      "id" : 22,
+      "id" : 40,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2509,7 +3936,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
-      "id" : 23,
+      "id" : 41,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2540,13 +3967,13 @@
     },
     {
       "name" : "FabricIngress.forwarding.nop_routing_v4",
-      "id" : 24,
+      "id" : 42,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v6",
-      "id" : 25,
+      "id" : 43,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2577,7 +4004,7 @@
     },
     {
       "name" : "FabricIngress.acl.set_next_id_acl",
-      "id" : 26,
+      "id" : 44,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2608,7 +4035,7 @@
     },
     {
       "name" : "FabricIngress.acl.punt_to_cpu",
-      "id" : 27,
+      "id" : 45,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2663,7 +4090,7 @@
     },
     {
       "name" : "FabricIngress.acl.clone_to_cpu",
-      "id" : 28,
+      "id" : 46,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2699,7 +4126,7 @@
     },
     {
       "name" : "FabricIngress.acl.drop",
-      "id" : 29,
+      "id" : 47,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2750,13 +4177,13 @@
     },
     {
       "name" : "FabricIngress.acl.nop_acl",
-      "id" : 30,
+      "id" : 48,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.next.set_vlan",
-      "id" : 31,
+      "id" : 49,
       "runtime_data" : [
         {
           "name" : "vlan_id",
@@ -2787,7 +4214,7 @@
     },
     {
       "name" : "FabricIngress.next.output_xconnect",
-      "id" : 32,
+      "id" : 50,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -2818,7 +4245,7 @@
     },
     {
       "name" : "FabricIngress.next.set_next_id_xconnect",
-      "id" : 33,
+      "id" : 51,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2849,7 +4276,7 @@
     },
     {
       "name" : "FabricIngress.next.output_simple",
-      "id" : 34,
+      "id" : 52,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -2880,7 +4307,7 @@
     },
     {
       "name" : "FabricIngress.next.routing_simple",
-      "id" : 35,
+      "id" : 53,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -2957,7 +4384,7 @@
     },
     {
       "name" : "FabricIngress.next.mpls_routing_simple",
-      "id" : 36,
+      "id" : 54,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3057,7 +4484,7 @@
     },
     {
       "name" : "FabricIngress.next.output_hashed",
-      "id" : 37,
+      "id" : 55,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3088,7 +4515,7 @@
     },
     {
       "name" : "FabricIngress.next.routing_hashed",
-      "id" : 38,
+      "id" : 56,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3165,7 +4592,7 @@
     },
     {
       "name" : "FabricIngress.next.mpls_routing_hashed",
-      "id" : 39,
+      "id" : 57,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3265,7 +4692,7 @@
     },
     {
       "name" : "FabricIngress.next.set_mcast_group_id",
-      "id" : 40,
+      "id" : 58,
       "runtime_data" : [
         {
           "name" : "group_id",
@@ -3325,7 +4752,7 @@
     },
     {
       "name" : "act",
-      "id" : 41,
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3361,7 +4788,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 42,
+      "id" : 60,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3374,7 +4801,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 50,
             "source_fragment" : "hdr.gtpu_ipv4"
           }
@@ -3389,7 +4816,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 65,
             "source_fragment" : "hdr.gtpu_udp"
           }
@@ -3421,7 +4848,7 @@
     },
     {
       "name" : "act_1",
-      "id" : 43,
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3447,7 +4874,7 @@
     },
     {
       "name" : "act_2",
-      "id" : 44,
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3469,7 +4896,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 45,
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3533,7 +4960,7 @@
     },
     {
       "name" : "act_4",
-      "id" : 46,
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3613,7 +5040,7 @@
     },
     {
       "name" : "act_5",
-      "id" : 47,
+      "id" : 65,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3696,7 +5123,7 @@
     },
     {
       "name" : "act_6",
-      "id" : 48,
+      "id" : 66,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3722,7 +5149,7 @@
     },
     {
       "name" : "act_7",
-      "id" : 49,
+      "id" : 67,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3752,7 +5179,7 @@
     },
     {
       "name" : "act_8",
-      "id" : 50,
+      "id" : 68,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3782,7 +5209,7 @@
     },
     {
       "name" : "act_9",
-      "id" : 51,
+      "id" : 69,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3804,7 +5231,7 @@
     },
     {
       "name" : "act_10",
-      "id" : 52,
+      "id" : 70,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3821,7 +5248,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 137,
+            "line" : 142,
             "column" : 36,
             "source_fragment" : "2w1; ..."
           }
@@ -3830,7 +5257,7 @@
     },
     {
       "name" : "act_11",
-      "id" : 53,
+      "id" : 71,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3860,7 +5287,7 @@
     },
     {
       "name" : "act_12",
-      "id" : 54,
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3890,7 +5317,7 @@
     },
     {
       "name" : "act_13",
-      "id" : 55,
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3907,7 +5334,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 138,
+            "line" : 143,
             "column" : 38,
             "source_fragment" : "2w2; ..."
           }
@@ -3916,7 +5343,7 @@
     },
     {
       "name" : "act_14",
-      "id" : 56,
+      "id" : 74,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3933,7 +5360,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 136,
+            "line" : 141,
             "column" : 37,
             "source_fragment" : "2w0; ..."
           }
@@ -3971,7 +5398,7 @@
     },
     {
       "name" : "act_15",
-      "id" : 57,
+      "id" : 75,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4001,7 +5428,7 @@
     },
     {
       "name" : "act_16",
-      "id" : 58,
+      "id" : 76,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4027,7 +5454,390 @@
     },
     {
       "name" : "act_17",
-      "id" : 59,
+      "id" : 77,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_type22"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../header.p4",
+            "line" : 156,
+            "column" : 37,
+            "source_fragment" : "2w0x1; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "bng_ingress_upstream_hasReturned"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_18",
+      "id" : 78,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "bng_ingress_upstream_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_19",
+      "id" : 79,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "bng_ingress_upstream_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_20",
+      "id" : 80,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "bng_ingress_upstream_hasReturned"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 156,
+            "column" : 12,
+            "source_fragment" : "return"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_21",
+      "id" : 81,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "key_0"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : ">>",
+                          "left" : {
+                            "type" : "field",
+                            "value" : ["ipv6", "src_addr"]
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0x40"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xffffffffffffffffffffffffffffffff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffffffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 139,
+            "column" : 12,
+            "source_fragment" : "hdr.ipv6.src_addr[127:64]"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_22",
+      "id" : 82,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "bng_ingress_downstream_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_23",
+      "id" : 83,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "bng_ingress_downstream_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_24",
+      "id" : 84,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "bng_ingress_downstream_tmp_0"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_25",
+      "id" : 85,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "bng_ingress_downstream_tmp_0"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_26",
+      "id" : 86,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "key_1"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "&",
+                      "left" : {
+                        "type" : "expression",
+                        "value" : {
+                          "op" : ">>",
+                          "left" : {
+                            "type" : "field",
+                            "value" : ["ipv6", "dst_addr"]
+                          },
+                          "right" : {
+                            "type" : "hexstr",
+                            "value" : "0x40"
+                          }
+                        }
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xffffffffffffffffffffffffffffffff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffffffffffffffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 220,
+            "column" : 12,
+            "source_fragment" : "hdr.ipv6.dst_addr[127:64]"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_27",
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4084,8 +5894,8 @@
       ]
     },
     {
-      "name" : "act_18",
-      "id" : 60,
+      "name" : "act_28",
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4142,8 +5952,8 @@
       ]
     },
     {
-      "name" : "act_19",
-      "id" : 61,
+      "name" : "act_29",
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4169,43 +5979,49 @@
     },
     {
       "name" : "nop",
-      "id" : 62,
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 63,
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 64,
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 65,
+      "id" : 93,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 94,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "NoAction",
-      "id" : 66,
+      "id" : 95,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "NoAction",
-      "id" : 67,
+      "id" : 96,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 68,
+      "id" : 97,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4256,7 +6072,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 124,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -4412,7 +6228,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 132,
+            "line" : 137,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -4431,7 +6247,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 121,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -4796,8 +6612,526 @@
       ]
     },
     {
+      "name" : "FabricEgress.bng_egress.downstream.encap_v4",
+      "id" : 98,
+      "runtime_data" : [
+        {
+          "name" : "c_tag",
+          "bitwidth" : 12
+        },
+        {
+          "name" : "pppoe_session_id",
+          "bitwidth" : 16
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 107,
+            "column" : 31,
+            "source_fragment" : "0x8100; ..."
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 311,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_vlan_tag.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["inner_vlan_tag", "vlan_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 312,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_vlan_tag.vlan_id = c_tag; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["inner_vlan_tag", "eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8864"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 114,
+            "column" : 33,
+            "source_fragment" : "0x8864; ..."
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "pppoe"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 314,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "version"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 315,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.version = 4w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "type_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 316,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.type_id = 4w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "code"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 317,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.code = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "session_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 318,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.session_id = pppoe_session_id; ..."
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricEgress.bng_egress.downstream.c_line_tx"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 319,
+            "column" : 8,
+            "source_fragment" : "c_line_tx.count(fmeta.bng.line_id)"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "length"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["ipv4", "total_len"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x0002"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 324,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.length = hdr.ipv4.total_len + 16w2"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "protocol"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0021"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 116,
+            "column" : 35,
+            "source_fragment" : "0x0021; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.bng_egress.downstream.encap_v6",
+      "id" : 99,
+      "runtime_data" : [
+        {
+          "name" : "c_tag",
+          "bitwidth" : 12
+        },
+        {
+          "name" : "pppoe_session_id",
+          "bitwidth" : 16
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 107,
+            "column" : 31,
+            "source_fragment" : "0x8100; ..."
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "inner_vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 311,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_vlan_tag.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["inner_vlan_tag", "vlan_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 312,
+            "column" : 8,
+            "source_fragment" : "hdr.inner_vlan_tag.vlan_id = c_tag; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["inner_vlan_tag", "eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8864"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 114,
+            "column" : 33,
+            "source_fragment" : "0x8864; ..."
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "pppoe"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 314,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "version"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 315,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.version = 4w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "type_id"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 316,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.type_id = 4w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "code"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 317,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.code = 8w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "session_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 318,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.session_id = pppoe_session_id; ..."
+          }
+        },
+        {
+          "op" : "count",
+          "parameters" : [
+            {
+              "type" : "counter_array",
+              "value" : "FabricEgress.bng_egress.downstream.c_line_tx"
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t._bng_line_id23"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 319,
+            "column" : 8,
+            "source_fragment" : "c_line_tx.count(fmeta.bng.line_id)"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "length"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["ipv6", "payload_len"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0x002a"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xffff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 331,
+            "column" : 8,
+            "source_fragment" : "hdr.pppoe.length = hdr.ipv6.payload_len + 16w42"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["pppoe", "protocol"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x0057"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 117,
+            "column" : 35,
+            "source_fragment" : "0x0057; ..."
+          }
+        }
+      ]
+    },
+    {
       "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
-      "id" : 69,
+      "id" : 100,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -4865,7 +7199,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 147,
+            "line" : 152,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -5283,7 +7617,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 143,
+            "line" : 148,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -5292,7 +7626,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 70,
+      "id" : 101,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -5305,7 +7639,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_transit23"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_transit26"]
             },
             {
               "type" : "expression",
@@ -5334,7 +7668,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
             },
             {
               "type" : "runtime_data",
@@ -5352,13 +7686,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 71,
+      "id" : 102,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 72,
+      "id" : 103,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5432,7 +7766,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -5446,7 +7780,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5474,7 +7808,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -5488,7 +7822,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5515,7 +7849,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 73,
+      "id" : 104,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5557,7 +7891,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -5571,7 +7905,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5599,7 +7933,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -5613,7 +7947,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5640,7 +7974,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 74,
+      "id" : 105,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5748,7 +8082,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -5762,7 +8096,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5790,7 +8124,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -5804,7 +8138,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5831,7 +8165,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 75,
+      "id" : 106,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5918,7 +8252,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -5932,7 +8266,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5960,7 +8294,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -5974,7 +8308,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6001,7 +8335,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
-      "id" : 76,
+      "id" : 107,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6154,7 +8488,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -6168,7 +8502,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6196,7 +8530,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -6210,7 +8544,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6237,7 +8571,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 77,
+      "id" : 108,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6358,7 +8692,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -6372,7 +8706,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6400,7 +8734,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -6414,7 +8748,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6441,7 +8775,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
-      "id" : 78,
+      "id" : 109,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6628,7 +8962,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -6642,7 +8976,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6670,7 +9004,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -6684,7 +9018,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6711,7 +9045,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 79,
+      "id" : 110,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6738,7 +9072,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
             }
           ],
           "source_info" : {
@@ -6753,7 +9087,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -6767,7 +9101,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6795,7 +9129,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -6809,7 +9143,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6836,7 +9170,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
-      "id" : 80,
+      "id" : 111,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6929,7 +9263,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
             }
           ],
           "source_info" : {
@@ -6944,7 +9278,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -6958,7 +9292,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6986,7 +9320,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -7000,7 +9334,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7027,7 +9361,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
-      "id" : 81,
+      "id" : 112,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7088,7 +9422,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
             }
           ],
           "source_info" : {
@@ -7103,7 +9437,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -7117,7 +9451,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7145,7 +9479,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -7159,7 +9493,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7186,7 +9520,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
-      "id" : 82,
+      "id" : 113,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7313,7 +9647,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
             }
           ],
           "source_info" : {
@@ -7328,7 +9662,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -7342,7 +9676,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7370,7 +9704,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -7384,7 +9718,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7411,7 +9745,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 83,
+      "id" : 114,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7517,7 +9851,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
             }
           ],
           "source_info" : {
@@ -7532,7 +9866,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -7546,7 +9880,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7574,7 +9908,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -7588,7 +9922,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7615,7 +9949,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
-      "id" : 84,
+      "id" : 115,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7787,7 +10121,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
             }
           ],
           "source_info" : {
@@ -7802,7 +10136,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -7816,7 +10150,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7844,7 +10178,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -7858,7 +10192,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7885,7 +10219,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
-      "id" : 85,
+      "id" : 116,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8025,7 +10359,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
             }
           ],
           "source_info" : {
@@ -8040,7 +10374,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -8054,7 +10388,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8082,7 +10416,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -8096,7 +10430,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8123,7 +10457,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
-      "id" : 86,
+      "id" : 117,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8329,7 +10663,7 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id28"]
             }
           ],
           "source_info" : {
@@ -8344,7 +10678,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -8358,7 +10692,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8386,7 +10720,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -8400,7 +10734,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8427,13 +10761,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 87,
+      "id" : 118,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 88,
+      "id" : 119,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8475,7 +10809,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -8489,7 +10823,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8517,7 +10851,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -8531,7 +10865,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8558,7 +10892,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 89,
+      "id" : 120,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8619,7 +10953,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -8633,7 +10967,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8661,7 +10995,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -8675,7 +11009,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8702,7 +11036,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 90,
+      "id" : 121,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8797,7 +11131,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -8811,7 +11145,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8839,7 +11173,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -8853,7 +11187,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8880,7 +11214,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 91,
+      "id" : 122,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8945,7 +11279,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -8959,7 +11293,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8987,7 +11321,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -9001,7 +11335,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9028,7 +11362,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
-      "id" : 92,
+      "id" : 123,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9127,7 +11461,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -9141,7 +11475,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9169,7 +11503,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -9183,7 +11517,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9210,7 +11544,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 93,
+      "id" : 124,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9328,7 +11662,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -9342,7 +11676,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9370,7 +11704,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -9384,7 +11718,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9411,7 +11745,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
-      "id" : 94,
+      "id" : 125,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9563,7 +11897,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -9577,7 +11911,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9605,7 +11939,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -9619,7 +11953,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9646,7 +11980,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 95,
+      "id" : 126,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9688,7 +12022,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -9702,7 +12036,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9730,7 +12064,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -9744,7 +12078,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9771,7 +12105,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
-      "id" : 96,
+      "id" : 127,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9847,7 +12181,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -9861,7 +12195,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9889,7 +12223,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -9903,7 +12237,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9930,7 +12264,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
-      "id" : 97,
+      "id" : 128,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10025,7 +12359,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -10039,7 +12373,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10067,7 +12401,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -10081,7 +12415,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10108,7 +12442,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
-      "id" : 98,
+      "id" : 129,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10237,7 +12571,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -10251,7 +12585,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10279,7 +12613,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -10293,7 +12627,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10320,7 +12654,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 99,
+      "id" : 130,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10419,7 +12753,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -10433,7 +12767,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10461,7 +12795,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -10475,7 +12809,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10502,7 +12836,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
-      "id" : 100,
+      "id" : 131,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10635,7 +12969,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -10649,7 +12983,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10677,7 +13011,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -10691,7 +13025,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10718,7 +13052,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
-      "id" : 101,
+      "id" : 132,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10870,7 +13204,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -10884,7 +13218,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10912,7 +13246,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -10926,7 +13260,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10953,7 +13287,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
-      "id" : 102,
+      "id" : 133,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11139,7 +13473,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
             },
             {
               "type" : "expression",
@@ -11153,7 +13487,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11181,7 +13515,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
             },
             {
               "type" : "expression",
@@ -11195,7 +13529,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11222,7 +13556,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_report.do_report_encapsulation",
-      "id" : 103,
+      "id" : 134,
       "runtime_data" : [
         {
           "name" : "src_mac",
@@ -11541,7 +13875,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 121,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -11727,7 +14061,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 153,
+            "line" : 158,
             "column" : 31,
             "source_fragment" : "0; ..."
           }
@@ -11822,7 +14156,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 157,
+            "line" : 162,
             "column" : 21,
             "source_fragment" : "1; ..."
           }
@@ -11869,7 +14203,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.restore_header",
-      "id" : 104,
+      "id" : 135,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11914,7 +14248,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_sink.int_sink",
-      "id" : 105,
+      "id" : 136,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12245,7 +14579,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_mpls_if_present",
-      "id" : 106,
+      "id" : 137,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12286,7 +14620,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.set_mpls",
-      "id" : 107,
+      "id" : 138,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12403,7 +14737,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.push_vlan",
-      "id" : 108,
+      "id" : 139,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12520,7 +14854,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 109,
+      "id" : 140,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12560,8 +14894,8 @@
       ]
     },
     {
-      "name" : "act_20",
-      "id" : 110,
+      "name" : "act_30",
+      "id" : 141,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12577,8 +14911,8 @@
       ]
     },
     {
-      "name" : "act_21",
-      "id" : 111,
+      "name" : "act_31",
+      "id" : 142,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12599,8 +14933,8 @@
       ]
     },
     {
-      "name" : "act_22",
-      "id" : 112,
+      "name" : "act_32",
+      "id" : 143,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12650,8 +14984,8 @@
       ]
     },
     {
-      "name" : "act_23",
-      "id" : 113,
+      "name" : "act_33",
+      "id" : 144,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12672,8 +15006,8 @@
       ]
     },
     {
-      "name" : "act_24",
-      "id" : 114,
+      "name" : "act_34",
+      "id" : 145,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12702,8 +15036,8 @@
       ]
     },
     {
-      "name" : "act_25",
-      "id" : 115,
+      "name" : "act_35",
+      "id" : 146,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12732,8 +15066,8 @@
       ]
     },
     {
-      "name" : "act_26",
-      "id" : 116,
+      "name" : "act_36",
+      "id" : 147,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12754,8 +15088,8 @@
       ]
     },
     {
-      "name" : "act_27",
-      "id" : 117,
+      "name" : "act_37",
+      "id" : 148,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12803,8 +15137,8 @@
       ]
     },
     {
-      "name" : "act_28",
-      "id" : 118,
+      "name" : "act_38",
+      "id" : 149,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12825,8 +15159,8 @@
       ]
     },
     {
-      "name" : "act_29",
-      "id" : 119,
+      "name" : "act_39",
+      "id" : 150,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12874,8 +15208,8 @@
       ]
     },
     {
-      "name" : "act_30",
-      "id" : 120,
+      "name" : "act_40",
+      "id" : 151,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12896,8 +15230,8 @@
       ]
     },
     {
-      "name" : "act_31",
-      "id" : 121,
+      "name" : "act_41",
+      "id" : 152,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12945,8 +15279,8 @@
       ]
     },
     {
-      "name" : "act_32",
-      "id" : 122,
+      "name" : "act_42",
+      "id" : 153,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -12975,8 +15309,8 @@
       ]
     },
     {
-      "name" : "act_33",
-      "id" : 123,
+      "name" : "act_43",
+      "id" : 154,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13011,8 +15345,8 @@
       ]
     },
     {
-      "name" : "act_34",
-      "id" : 124,
+      "name" : "act_44",
+      "id" : 155,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13038,7 +15372,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       }
                     }
                   },
@@ -13060,8 +15394,8 @@
       ]
     },
     {
-      "name" : "act_35",
-      "id" : 125,
+      "name" : "act_45",
+      "id" : 156,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13109,8 +15443,8 @@
       ]
     },
     {
-      "name" : "act_36",
-      "id" : 126,
+      "name" : "act_46",
+      "id" : 157,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13136,7 +15470,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes30"]
                       }
                     }
                   },
@@ -13158,8 +15492,8 @@
       ]
     },
     {
-      "name" : "act_37",
-      "id" : 127,
+      "name" : "act_47",
+      "id" : 158,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -13185,7 +15519,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words29"]
                       }
                     }
                   },
@@ -13213,7 +15547,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 42,
+        "line" : 46,
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
@@ -13224,7 +15558,7 @@
           "id" : 0,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 50,
             "source_fragment" : "hdr.gtpu_ipv4, hdr.gtpu_udp"
           },
@@ -13235,14 +15569,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [42],
+          "action_ids" : [60],
           "actions" : ["act_0"],
           "base_default_next" : "node_3",
           "next_tables" : {
             "act_0" : "node_3"
           },
           "default_entry" : {
-            "action_id" : 42,
+            "action_id" : 60,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13264,14 +15598,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [41],
+          "action_ids" : [59],
           "actions" : ["act"],
           "base_default_next" : "node_5",
           "next_tables" : {
             "act" : "node_5"
           },
           "default_entry" : {
-            "action_id" : 41,
+            "action_id" : 59,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13293,14 +15627,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45],
+          "action_ids" : [63],
           "actions" : ["act_3"],
           "base_default_next" : "node_7",
           "next_tables" : {
             "act_3" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 45,
+            "action_id" : 63,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13322,14 +15656,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43],
+          "action_ids" : [61],
           "actions" : ["act_1"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_1" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 43,
+            "action_id" : 61,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13351,14 +15685,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [44],
+          "action_ids" : [62],
           "actions" : ["act_2"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_2" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 44,
+            "action_id" : 62,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13380,14 +15714,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [46],
+          "action_ids" : [64],
           "actions" : ["act_4"],
           "base_default_next" : "node_12",
           "next_tables" : {
             "act_4" : "node_12"
           },
           "default_entry" : {
-            "action_id" : 46,
+            "action_id" : 64,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13409,14 +15743,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [47],
+          "action_ids" : [65],
           "actions" : ["act_5"],
           "base_default_next" : "node_14",
           "next_tables" : {
             "act_5" : "node_14"
           },
           "default_entry" : {
-            "action_id" : 47,
+            "action_id" : 65,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13438,14 +15772,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [48],
+          "action_ids" : [66],
           "actions" : ["act_6"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
             "act_6" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
-            "action_id" : 48,
+            "action_id" : 66,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13486,7 +15820,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [17, 18, 19],
+          "action_ids" : [35, 36, 37],
           "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
           "base_default_next" : "FabricIngress.filtering.fwd_classifier",
           "next_tables" : {
@@ -13495,7 +15829,7 @@
             "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
           },
           "default_entry" : {
-            "action_id" : 17,
+            "action_id" : 35,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13536,14 +15870,14 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [20],
+          "action_ids" : [38],
           "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" : 20,
+            "action_id" : 38,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
@@ -13559,14 +15893,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [57],
+          "action_ids" : [75],
           "actions" : ["act_15"],
           "base_default_next" : "node_19",
           "next_tables" : {
             "act_15" : "node_19"
           },
           "default_entry" : {
-            "action_id" : 57,
+            "action_id" : 75,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13619,14 +15953,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [49],
+          "action_ids" : [67],
           "actions" : ["act_7"],
           "base_default_next" : "node_23",
           "next_tables" : {
             "act_7" : "node_23"
           },
           "default_entry" : {
-            "action_id" : 49,
+            "action_id" : 67,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13642,14 +15976,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [50],
+          "action_ids" : [68],
           "actions" : ["act_8"],
           "base_default_next" : "node_23",
           "next_tables" : {
             "act_8" : "node_23"
           },
           "default_entry" : {
-            "action_id" : 50,
+            "action_id" : 68,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13671,14 +16005,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [51],
+          "action_ids" : [69],
           "actions" : ["act_9"],
           "base_default_next" : "tbl_act_11",
           "next_tables" : {
             "act_9" : "tbl_act_11"
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 69,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13700,14 +16034,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52],
+          "action_ids" : [70],
           "actions" : ["act_10"],
           "base_default_next" : "tbl_spgw_ingress_gtpu_decap",
           "next_tables" : {
             "act_10" : "tbl_spgw_ingress_gtpu_decap"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 70,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13729,14 +16063,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [13],
+          "action_ids" : [17],
           "actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
           "base_default_next" : "node_33",
           "next_tables" : {
             "FabricIngress.spgw_ingress.gtpu_decap" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 13,
+            "action_id" : 17,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13765,7 +16099,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [14, 0],
+          "action_ids" : [18, 0],
           "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "nop"],
           "base_default_next" : null,
           "next_tables" : {
@@ -13789,14 +16123,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [53],
+          "action_ids" : [71],
           "actions" : ["act_11"],
           "base_default_next" : "node_30",
           "next_tables" : {
             "act_11" : "node_30"
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 71,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13812,14 +16146,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [54],
+          "action_ids" : [72],
           "actions" : ["act_12"],
           "base_default_next" : "node_30",
           "next_tables" : {
             "act_12" : "node_30"
           },
           "default_entry" : {
-            "action_id" : 54,
+            "action_id" : 72,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13841,14 +16175,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55],
+          "action_ids" : [73],
           "actions" : ["act_13"],
           "base_default_next" : "node_33",
           "next_tables" : {
             "act_13" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 55,
+            "action_id" : 73,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13870,14 +16204,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [56],
+          "action_ids" : [74],
           "actions" : ["act_14"],
           "base_default_next" : "node_33",
           "next_tables" : {
             "act_14" : "node_33"
           },
           "default_entry" : {
-            "action_id" : 56,
+            "action_id" : 74,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13899,14 +16233,630 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [58],
+          "action_ids" : [76],
           "actions" : ["act_16"],
           "base_default_next" : "node_35",
           "next_tables" : {
             "act_16" : "node_35"
           },
           "default_entry" : {
-            "action_id" : 58,
+            "action_id" : 76,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_17",
+          "id" : 23,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 366,
+            "column" : 27,
+            "source_fragment" : "="
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [77],
+          "actions" : ["act_17"],
+          "base_default_next" : "FabricIngress.bng_ingress.upstream.t_line_map",
+          "next_tables" : {
+            "act_17" : "FabricIngress.bng_ingress.upstream.t_line_map"
+          },
+          "default_entry" : {
+            "action_id" : 77,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.bng_ingress.upstream.t_line_map",
+          "id" : 24,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 55,
+            "column" : 10,
+            "source_fragment" : "t_line_map"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "s_tag",
+              "target" : ["vlan_tag", "vlan_id"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "c_tag",
+              "target" : ["inner_vlan_tag", "vlan_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 8192,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [2, 19],
+          "actions" : ["nop", "FabricIngress.bng_ingress.upstream.set_line"],
+          "base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
+          "next_tables" : {
+            "nop" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
+            "FabricIngress.bng_ingress.upstream.set_line" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
+          },
+          "default_entry" : {
+            "action_id" : 2,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_cp",
+          "id" : 25,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 78,
+            "column" : 10,
+            "source_fragment" : "t_pppoe_cp"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "pppoe_code",
+              "target" : ["pppoe", "code"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "pppoe_protocol",
+              "target" : ["pppoe", "protocol"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 16,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [20, 3],
+          "actions" : ["FabricIngress.bng_ingress.upstream.punt_to_cpu", "nop"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "__HIT__" : "tbl_act_18",
+            "__MISS__" : "tbl_act_19"
+          },
+          "default_entry" : {
+            "action_id" : 3,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_18",
+          "id" : 26,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [78],
+          "actions" : ["act_18"],
+          "base_default_next" : "node_41",
+          "next_tables" : {
+            "act_18" : "node_41"
+          },
+          "default_entry" : {
+            "action_id" : 78,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_19",
+          "id" : 27,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [79],
+          "actions" : ["act_19"],
+          "base_default_next" : "node_41",
+          "next_tables" : {
+            "act_19" : "node_41"
+          },
+          "default_entry" : {
+            "action_id" : 79,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_20",
+          "id" : 28,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 156,
+            "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" : [80],
+          "actions" : ["act_20"],
+          "base_default_next" : "node_43",
+          "next_tables" : {
+            "act_20" : "node_43"
+          },
+          "default_entry" : {
+            "action_id" : 80,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4",
+          "id" : 29,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 117,
+            "column" : 10,
+            "source_fragment" : "t_pppoe_term_v4"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "line_id",
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id23"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "ipv4_src",
+              "target" : ["ipv4", "src_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "pppoe_session_id",
+              "target" : ["pppoe", "session_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 32768,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [23, 21],
+          "actions" : ["FabricIngress.bng_ingress.upstream.term_enabled_v4", "FabricIngress.bng_ingress.upstream.term_disabled"],
+          "base_default_next" : "node_62",
+          "next_tables" : {
+            "FabricIngress.bng_ingress.upstream.term_enabled_v4" : "node_62",
+            "FabricIngress.bng_ingress.upstream.term_disabled" : "node_62"
+          },
+          "default_entry" : {
+            "action_id" : 21,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_21",
+          "id" : 30,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 139,
+            "column" : 12,
+            "source_fragment" : "hdr.ipv6.src_addr[127:64]"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [81],
+          "actions" : ["act_21"],
+          "base_default_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6",
+          "next_tables" : {
+            "act_21" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6"
+          },
+          "default_entry" : {
+            "action_id" : 81,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6",
+          "id" : 31,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 136,
+            "column" : 10,
+            "source_fragment" : "t_pppoe_term_v6"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "line_id",
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id23"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "ipv6_src_net_id",
+              "target" : ["scalars", "key_0"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "pppoe_session_id",
+              "target" : ["pppoe", "session_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 32768,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [24, 22],
+          "actions" : ["FabricIngress.bng_ingress.upstream.term_enabled_v6", "FabricIngress.bng_ingress.upstream.term_disabled"],
+          "base_default_next" : "node_62",
+          "next_tables" : {
+            "FabricIngress.bng_ingress.upstream.term_enabled_v6" : "node_62",
+            "FabricIngress.bng_ingress.upstream.term_disabled" : "node_62"
+          },
+          "default_entry" : {
+            "action_id" : 22,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.bng_ingress.downstream.t_line_map_v4",
+          "id" : 32,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 204,
+            "column" : 10,
+            "source_fragment" : "t_line_map_v4"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ipv4_dst",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 32768,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [4, 25, 27],
+          "actions" : ["nop", "FabricIngress.bng_ingress.downstream.set_line_next", "FabricIngress.bng_ingress.downstream.set_line_drop"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "__HIT__" : "tbl_act_22",
+            "__MISS__" : "tbl_act_23"
+          },
+          "default_entry" : {
+            "action_id" : 4,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_22",
+          "id" : 33,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [82],
+          "actions" : ["act_22"],
+          "base_default_next" : "node_53",
+          "next_tables" : {
+            "act_22" : "node_53"
+          },
+          "default_entry" : {
+            "action_id" : 82,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_23",
+          "id" : 34,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [83],
+          "actions" : ["act_23"],
+          "base_default_next" : "node_53",
+          "next_tables" : {
+            "act_23" : "node_53"
+          },
+          "default_entry" : {
+            "action_id" : 83,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.bng_ingress.downstream.t_qos_v4",
+          "id" : 35,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 246,
+            "column" : 10,
+            "source_fragment" : "t_qos_v4"
+          },
+          "key" : [
+            {
+              "match_type" : "ternary",
+              "name" : "line_id",
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id23"],
+              "mask" : null
+            },
+            {
+              "match_type" : "lpm",
+              "name" : "ipv4_src",
+              "target" : ["ipv4", "src_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "ipv4_dscp",
+              "target" : ["ipv4", "dscp"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "ipv4_ecn",
+              "target" : ["ipv4", "ecn"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 256,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [29, 31],
+          "actions" : ["FabricIngress.bng_ingress.downstream.qos_prio", "FabricIngress.bng_ingress.downstream.qos_besteff"],
+          "base_default_next" : "node_62",
+          "next_tables" : {
+            "FabricIngress.bng_ingress.downstream.qos_prio" : "node_62",
+            "FabricIngress.bng_ingress.downstream.qos_besteff" : "node_62"
+          },
+          "default_entry" : {
+            "action_id" : 31,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_24",
+          "id" : 36,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 220,
+            "column" : 12,
+            "source_fragment" : "hdr.ipv6.dst_addr[127:64]"
+          },
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [86],
+          "actions" : ["act_26"],
+          "base_default_next" : "FabricIngress.bng_ingress.downstream.t_line_map_v6",
+          "next_tables" : {
+            "act_26" : "FabricIngress.bng_ingress.downstream.t_line_map_v6"
+          },
+          "default_entry" : {
+            "action_id" : 86,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.bng_ingress.downstream.t_line_map_v6",
+          "id" : 37,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 218,
+            "column" : 10,
+            "source_fragment" : "t_line_map_v6"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ipv6_dst_net_id",
+              "target" : ["scalars", "key_1"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 32768,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [5, 26, 28],
+          "actions" : ["nop", "FabricIngress.bng_ingress.downstream.set_line_next", "FabricIngress.bng_ingress.downstream.set_line_drop"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "__HIT__" : "tbl_act_25",
+            "__MISS__" : "tbl_act_26"
+          },
+          "default_entry" : {
+            "action_id" : 5,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_25",
+          "id" : 38,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [84],
+          "actions" : ["act_24"],
+          "base_default_next" : "node_60",
+          "next_tables" : {
+            "act_24" : "node_60"
+          },
+          "default_entry" : {
+            "action_id" : 84,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_26",
+          "id" : 39,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [85],
+          "actions" : ["act_25"],
+          "base_default_next" : "node_60",
+          "next_tables" : {
+            "act_25" : "node_60"
+          },
+          "default_entry" : {
+            "action_id" : 85,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.bng_ingress.downstream.t_qos_v6",
+          "id" : 40,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 262,
+            "column" : 10,
+            "source_fragment" : "t_qos_v6"
+          },
+          "key" : [
+            {
+              "match_type" : "ternary",
+              "name" : "line_id",
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id23"],
+              "mask" : null
+            },
+            {
+              "match_type" : "lpm",
+              "name" : "ipv6_src",
+              "target" : ["ipv6", "src_addr"],
+              "mask" : null
+            },
+            {
+              "match_type" : "ternary",
+              "name" : "ipv6_traffic_class",
+              "target" : ["ipv6", "traffic_class"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "ternary",
+          "type" : "simple",
+          "max_size" : 256,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [30, 32],
+          "actions" : ["FabricIngress.bng_ingress.downstream.qos_prio", "FabricIngress.bng_ingress.downstream.qos_besteff"],
+          "base_default_next" : "node_62",
+          "next_tables" : {
+            "FabricIngress.bng_ingress.downstream.qos_prio" : "node_62",
+            "FabricIngress.bng_ingress.downstream.qos_besteff" : "node_62"
+          },
+          "default_entry" : {
+            "action_id" : 32,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13914,7 +16864,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.bridging",
-          "id" : 23,
+          "id" : 41,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 46,
@@ -13941,7 +16891,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [21, 4],
+          "action_ids" : [39, 8],
           "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -13949,7 +16899,7 @@
             "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 4,
+            "action_id" : 8,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13957,7 +16907,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.mpls",
-          "id" : 24,
+          "id" : 42,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 71,
@@ -13978,7 +16928,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [22, 5],
+          "action_ids" : [40, 9],
           "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -13986,7 +16936,7 @@
             "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 5,
+            "action_id" : 9,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13994,7 +16944,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v4",
-          "id" : 25,
+          "id" : 43,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 101,
@@ -14015,7 +16965,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [23, 24, 6],
+          "action_ids" : [41, 42, 10],
           "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -14024,7 +16974,7 @@
             "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 6,
+            "action_id" : 10,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14032,7 +16982,7 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v6",
-          "id" : 26,
+          "id" : 44,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 126,
@@ -14053,7 +17003,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [25, 7],
+          "action_ids" : [43, 11],
           "actions" : ["FabricIngress.forwarding.set_next_id_routing_v6", "nop"],
           "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
@@ -14061,7 +17011,7 @@
             "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
-            "action_id" : 7,
+            "action_id" : 11,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14069,7 +17019,7 @@
         },
         {
           "name" : "FabricIngress.acl.acl",
-          "id" : 27,
+          "id" : 45,
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 60,
@@ -14156,18 +17106,18 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [26, 27, 28, 29, 30],
+          "action_ids" : [44, 45, 46, 47, 48],
           "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.clone_to_cpu", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
-          "base_default_next" : "node_45",
+          "base_default_next" : "node_72",
           "next_tables" : {
-            "FabricIngress.acl.set_next_id_acl" : "node_45",
-            "FabricIngress.acl.punt_to_cpu" : "node_45",
-            "FabricIngress.acl.clone_to_cpu" : "node_45",
-            "FabricIngress.acl.drop" : "node_45",
-            "FabricIngress.acl.nop_acl" : "node_45"
+            "FabricIngress.acl.set_next_id_acl" : "node_72",
+            "FabricIngress.acl.punt_to_cpu" : "node_72",
+            "FabricIngress.acl.clone_to_cpu" : "node_72",
+            "FabricIngress.acl.drop" : "node_72",
+            "FabricIngress.acl.nop_acl" : "node_72"
           },
           "default_entry" : {
-            "action_id" : 30,
+            "action_id" : 48,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14175,7 +17125,7 @@
         },
         {
           "name" : "FabricIngress.next.xconnect",
-          "id" : 28,
+          "id" : 46,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 104,
@@ -14202,7 +17152,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [32, 33, 9],
+          "action_ids" : [50, 51, 13],
           "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
           "base_default_next" : "FabricIngress.next.simple",
           "next_tables" : {
@@ -14211,7 +17161,7 @@
             "nop" : "FabricIngress.next.simple"
           },
           "default_entry" : {
-            "action_id" : 9,
+            "action_id" : 13,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14219,7 +17169,7 @@
         },
         {
           "name" : "FabricIngress.next.simple",
-          "id" : 29,
+          "id" : 47,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 143,
@@ -14240,7 +17190,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [34, 35, 36, 10],
+          "action_ids" : [52, 53, 54, 14],
           "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.routing_simple", "FabricIngress.next.mpls_routing_simple", "nop"],
           "base_default_next" : "FabricIngress.next.hashed",
           "next_tables" : {
@@ -14250,7 +17200,7 @@
             "nop" : "FabricIngress.next.hashed"
           },
           "default_entry" : {
-            "action_id" : 10,
+            "action_id" : 14,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14258,7 +17208,7 @@
         },
         {
           "name" : "FabricIngress.next.hashed",
-          "id" : 30,
+          "id" : 48,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 184,
@@ -14280,7 +17230,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [37, 38, 39, 11],
+          "action_ids" : [55, 56, 57, 15],
           "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
           "base_default_next" : "FabricIngress.next.multicast",
           "next_tables" : {
@@ -14292,7 +17242,7 @@
         },
         {
           "name" : "FabricIngress.next.multicast",
-          "id" : 31,
+          "id" : 49,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 218,
@@ -14313,7 +17263,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [40, 12],
+          "action_ids" : [58, 16],
           "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
           "base_default_next" : "FabricIngress.next.next_vlan",
           "next_tables" : {
@@ -14321,7 +17271,7 @@
             "nop" : "FabricIngress.next.next_vlan"
           },
           "default_entry" : {
-            "action_id" : 12,
+            "action_id" : 16,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14329,7 +17279,7 @@
         },
         {
           "name" : "FabricIngress.next.next_vlan",
-          "id" : 32,
+          "id" : 50,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 74,
@@ -14350,23 +17300,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [31, 8],
+          "action_ids" : [49, 12],
           "actions" : ["FabricIngress.next.set_vlan", "nop"],
-          "base_default_next" : "node_51",
+          "base_default_next" : "node_78",
           "next_tables" : {
-            "FabricIngress.next.set_vlan" : "node_51",
-            "nop" : "node_51"
+            "FabricIngress.next.set_vlan" : "node_78",
+            "nop" : "node_78"
           },
           "default_entry" : {
-            "action_id" : 8,
+            "action_id" : 12,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_17",
-          "id" : 33,
+          "name" : "tbl_act_27",
+          "id" : 51,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 31,
@@ -14380,22 +17330,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [59],
-          "actions" : ["act_17"],
-          "base_default_next" : "node_53",
+          "action_ids" : [87],
+          "actions" : ["act_27"],
+          "base_default_next" : "node_80",
           "next_tables" : {
-            "act_17" : "node_53"
+            "act_27" : "node_80"
           },
           "default_entry" : {
-            "action_id" : 59,
+            "action_id" : 87,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_18",
-          "id" : 34,
+          "name" : "tbl_act_28",
+          "id" : 52,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 34,
@@ -14409,14 +17359,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [60],
-          "actions" : ["act_18"],
+          "action_ids" : [88],
+          "actions" : ["act_28"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_18" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "act_28" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 60,
+            "action_id" : 88,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14424,7 +17374,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_source",
-          "id" : 35,
+          "id" : 53,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 46,
@@ -14445,7 +17395,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [15, 2],
+          "action_ids" : [33, 6],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "nop"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_sink",
           "next_tables" : {
@@ -14453,7 +17403,7 @@
             "nop" : "FabricIngress.process_set_source_sink.tb_set_sink"
           },
           "default_entry" : {
-            "action_id" : 2,
+            "action_id" : 6,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14461,7 +17411,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_sink",
-          "id" : 36,
+          "id" : 54,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 67,
@@ -14482,23 +17432,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [16, 3],
+          "action_ids" : [34, 7],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "nop"],
-          "base_default_next" : "node_57",
+          "base_default_next" : "node_84",
           "next_tables" : {
-            "FabricIngress.process_set_source_sink.int_set_sink" : "node_57",
-            "nop" : "node_57"
+            "FabricIngress.process_set_source_sink.int_set_sink" : "node_84",
+            "nop" : "node_84"
           },
           "default_entry" : {
-            "action_id" : 3,
+            "action_id" : 7,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_19",
-          "id" : 37,
+          "name" : "tbl_act_29",
+          "id" : 55,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 89,
@@ -14512,14 +17462,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [61],
-          "actions" : ["act_19"],
+          "action_ids" : [89],
+          "actions" : ["act_29"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_19" : null
+            "act_29" : null
           },
           "default_entry" : {
-            "action_id" : 61,
+            "action_id" : 89,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -14816,8 +17766,198 @@
           "name" : "node_35",
           "id" : 10,
           "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 365,
+            "column" : 12,
+            "source_fragment" : "hdr.pppoe.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["pppoe", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_17",
+          "false_next" : "node_49"
+        },
+        {
+          "name" : "node_41",
+          "id" : 11,
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["scalars", "bng_ingress_upstream_tmp"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_20",
+          "false_next" : "node_43"
+        },
+        {
+          "name" : "node_43",
+          "id" : 12,
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "bng_ingress_upstream_hasReturned"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "node_44",
+          "false_next" : "node_62"
+        },
+        {
+          "name" : "node_44",
+          "id" : 13,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 159,
+            "column" : 12,
+            "source_fragment" : "hdr.ipv4.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv4", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4",
+          "false_next" : "node_46"
+        },
+        {
+          "name" : "node_46",
+          "id" : 14,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 163,
+            "column" : 17,
+            "source_fragment" : "hdr.ipv6.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv6", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_21",
+          "false_next" : "node_62"
+        },
+        {
+          "name" : "node_49",
+          "id" : 15,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 279,
+            "column" : 12,
+            "source_fragment" : "hdr.ipv4.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv4", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "FabricIngress.bng_ingress.downstream.t_line_map_v4",
+          "false_next" : "node_55"
+        },
+        {
+          "name" : "node_53",
+          "id" : 16,
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["scalars", "bng_ingress_downstream_tmp"]
+              }
+            }
+          },
+          "true_next" : "FabricIngress.bng_ingress.downstream.t_qos_v4",
+          "false_next" : "node_62"
+        },
+        {
+          "name" : "node_55",
+          "id" : 17,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 290,
+            "column" : 17,
+            "source_fragment" : "hdr.ipv6.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv6", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_24",
+          "false_next" : "node_62"
+        },
+        {
+          "name" : "node_60",
+          "id" : 18,
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["scalars", "bng_ingress_downstream_tmp_0"]
+              }
+            }
+          },
+          "true_next" : "FabricIngress.bng_ingress.downstream.t_qos_v6",
+          "false_next" : "node_62"
+        },
+        {
+          "name" : "node_62",
+          "id" : 19,
+          "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 67,
+            "line" : 74,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_forwarding == false"
           },
@@ -14842,12 +17982,12 @@
               }
             }
           },
-          "true_next" : "node_36",
+          "true_next" : "node_63",
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_36",
-          "id" : 11,
+          "name" : "node_63",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 141,
@@ -14869,11 +18009,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.bridging",
-          "false_next" : "node_38"
+          "false_next" : "node_65"
         },
         {
-          "name" : "node_38",
-          "id" : 12,
+          "name" : "node_65",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 142,
@@ -14895,11 +18035,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.mpls",
-          "false_next" : "node_40"
+          "false_next" : "node_67"
         },
         {
-          "name" : "node_40",
-          "id" : 13,
+          "name" : "node_67",
+          "id" : 22,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 143,
@@ -14921,11 +18061,11 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.routing_v4",
-          "false_next" : "node_42"
+          "false_next" : "node_69"
         },
         {
-          "name" : "node_42",
-          "id" : 14,
+          "name" : "node_69",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 145,
@@ -14950,11 +18090,11 @@
           "false_next" : "FabricIngress.acl.acl"
         },
         {
-          "name" : "node_45",
-          "id" : 15,
+          "name" : "node_72",
+          "id" : 24,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 71,
+            "line" : 78,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_next == false"
           },
@@ -14983,8 +18123,8 @@
           "true_next" : "FabricIngress.next.xconnect"
         },
         {
-          "name" : "node_51",
-          "id" : 16,
+          "name" : "node_78",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 30,
@@ -15005,12 +18145,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_17",
-          "false_next" : "node_53"
+          "true_next" : "tbl_act_27",
+          "false_next" : "node_80"
         },
         {
-          "name" : "node_53",
-          "id" : 17,
+          "name" : "node_80",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 33,
@@ -15031,12 +18171,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_18",
+          "true_next" : "tbl_act_28",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         },
         {
-          "name" : "node_57",
-          "id" : 18,
+          "name" : "node_84",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 86,
@@ -15054,7 +18194,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink24"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink27"]
                   }
                 }
               },
@@ -15065,7 +18205,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_19"
+          "true_next" : "tbl_act_29"
         }
       ]
     },
@@ -15074,15 +18214,15 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 85,
+        "line" : 92,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_61",
+      "init_table" : "node_88",
       "tables" : [
         {
-          "name" : "tbl_act_20",
-          "id" : 38,
+          "name" : "tbl_act_30",
+          "id" : 56,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 41,
@@ -15096,22 +18236,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [110],
-          "actions" : ["act_20"],
-          "base_default_next" : "node_63",
+          "action_ids" : [141],
+          "actions" : ["act_30"],
+          "base_default_next" : "node_90",
           "next_tables" : {
-            "act_20" : "node_63"
+            "act_30" : "node_90"
           },
           "default_entry" : {
-            "action_id" : 110,
+            "action_id" : 141,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_21",
-          "id" : 39,
+          "name" : "tbl_act_31",
+          "id" : 57,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 47,
@@ -15125,22 +18265,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [111],
-          "actions" : ["act_21"],
-          "base_default_next" : "tbl_act_22",
+          "action_ids" : [142],
+          "actions" : ["act_31"],
+          "base_default_next" : "tbl_act_32",
           "next_tables" : {
-            "act_21" : "tbl_act_22"
+            "act_31" : "tbl_act_32"
           },
           "default_entry" : {
-            "action_id" : 111,
+            "action_id" : 142,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_22",
-          "id" : 40,
+          "name" : "tbl_act_32",
+          "id" : 58,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 49,
@@ -15154,22 +18294,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [112],
-          "actions" : ["act_22"],
-          "base_default_next" : "node_67",
+          "action_ids" : [143],
+          "actions" : ["act_32"],
+          "base_default_next" : "node_94",
           "next_tables" : {
-            "act_22" : "node_67"
+            "act_32" : "node_94"
           },
           "default_entry" : {
-            "action_id" : 112,
+            "action_id" : 143,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_23",
-          "id" : 41,
+          "name" : "tbl_act_33",
+          "id" : 59,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 308,
@@ -15183,14 +18323,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [113],
-          "actions" : ["act_23"],
-          "base_default_next" : "node_69",
+          "action_ids" : [144],
+          "actions" : ["act_33"],
+          "base_default_next" : "node_96",
           "next_tables" : {
-            "act_23" : "node_69"
+            "act_33" : "node_96"
           },
           "default_entry" : {
-            "action_id" : 113,
+            "action_id" : 144,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15198,7 +18338,7 @@
         },
         {
           "name" : "tbl_egress_next_pop_mpls_if_present",
-          "id" : 42,
+          "id" : 60,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 312,
@@ -15212,14 +18352,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [106],
+          "action_ids" : [137],
           "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" : 106,
+            "action_id" : 137,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15227,7 +18367,7 @@
         },
         {
           "name" : "tbl_egress_next_set_mpls",
-          "id" : 43,
+          "id" : 61,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 314,
@@ -15241,14 +18381,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [107],
+          "action_ids" : [138],
           "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" : 107,
+            "action_id" : 138,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15256,7 +18396,7 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 44,
+          "id" : 62,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 291,
@@ -15283,23 +18423,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [109, 65],
+          "action_ids" : [140, 94],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_24",
-            "__MISS__" : "tbl_act_25"
+            "__HIT__" : "tbl_act_34",
+            "__MISS__" : "tbl_act_35"
           },
           "default_entry" : {
-            "action_id" : 65,
+            "action_id" : 94,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_24",
-          "id" : 45,
+          "name" : "tbl_act_34",
+          "id" : 63,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15307,22 +18447,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [114],
-          "actions" : ["act_24"],
-          "base_default_next" : "node_76",
+          "action_ids" : [145],
+          "actions" : ["act_34"],
+          "base_default_next" : "node_103",
           "next_tables" : {
-            "act_24" : "node_76"
+            "act_34" : "node_103"
           },
           "default_entry" : {
-            "action_id" : 114,
+            "action_id" : 145,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_25",
-          "id" : 46,
+          "name" : "tbl_act_35",
+          "id" : 64,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15330,14 +18470,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [115],
-          "actions" : ["act_25"],
-          "base_default_next" : "node_76",
+          "action_ids" : [146],
+          "actions" : ["act_35"],
+          "base_default_next" : "node_103",
           "next_tables" : {
-            "act_25" : "node_76"
+            "act_35" : "node_103"
           },
           "default_entry" : {
-            "action_id" : 115,
+            "action_id" : 146,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15345,7 +18485,7 @@
         },
         {
           "name" : "tbl_egress_next_push_vlan",
-          "id" : 47,
+          "id" : 65,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 320,
@@ -15359,22 +18499,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [108],
+          "action_ids" : [139],
           "actions" : ["FabricEgress.egress_next.push_vlan"],
-          "base_default_next" : "node_79",
+          "base_default_next" : "node_106",
           "next_tables" : {
-            "FabricEgress.egress_next.push_vlan" : "node_79"
+            "FabricEgress.egress_next.push_vlan" : "node_106"
           },
           "default_entry" : {
-            "action_id" : 108,
+            "action_id" : 139,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_26",
-          "id" : 48,
+          "name" : "tbl_act_36",
+          "id" : 66,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 326,
@@ -15388,22 +18528,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [117],
-          "actions" : ["act_27"],
-          "base_default_next" : "node_81",
+          "action_ids" : [148],
+          "actions" : ["act_37"],
+          "base_default_next" : "node_108",
           "next_tables" : {
-            "act_27" : "node_81"
+            "act_37" : "node_108"
           },
           "default_entry" : {
-            "action_id" : 117,
+            "action_id" : 148,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_27",
-          "id" : 49,
+          "name" : "tbl_act_37",
+          "id" : 67,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 327,
@@ -15417,22 +18557,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [116],
-          "actions" : ["act_26"],
-          "base_default_next" : "node_91",
+          "action_ids" : [147],
+          "actions" : ["act_36"],
+          "base_default_next" : "node_118",
           "next_tables" : {
-            "act_26" : "node_91"
+            "act_36" : "node_118"
           },
           "default_entry" : {
-            "action_id" : 116,
+            "action_id" : 147,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_28",
-          "id" : 50,
+          "name" : "tbl_act_38",
+          "id" : 68,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 330,
@@ -15446,22 +18586,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [119],
-          "actions" : ["act_29"],
-          "base_default_next" : "node_85",
+          "action_ids" : [150],
+          "actions" : ["act_39"],
+          "base_default_next" : "node_112",
           "next_tables" : {
-            "act_29" : "node_85"
+            "act_39" : "node_112"
           },
           "default_entry" : {
-            "action_id" : 119,
+            "action_id" : 150,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_29",
-          "id" : 51,
+          "name" : "tbl_act_39",
+          "id" : 69,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -15475,22 +18615,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [118],
-          "actions" : ["act_28"],
-          "base_default_next" : "node_91",
+          "action_ids" : [149],
+          "actions" : ["act_38"],
+          "base_default_next" : "node_118",
           "next_tables" : {
-            "act_28" : "node_91"
+            "act_38" : "node_118"
           },
           "default_entry" : {
-            "action_id" : 118,
+            "action_id" : 149,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_30",
-          "id" : 52,
+          "name" : "tbl_act_40",
+          "id" : 70,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 335,
@@ -15504,22 +18644,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [121],
-          "actions" : ["act_31"],
-          "base_default_next" : "node_89",
+          "action_ids" : [152],
+          "actions" : ["act_41"],
+          "base_default_next" : "node_116",
           "next_tables" : {
-            "act_31" : "node_89"
+            "act_41" : "node_116"
           },
           "default_entry" : {
-            "action_id" : 121,
+            "action_id" : 152,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_31",
-          "id" : 53,
+          "name" : "tbl_act_41",
+          "id" : 71,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 336,
@@ -15533,14 +18673,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [120],
-          "actions" : ["act_30"],
-          "base_default_next" : "node_91",
+          "action_ids" : [151],
+          "actions" : ["act_40"],
+          "base_default_next" : "node_118",
           "next_tables" : {
-            "act_30" : "node_91"
+            "act_40" : "node_118"
           },
           "default_entry" : {
-            "action_id" : 120,
+            "action_id" : 151,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15548,7 +18688,7 @@
         },
         {
           "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 54,
+          "id" : 72,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 228,
@@ -15562,14 +18702,52 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [68],
+          "action_ids" : [97],
           "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : "node_93",
+          "base_default_next" : "node_120",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : "node_93"
+            "FabricEgress.spgw_egress.gtpu_encap" : "node_120"
           },
           "default_entry" : {
-            "action_id" : 68,
+            "action_id" : 97,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricEgress.bng_egress.downstream.t_session_encap",
+          "id" : 73,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 336,
+            "column" : 10,
+            "source_fragment" : "t_session_encap"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "line_id",
+              "target" : ["scalars", "fabric_metadata_t._bng_line_id23"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 8192,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [90, 98, 99],
+          "actions" : ["nop", "FabricEgress.bng_egress.downstream.encap_v4", "FabricEgress.bng_egress.downstream.encap_v6"],
+          "base_default_next" : "node_122",
+          "next_tables" : {
+            "nop" : "node_122",
+            "FabricEgress.bng_egress.downstream.encap_v4" : "node_122",
+            "FabricEgress.bng_egress.downstream.encap_v6" : "node_122"
+          },
+          "default_entry" : {
+            "action_id" : 90,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15577,7 +18755,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 55,
+          "id" : 74,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 66,
@@ -15616,23 +18794,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [69, 62],
+          "action_ids" : [100, 91],
           "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
-          "base_default_next" : "node_96",
+          "base_default_next" : "node_125",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_96",
-            "nop" : "node_96"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_125",
+            "nop" : "node_125"
           },
           "default_entry" : {
-            "action_id" : 62,
+            "action_id" : 91,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_32",
-          "id" : 56,
+          "name" : "tbl_act_42",
+          "id" : 75,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15640,14 +18818,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [122],
-          "actions" : ["act_32"],
+          "action_ids" : [153],
+          "actions" : ["act_42"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_32" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act_42" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 122,
+            "action_id" : 153,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15655,7 +18833,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 57,
+          "id" : 76,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 315,
@@ -15676,23 +18854,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [70, 63],
+          "action_ids" : [101, 92],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_99",
+          "base_default_next" : "node_128",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_99",
-            "nop" : "node_99"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_128",
+            "nop" : "node_128"
           },
           "default_entry" : {
-            "action_id" : 63,
+            "action_id" : 92,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_33",
-          "id" : 58,
+          "name" : "tbl_act_43",
+          "id" : 77,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 420,
@@ -15706,14 +18884,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [123],
-          "actions" : ["act_33"],
-          "base_default_next" : "node_101",
+          "action_ids" : [154],
+          "actions" : ["act_43"],
+          "base_default_next" : "node_130",
           "next_tables" : {
-            "act_33" : "node_101"
+            "act_43" : "node_130"
           },
           "default_entry" : {
-            "action_id" : 123,
+            "action_id" : 154,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -15721,7 +18899,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 59,
+          "id" : 78,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 331,
@@ -15742,7 +18920,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 66],
+          "action_ids" : [102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 95],
           "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" : {
@@ -15765,7 +18943,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 66,
+            "action_id" : 95,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -15785,7 +18963,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 71,
+                "action_id" : 102,
                 "action_data" : []
               },
               "priority" : 1
@@ -15804,7 +18982,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 72,
+                "action_id" : 103,
                 "action_data" : []
               },
               "priority" : 2
@@ -15823,7 +19001,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 73,
+                "action_id" : 104,
                 "action_data" : []
               },
               "priority" : 3
@@ -15842,7 +19020,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 74,
+                "action_id" : 105,
                 "action_data" : []
               },
               "priority" : 4
@@ -15861,7 +19039,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 75,
+                "action_id" : 106,
                 "action_data" : []
               },
               "priority" : 5
@@ -15880,7 +19058,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 76,
+                "action_id" : 107,
                 "action_data" : []
               },
               "priority" : 6
@@ -15899,7 +19077,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 77,
+                "action_id" : 108,
                 "action_data" : []
               },
               "priority" : 7
@@ -15918,7 +19096,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 78,
+                "action_id" : 109,
                 "action_data" : []
               },
               "priority" : 8
@@ -15937,7 +19115,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 79,
+                "action_id" : 110,
                 "action_data" : []
               },
               "priority" : 9
@@ -15956,7 +19134,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 80,
+                "action_id" : 111,
                 "action_data" : []
               },
               "priority" : 10
@@ -15975,7 +19153,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 81,
+                "action_id" : 112,
                 "action_data" : []
               },
               "priority" : 11
@@ -15994,7 +19172,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 82,
+                "action_id" : 113,
                 "action_data" : []
               },
               "priority" : 12
@@ -16013,7 +19191,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 83,
+                "action_id" : 114,
                 "action_data" : []
               },
               "priority" : 13
@@ -16032,7 +19210,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 84,
+                "action_id" : 115,
                 "action_data" : []
               },
               "priority" : 14
@@ -16051,7 +19229,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 85,
+                "action_id" : 116,
                 "action_data" : []
               },
               "priority" : 15
@@ -16070,7 +19248,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 86,
+                "action_id" : 117,
                 "action_data" : []
               },
               "priority" : 16
@@ -16079,7 +19257,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 60,
+          "id" : 79,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 375,
@@ -16100,30 +19278,30 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 67],
+          "action_ids" : [118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 96],
           "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_34",
+          "base_default_next" : "tbl_act_44",
           "next_tables" : {
-            "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"
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_44",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_44",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_44",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_44",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_44",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_44",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_44",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_44",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_44",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_44",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_44",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_44",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_44",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_44",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_44",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_44",
+            "NoAction" : "tbl_act_44"
           },
           "default_entry" : {
-            "action_id" : 67,
+            "action_id" : 96,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -16143,7 +19321,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 87,
+                "action_id" : 118,
                 "action_data" : []
               },
               "priority" : 1
@@ -16162,7 +19340,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 88,
+                "action_id" : 119,
                 "action_data" : []
               },
               "priority" : 2
@@ -16181,7 +19359,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 89,
+                "action_id" : 120,
                 "action_data" : []
               },
               "priority" : 3
@@ -16200,7 +19378,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 90,
+                "action_id" : 121,
                 "action_data" : []
               },
               "priority" : 4
@@ -16219,7 +19397,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 91,
+                "action_id" : 122,
                 "action_data" : []
               },
               "priority" : 5
@@ -16238,7 +19416,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 92,
+                "action_id" : 123,
                 "action_data" : []
               },
               "priority" : 6
@@ -16257,7 +19435,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 93,
+                "action_id" : 124,
                 "action_data" : []
               },
               "priority" : 7
@@ -16276,7 +19454,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 94,
+                "action_id" : 125,
                 "action_data" : []
               },
               "priority" : 8
@@ -16295,7 +19473,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 95,
+                "action_id" : 126,
                 "action_data" : []
               },
               "priority" : 9
@@ -16314,7 +19492,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 96,
+                "action_id" : 127,
                 "action_data" : []
               },
               "priority" : 10
@@ -16333,7 +19511,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 97,
+                "action_id" : 128,
                 "action_data" : []
               },
               "priority" : 11
@@ -16352,7 +19530,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 98,
+                "action_id" : 129,
                 "action_data" : []
               },
               "priority" : 12
@@ -16371,7 +19549,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 99,
+                "action_id" : 130,
                 "action_data" : []
               },
               "priority" : 13
@@ -16390,7 +19568,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 100,
+                "action_id" : 131,
                 "action_data" : []
               },
               "priority" : 14
@@ -16409,7 +19587,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 101,
+                "action_id" : 132,
                 "action_data" : []
               },
               "priority" : 15
@@ -16428,7 +19606,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 102,
+                "action_id" : 133,
                 "action_data" : []
               },
               "priority" : 16
@@ -16436,8 +19614,8 @@
           ]
         },
         {
-          "name" : "tbl_act_34",
-          "id" : 61,
+          "name" : "tbl_act_44",
+          "id" : 80,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 425,
@@ -16451,22 +19629,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [125],
-          "actions" : ["act_35"],
-          "base_default_next" : "node_105",
+          "action_ids" : [156],
+          "actions" : ["act_45"],
+          "base_default_next" : "node_134",
           "next_tables" : {
-            "act_35" : "node_105"
+            "act_45" : "node_134"
           },
           "default_entry" : {
-            "action_id" : 125,
+            "action_id" : 156,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_35",
-          "id" : 62,
+          "name" : "tbl_act_45",
+          "id" : 81,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 428,
@@ -16480,22 +19658,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [124],
-          "actions" : ["act_34"],
-          "base_default_next" : "node_107",
+          "action_ids" : [155],
+          "actions" : ["act_44"],
+          "base_default_next" : "node_136",
           "next_tables" : {
-            "act_34" : "node_107"
+            "act_44" : "node_136"
           },
           "default_entry" : {
-            "action_id" : 124,
+            "action_id" : 155,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_36",
-          "id" : 63,
+          "name" : "tbl_act_46",
+          "id" : 82,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 431,
@@ -16509,22 +19687,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [126],
-          "actions" : ["act_36"],
-          "base_default_next" : "node_109",
+          "action_ids" : [157],
+          "actions" : ["act_46"],
+          "base_default_next" : "node_138",
           "next_tables" : {
-            "act_36" : "node_109"
+            "act_46" : "node_138"
           },
           "default_entry" : {
-            "action_id" : 126,
+            "action_id" : 157,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_37",
-          "id" : 64,
+          "name" : "tbl_act_47",
+          "id" : 83,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 434,
@@ -16538,14 +19716,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [127],
-          "actions" : ["act_37"],
-          "base_default_next" : "node_111",
+          "action_ids" : [158],
+          "actions" : ["act_47"],
+          "base_default_next" : "node_140",
           "next_tables" : {
-            "act_37" : "node_111"
+            "act_47" : "node_140"
           },
           "default_entry" : {
-            "action_id" : 127,
+            "action_id" : 158,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16553,7 +19731,7 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "id" : 65,
+          "id" : 84,
           "source_info" : {
             "filename" : "include/int/int_report.p4",
             "line" : 86,
@@ -16567,15 +19745,15 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [103, 64],
+          "action_ids" : [134, 93],
           "actions" : ["FabricEgress.process_int_main.process_int_report.do_report_encapsulation", "nop"],
-          "base_default_next" : "node_113",
+          "base_default_next" : "node_142",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_113",
-            "nop" : "node_113"
+            "FabricEgress.process_int_main.process_int_report.do_report_encapsulation" : "node_142",
+            "nop" : "node_142"
           },
           "default_entry" : {
-            "action_id" : 64,
+            "action_id" : 93,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -16583,7 +19761,7 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_restore_header",
-          "id" : 66,
+          "id" : 85,
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
             "line" : 53,
@@ -16597,14 +19775,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [104],
+          "action_ids" : [135],
           "actions" : ["FabricEgress.process_int_main.process_int_sink.restore_header"],
           "base_default_next" : "tbl_process_int_main_process_int_sink_int_sink",
           "next_tables" : {
             "FabricEgress.process_int_main.process_int_sink.restore_header" : "tbl_process_int_main_process_int_sink_int_sink"
           },
           "default_entry" : {
-            "action_id" : 104,
+            "action_id" : 135,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16612,7 +19790,7 @@
         },
         {
           "name" : "tbl_process_int_main_process_int_sink_int_sink",
-          "id" : 67,
+          "id" : 86,
           "source_info" : {
             "filename" : "include/int/int_sink.p4",
             "line" : 54,
@@ -16626,14 +19804,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [105],
+          "action_ids" : [136],
           "actions" : ["FabricEgress.process_int_main.process_int_sink.int_sink"],
           "base_default_next" : null,
           "next_tables" : {
             "FabricEgress.process_int_main.process_int_sink.int_sink" : null
           },
           "default_entry" : {
-            "action_id" : 105,
+            "action_id" : 136,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -16643,8 +19821,8 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_61",
-          "id" : 19,
+          "name" : "node_88",
+          "id" : 28,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 39,
@@ -16672,12 +19850,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_20",
-          "false_next" : "node_63"
+          "true_next" : "tbl_act_30",
+          "false_next" : "node_90"
         },
         {
-          "name" : "node_63",
-          "id" : 20,
+          "name" : "node_90",
+          "id" : 29,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 43,
@@ -16698,12 +19876,12 @@
               }
             }
           },
-          "true_next" : "node_64",
-          "false_next" : "node_67"
+          "true_next" : "node_91",
+          "false_next" : "node_94"
         },
         {
-          "name" : "node_64",
-          "id" : 21,
+          "name" : "node_91",
+          "id" : 30,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 44,
@@ -16758,12 +19936,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_21",
-          "false_next" : "tbl_act_22"
+          "true_next" : "tbl_act_31",
+          "false_next" : "tbl_act_32"
         },
         {
-          "name" : "node_67",
-          "id" : 22,
+          "name" : "node_94",
+          "id" : 31,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 306,
@@ -16811,12 +19989,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_23",
-          "false_next" : "node_69"
+          "true_next" : "tbl_act_33",
+          "false_next" : "node_96"
         },
         {
-          "name" : "node_69",
-          "id" : 23,
+          "name" : "node_96",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 311,
@@ -16837,12 +20015,12 @@
               }
             }
           },
-          "true_next" : "node_70",
+          "true_next" : "node_97",
           "false_next" : "tbl_egress_next_set_mpls"
         },
         {
-          "name" : "node_70",
-          "id" : 24,
+          "name" : "node_97",
+          "id" : 33,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 312,
@@ -16864,8 +20042,8 @@
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_76",
-          "id" : 25,
+          "name" : "node_103",
+          "id" : 34,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 317,
@@ -16890,12 +20068,12 @@
               }
             }
           },
-          "true_next" : "node_77",
-          "false_next" : "node_79"
+          "true_next" : "node_104",
+          "false_next" : "node_106"
         },
         {
-          "name" : "node_77",
-          "id" : 26,
+          "name" : "node_104",
+          "id" : 35,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 319,
@@ -16917,11 +20095,11 @@
             }
           },
           "true_next" : "tbl_egress_next_push_vlan",
-          "false_next" : "node_79"
+          "false_next" : "node_106"
         },
         {
-          "name" : "node_79",
-          "id" : 27,
+          "name" : "node_106",
+          "id" : 36,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 325,
@@ -16939,12 +20117,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_26",
-          "false_next" : "node_83"
+          "true_next" : "tbl_act_36",
+          "false_next" : "node_110"
         },
         {
-          "name" : "node_81",
-          "id" : 28,
+          "name" : "node_108",
+          "id" : 37,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 327,
@@ -16965,12 +20143,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_27",
-          "false_next" : "node_91"
+          "true_next" : "tbl_act_37",
+          "false_next" : "node_118"
         },
         {
-          "name" : "node_83",
-          "id" : 29,
+          "name" : "node_110",
+          "id" : 38,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 329,
@@ -16988,12 +20166,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_28",
-          "false_next" : "node_87"
+          "true_next" : "tbl_act_38",
+          "false_next" : "node_114"
         },
         {
-          "name" : "node_85",
-          "id" : 30,
+          "name" : "node_112",
+          "id" : 39,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 331,
@@ -17014,12 +20192,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_29",
-          "false_next" : "node_91"
+          "true_next" : "tbl_act_39",
+          "false_next" : "node_118"
         },
         {
-          "name" : "node_87",
-          "id" : 31,
+          "name" : "node_114",
+          "id" : 40,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 334,
@@ -17037,12 +20215,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_30",
-          "false_next" : "node_91"
+          "true_next" : "tbl_act_40",
+          "false_next" : "node_118"
         },
         {
-          "name" : "node_89",
-          "id" : 32,
+          "name" : "node_116",
+          "id" : 41,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 336,
@@ -17063,12 +20241,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_31",
-          "false_next" : "node_91"
+          "true_next" : "tbl_act_41",
+          "false_next" : "node_118"
         },
         {
-          "name" : "node_91",
-          "id" : 33,
+          "name" : "node_118",
+          "id" : 42,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 227,
@@ -17090,11 +20268,37 @@
             }
           },
           "true_next" : "tbl_spgw_egress_gtpu_encap",
-          "false_next" : "node_93"
+          "false_next" : "node_120"
         },
         {
-          "name" : "node_93",
-          "id" : 34,
+          "name" : "node_120",
+          "id" : 43,
+          "source_info" : {
+            "filename" : "include/bng.p4",
+            "line" : 385,
+            "column" : 12,
+            "source_fragment" : "fmeta.bng.type == BNG_TYPE_DOWNSTREAM"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t._bng_type22"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x02"
+              }
+            }
+          },
+          "true_next" : "FabricEgress.bng_egress.downstream.t_session_encap",
+          "false_next" : "node_122"
+        },
+        {
+          "name" : "node_122",
+          "id" : 44,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 102,
@@ -17170,11 +20374,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_94"
+          "true_next" : "node_123"
         },
         {
-          "name" : "node_94",
-          "id" : 35,
+          "name" : "node_123",
+          "id" : 45,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 106,
@@ -17192,7 +20396,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_source22"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_source25"]
                   }
                 }
               },
@@ -17203,11 +20407,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_96"
+          "false_next" : "node_125"
         },
         {
-          "name" : "node_96",
-          "id" : 36,
+          "name" : "node_125",
+          "id" : 46,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 110,
@@ -17226,11 +20430,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_32"
+          "true_next" : "tbl_act_42"
         },
         {
-          "name" : "node_99",
-          "id" : 37,
+          "name" : "node_128",
+          "id" : 47,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 419,
@@ -17248,7 +20452,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit23"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit26"]
                   }
                 }
               },
@@ -17258,12 +20462,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_33",
-          "false_next" : "node_101"
+          "true_next" : "tbl_act_43",
+          "false_next" : "node_130"
         },
         {
-          "name" : "node_101",
-          "id" : 38,
+          "name" : "node_130",
+          "id" : 48,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -17283,11 +20487,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "false_next" : "node_111"
+          "false_next" : "node_140"
         },
         {
-          "name" : "node_105",
-          "id" : 39,
+          "name" : "node_134",
+          "id" : 49,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 427,
@@ -17305,12 +20509,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_35",
-          "false_next" : "node_107"
+          "true_next" : "tbl_act_45",
+          "false_next" : "node_136"
         },
         {
-          "name" : "node_107",
-          "id" : 40,
+          "name" : "node_136",
+          "id" : 50,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 430,
@@ -17328,12 +20532,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_36",
-          "false_next" : "node_109"
+          "true_next" : "tbl_act_46",
+          "false_next" : "node_138"
         },
         {
-          "name" : "node_109",
-          "id" : 41,
+          "name" : "node_138",
+          "id" : 51,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 433,
@@ -17351,12 +20555,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_37",
-          "false_next" : "node_111"
+          "true_next" : "tbl_act_47",
+          "false_next" : "node_140"
         },
         {
-          "name" : "node_111",
-          "id" : 42,
+          "name" : "node_140",
+          "id" : 52,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 115,
@@ -17378,11 +20582,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_report.tb_generate_report",
-          "false_next" : "node_113"
+          "false_next" : "node_142"
         },
         {
-          "name" : "node_113",
-          "id" : 43,
+          "name" : "node_142",
+          "id" : 53,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 119,
@@ -17400,7 +20604,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink24"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink27"]
                   }
                 }
               },
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
index 1f9c03c..eaff419 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
@@ -45,6 +45,258 @@
 }
 tables {
   preamble {
+    id: 33584710
+    name: "FabricIngress.bng_ingress.upstream.t_line_map"
+    alias: "t_line_map"
+  }
+  match_fields {
+    id: 1
+    name: "s_tag"
+    bitwidth: 12
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "c_tag"
+    bitwidth: 12
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  action_refs {
+    id: 16829434
+  }
+  const_default_action_id: 16819938
+  size: 8192
+}
+tables {
+  preamble {
+    id: 33603300
+    name: "FabricIngress.bng_ingress.upstream.t_pppoe_cp"
+    alias: "t_pppoe_cp"
+  }
+  match_fields {
+    id: 1
+    name: "pppoe_code"
+    bitwidth: 8
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "pppoe_protocol"
+    bitwidth: 16
+    match_type: TERNARY
+  }
+  action_refs {
+    id: 16830893
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 16819938
+  size: 16
+}
+tables {
+  preamble {
+    id: 33595047
+    name: "FabricIngress.bng_ingress.upstream.t_pppoe_term_v4"
+    alias: "t_pppoe_term_v4"
+  }
+  match_fields {
+    id: 1
+    name: "line_id"
+    bitwidth: 32
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "ipv4_src"
+    bitwidth: 32
+    match_type: EXACT
+  }
+  match_fields {
+    id: 3
+    name: "pppoe_session_id"
+    bitwidth: 16
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16780562
+  }
+  action_refs {
+    id: 16785853
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 16785853
+  size: 32768
+}
+tables {
+  preamble {
+    id: 33579386
+    name: "FabricIngress.bng_ingress.upstream.t_pppoe_term_v6"
+    alias: "t_pppoe_term_v6"
+  }
+  match_fields {
+    id: 1
+    name: "line_id"
+    bitwidth: 32
+    match_type: EXACT
+  }
+  match_fields {
+    id: 2
+    name: "ipv6_src_net_id"
+    bitwidth: 64
+    match_type: EXACT
+  }
+  match_fields {
+    id: 3
+    name: "pppoe_session_id"
+    bitwidth: 16
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16824882
+  }
+  action_refs {
+    id: 16785853
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  const_default_action_id: 16785853
+  size: 32768
+}
+tables {
+  preamble {
+    id: 33555367
+    name: "FabricIngress.bng_ingress.downstream.t_line_map_v4"
+    alias: "t_line_map_v4"
+  }
+  match_fields {
+    id: 1
+    name: "ipv4_dst"
+    bitwidth: 32
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  action_refs {
+    id: 16798636
+  }
+  action_refs {
+    id: 16842299
+  }
+  const_default_action_id: 16819938
+  size: 32768
+}
+tables {
+  preamble {
+    id: 33572185
+    name: "FabricIngress.bng_ingress.downstream.t_line_map_v6"
+    alias: "t_line_map_v6"
+  }
+  match_fields {
+    id: 1
+    name: "ipv6_dst_net_id"
+    bitwidth: 64
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  action_refs {
+    id: 16798636
+  }
+  action_refs {
+    id: 16842299
+  }
+  const_default_action_id: 16819938
+  size: 32768
+}
+tables {
+  preamble {
+    id: 33602462
+    name: "FabricIngress.bng_ingress.downstream.t_qos_v4"
+    alias: "t_qos_v4"
+  }
+  match_fields {
+    id: 1
+    name: "line_id"
+    bitwidth: 32
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 2
+    name: "ipv4_src"
+    bitwidth: 32
+    match_type: LPM
+  }
+  match_fields {
+    id: 3
+    name: "ipv4_dscp"
+    bitwidth: 6
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 4
+    name: "ipv4_ecn"
+    bitwidth: 2
+    match_type: TERNARY
+  }
+  action_refs {
+    id: 16830304
+  }
+  action_refs {
+    id: 16804676
+  }
+  const_default_action_id: 16804676
+  size: 256
+}
+tables {
+  preamble {
+    id: 33616597
+    name: "FabricIngress.bng_ingress.downstream.t_qos_v6"
+    alias: "t_qos_v6"
+  }
+  match_fields {
+    id: 1
+    name: "line_id"
+    bitwidth: 32
+    match_type: TERNARY
+  }
+  match_fields {
+    id: 2
+    name: "ipv6_src"
+    bitwidth: 128
+    match_type: LPM
+  }
+  match_fields {
+    id: 3
+    name: "ipv6_traffic_class"
+    bitwidth: 8
+    match_type: TERNARY
+  }
+  action_refs {
+    id: 16830304
+  }
+  action_refs {
+    id: 16804676
+  }
+  const_default_action_id: 16804676
+  size: 256
+}
+tables {
+  preamble {
     id: 33581620
     name: "FabricIngress.process_set_source_sink.tb_set_source"
     alias: "tb_set_source"
@@ -505,6 +757,32 @@
 }
 tables {
   preamble {
+    id: 33576241
+    name: "FabricEgress.bng_egress.downstream.t_session_encap"
+    alias: "t_session_encap"
+  }
+  match_fields {
+    id: 1
+    name: "line_id"
+    bitwidth: 32
+    match_type: EXACT
+  }
+  action_refs {
+    id: 16819938
+    annotations: "@defaultonly"
+    scope: DEFAULT_ONLY
+  }
+  action_refs {
+    id: 16784000
+  }
+  action_refs {
+    id: 16801306
+  }
+  const_default_action_id: 16819938
+  size: 8192
+}
+tables {
+  preamble {
     id: 33612258
     name: "FabricEgress.process_int_main.process_int_source.tb_int_source"
     alias: "tb_int_source"
@@ -645,6 +923,89 @@
 }
 actions {
   preamble {
+    id: 16829434
+    name: "FabricIngress.bng_ingress.upstream.set_line"
+    alias: "set_line"
+  }
+  params {
+    id: 1
+    name: "line_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16830893
+    name: "FabricIngress.bng_ingress.upstream.punt_to_cpu"
+    alias: "upstream.punt_to_cpu"
+  }
+}
+actions {
+  preamble {
+    id: 16785853
+    name: "FabricIngress.bng_ingress.upstream.term_disabled"
+    alias: "term_disabled"
+  }
+}
+actions {
+  preamble {
+    id: 16780562
+    name: "FabricIngress.bng_ingress.upstream.term_enabled_v4"
+    alias: "term_enabled_v4"
+  }
+}
+actions {
+  preamble {
+    id: 16824882
+    name: "FabricIngress.bng_ingress.upstream.term_enabled_v6"
+    alias: "term_enabled_v6"
+  }
+}
+actions {
+  preamble {
+    id: 16798636
+    name: "FabricIngress.bng_ingress.downstream.set_line_next"
+    alias: "set_line_next"
+  }
+  params {
+    id: 1
+    name: "line_id"
+    bitwidth: 32
+  }
+  params {
+    id: 2
+    name: "next_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16842299
+    name: "FabricIngress.bng_ingress.downstream.set_line_drop"
+    alias: "set_line_drop"
+  }
+  params {
+    id: 1
+    name: "line_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16830304
+    name: "FabricIngress.bng_ingress.downstream.qos_prio"
+    alias: "qos_prio"
+  }
+}
+actions {
+  preamble {
+    id: 16804676
+    name: "FabricIngress.bng_ingress.downstream.qos_besteff"
+    alias: "qos_besteff"
+  }
+}
+actions {
+  preamble {
     id: 16778827
     name: "FabricIngress.process_set_source_sink.int_set_source"
     alias: "int_set_source"
@@ -766,7 +1127,7 @@
   preamble {
     id: 16829684
     name: "FabricIngress.acl.punt_to_cpu"
-    alias: "punt_to_cpu"
+    alias: "acl.punt_to_cpu"
   }
 }
 actions {
@@ -969,6 +1330,40 @@
 }
 actions {
   preamble {
+    id: 16784000
+    name: "FabricEgress.bng_egress.downstream.encap_v4"
+    alias: "encap_v4"
+  }
+  params {
+    id: 1
+    name: "c_tag"
+    bitwidth: 12
+  }
+  params {
+    id: 2
+    name: "pppoe_session_id"
+    bitwidth: 16
+  }
+}
+actions {
+  preamble {
+    id: 16801306
+    name: "FabricEgress.bng_egress.downstream.encap_v6"
+    alias: "encap_v6"
+  }
+  params {
+    id: 1
+    name: "c_tag"
+    bitwidth: 12
+  }
+  params {
+    id: 2
+    name: "pppoe_session_id"
+    bitwidth: 16
+  }
+}
+actions {
+  preamble {
     id: 16785857
     name: "FabricEgress.process_int_main.process_int_source.int_source_dscp"
     alias: "int_source_dscp"
@@ -1058,6 +1453,50 @@
 }
 counters {
   preamble {
+    id: 302022672
+    name: "FabricIngress.bng_ingress.upstream.c_terminated"
+    alias: "c_terminated"
+  }
+  spec {
+    unit: PACKETS
+  }
+  size: 8192
+}
+counters {
+  preamble {
+    id: 302043418
+    name: "FabricIngress.bng_ingress.upstream.c_dropped"
+    alias: "c_dropped"
+  }
+  spec {
+    unit: PACKETS
+  }
+  size: 8192
+}
+counters {
+  preamble {
+    id: 302008909
+    name: "FabricIngress.bng_ingress.upstream.c_control"
+    alias: "c_control"
+  }
+  spec {
+    unit: PACKETS
+  }
+  size: 8192
+}
+counters {
+  preamble {
+    id: 302004781
+    name: "FabricIngress.bng_ingress.downstream.c_line_rx"
+    alias: "c_line_rx"
+  }
+  spec {
+    unit: BOTH
+  }
+  size: 8192
+}
+counters {
+  preamble {
     id: 302011205
     name: "FabricIngress.port_counters_control.egress_port_counter"
     alias: "egress_port_counter"
@@ -1078,6 +1517,17 @@
   }
   size: 511
 }
+counters {
+  preamble {
+    id: 302046535
+    name: "FabricEgress.bng_egress.downstream.c_line_tx"
+    alias: "c_line_tx"
+  }
+  spec {
+    unit: BOTH
+  }
+  size: 8192
+}
 direct_counters {
   preamble {
     id: 318781522
@@ -1265,6 +1715,28 @@
   }
   direct_table_id: 33599342
 }
+meters {
+  preamble {
+    id: 335569952
+    name: "FabricIngress.bng_ingress.downstream.m_besteff"
+    alias: "m_besteff"
+  }
+  spec {
+    unit: BYTES
+  }
+  size: 8192
+}
+meters {
+  preamble {
+    id: 335568260
+    name: "FabricIngress.bng_ingress.downstream.m_prio"
+    alias: "m_prio"
+  }
+  spec {
+    unit: BYTES
+  }
+  size: 8192
+}
 controller_packet_metadata {
   preamble {
     id: 67146229
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
index ff14cae..687353a 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
@@ -438,13 +438,13 @@
   "header_union_stacks" : [],
   "field_lists" : [],
   "errors" : [
-    ["NoError", 0],
-    ["PacketTooShort", 1],
-    ["NoMatch", 2],
-    ["StackOutOfBounds", 3],
-    ["HeaderTooShort", 4],
-    ["ParserTimeout", 5],
-    ["ParserInvalidArgument", 6]
+    ["NoError", 1],
+    ["PacketTooShort", 2],
+    ["NoMatch", 3],
+    ["StackOutOfBounds", 4],
+    ["HeaderTooShort", 5],
+    ["ParserTimeout", 6],
+    ["ParserInvalidArgument", 7]
   ],
   "enums" : [],
   "parsers" : [
@@ -1055,7 +1055,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 243,
+        "line" : 260,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
@@ -2652,7 +2652,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 147,
+            "line" : 152,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -3070,7 +3070,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 143,
+            "line" : 148,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -9906,7 +9906,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 42,
+        "line" : 46,
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
@@ -10689,7 +10689,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 67,
+            "line" : 74,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_forwarding == false"
           },
@@ -10800,7 +10800,7 @@
           "id" : 7,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 71,
+            "line" : 78,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_next == false"
           },
@@ -10887,7 +10887,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 85,
+        "line" : 92,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
index a2854f0..9d422da 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
@@ -498,13 +498,13 @@
   "header_union_stacks" : [],
   "field_lists" : [],
   "errors" : [
-    ["NoError", 0],
-    ["PacketTooShort", 1],
-    ["NoMatch", 2],
-    ["StackOutOfBounds", 3],
-    ["HeaderTooShort", 4],
-    ["ParserTimeout", 5],
-    ["ParserInvalidArgument", 6]
+    ["NoError", 1],
+    ["PacketTooShort", 2],
+    ["NoMatch", 3],
+    ["StackOutOfBounds", 4],
+    ["HeaderTooShort", 5],
+    ["ParserTimeout", 6],
+    ["ParserInvalidArgument", 7]
   ],
   "enums" : [],
   "parsers" : [
@@ -1309,7 +1309,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 243,
+        "line" : 260,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
@@ -2766,7 +2766,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 50,
             "source_fragment" : "hdr.gtpu_ipv4"
           }
@@ -2781,7 +2781,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 65,
             "source_fragment" : "hdr.gtpu_udp"
           }
@@ -3213,7 +3213,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 137,
+            "line" : 142,
             "column" : 36,
             "source_fragment" : "2w1; ..."
           }
@@ -3299,7 +3299,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 138,
+            "line" : 143,
             "column" : 38,
             "source_fragment" : "2w2; ..."
           }
@@ -3325,7 +3325,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 136,
+            "line" : 141,
             "column" : 37,
             "source_fragment" : "2w0; ..."
           }
@@ -3616,7 +3616,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 124,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -3772,7 +3772,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 132,
+            "line" : 137,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -3791,7 +3791,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 121,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -4225,7 +4225,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 147,
+            "line" : 152,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -4643,7 +4643,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 143,
+            "line" : 148,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -11479,7 +11479,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 42,
+        "line" : 46,
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
@@ -11490,7 +11490,7 @@
           "id" : 0,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 50,
             "source_fragment" : "hdr.gtpu_ipv4, hdr.gtpu_udp"
           },
@@ -12941,7 +12941,7 @@
           "id" : 10,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 67,
+            "line" : 74,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_forwarding == false"
           },
@@ -13052,7 +13052,7 @@
           "id" : 14,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 71,
+            "line" : 78,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_next == false"
           },
@@ -13139,7 +13139,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 85,
+        "line" : 92,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
index 860a5a3..ca5fc41 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
@@ -313,13 +313,13 @@
   "header_union_stacks" : [],
   "field_lists" : [],
   "errors" : [
-    ["NoError", 0],
-    ["PacketTooShort", 1],
-    ["NoMatch", 2],
-    ["StackOutOfBounds", 3],
-    ["HeaderTooShort", 4],
-    ["ParserTimeout", 5],
-    ["ParserInvalidArgument", 6]
+    ["NoError", 1],
+    ["PacketTooShort", 2],
+    ["NoMatch", 3],
+    ["StackOutOfBounds", 4],
+    ["HeaderTooShort", 5],
+    ["ParserTimeout", 6],
+    ["ParserInvalidArgument", 7]
   ],
   "enums" : [],
   "parsers" : [
@@ -995,7 +995,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 243,
+        "line" : 260,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
@@ -2386,7 +2386,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 50,
             "source_fragment" : "hdr.gtpu_ipv4"
           }
@@ -2401,7 +2401,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 65,
             "source_fragment" : "hdr.gtpu_udp"
           }
@@ -2833,7 +2833,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 137,
+            "line" : 142,
             "column" : 36,
             "source_fragment" : "2w1; ..."
           }
@@ -2919,7 +2919,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 138,
+            "line" : 143,
             "column" : 38,
             "source_fragment" : "2w2; ..."
           }
@@ -2945,7 +2945,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 136,
+            "line" : 141,
             "column" : 37,
             "source_fragment" : "2w0; ..."
           }
@@ -3212,7 +3212,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 119,
+            "line" : 124,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -3368,7 +3368,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 132,
+            "line" : 137,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -3387,7 +3387,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 116,
+            "line" : 121,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -4388,7 +4388,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 42,
+        "line" : 46,
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
@@ -4399,7 +4399,7 @@
           "id" : 0,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 50,
             "source_fragment" : "hdr.gtpu_ipv4, hdr.gtpu_udp"
           },
@@ -5813,7 +5813,7 @@
           "id" : 10,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 67,
+            "line" : 74,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_forwarding == false"
           },
@@ -5924,7 +5924,7 @@
           "id" : 14,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 71,
+            "line" : 78,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_next == false"
           },
@@ -6011,7 +6011,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 85,
+        "line" : 92,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
index 8d2dfe1..1e4d514 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
@@ -253,13 +253,13 @@
   "header_union_stacks" : [],
   "field_lists" : [],
   "errors" : [
-    ["NoError", 0],
-    ["PacketTooShort", 1],
-    ["NoMatch", 2],
-    ["StackOutOfBounds", 3],
-    ["HeaderTooShort", 4],
-    ["ParserTimeout", 5],
-    ["ParserInvalidArgument", 6]
+    ["NoError", 1],
+    ["PacketTooShort", 2],
+    ["NoMatch", 3],
+    ["StackOutOfBounds", 4],
+    ["HeaderTooShort", 5],
+    ["ParserTimeout", 6],
+    ["ParserInvalidArgument", 7]
   ],
   "enums" : [],
   "parsers" : [
@@ -754,7 +754,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 243,
+        "line" : 260,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
@@ -2828,7 +2828,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 42,
+        "line" : 46,
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
@@ -3574,7 +3574,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 67,
+            "line" : 74,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_forwarding == false"
           },
@@ -3685,7 +3685,7 @@
           "id" : 7,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 71,
+            "line" : 78,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_next == false"
           },
@@ -3772,7 +3772,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 85,
+        "line" : 92,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },