diff --git a/backends/ebpf/psa/examples/bng.p4info.txtpb b/backends/ebpf/psa/examples/bng.p4info.txtpb
index 091108ac0f9..2ceee929b86 100644
--- a/backends/ebpf/psa/examples/bng.p4info.txtpb
+++ b/backends/ebpf/psa/examples/bng.p4info.txtpb
@@ -47,6 +47,9 @@ tables {
     id: 17049673
   }
   const_default_action_id: 28724955
+  initial_default_action {
+    action_id: 28724955
+  }
   size: 8192
 }
 tables {
@@ -86,6 +89,13 @@ tables {
     id: 17126659
   }
   const_default_action_id: 17126659
+  initial_default_action {
+    action_id: 17126659
+    arguments {
+      param_id: 1
+      value: "\000"
+    }
+  }
   size: 1024
 }
 tables {
@@ -108,6 +118,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -137,6 +150,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -161,6 +177,13 @@ tables {
     id: 27019812
   }
   const_default_action_id: 27019812
+  initial_default_action {
+    action_id: 27019812
+    arguments {
+      param_id: 1
+      value: "\000\000\000\000"
+    }
+  }
   size: 8192
 }
 tables {
@@ -184,6 +207,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 16
 }
 tables {
@@ -219,6 +245,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21552277
+  initial_default_action {
+    action_id: 21552277
+  }
   size: 32768
 }
 tables {
@@ -245,6 +274,9 @@ tables {
     id: 33281717
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 8192
 }
 tables {
@@ -284,6 +316,9 @@ tables {
     id: 23799701
   }
   const_default_action_id: 23799701
+  initial_default_action {
+    action_id: 23799701
+  }
   size: 256
 }
 tables {
@@ -319,6 +354,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 20119496
+  initial_default_action {
+    action_id: 20119496
+  }
   size: 1024
 }
 actions {
diff --git a/backends/ebpf/psa/examples/l2l3-acl.p4info.txtpb b/backends/ebpf/psa/examples/l2l3-acl.p4info.txtpb
index db7a0c0de3c..d4ddb4f086d 100644
--- a/backends/ebpf/psa/examples/l2l3-acl.p4info.txtpb
+++ b/backends/ebpf/psa/examples/l2l3-acl.p4info.txtpb
@@ -31,6 +31,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -52,6 +55,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 24963522
+  initial_default_action {
+    action_id: 24963522
+  }
   size: 1024
 }
 tables {
@@ -75,6 +81,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -97,6 +106,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 286177969
   size: 1024
 }
@@ -129,6 +141,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -174,6 +189,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -202,6 +220,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 330499363
   size: 1024
 }
diff --git a/backends/ebpf/psa/examples/upf.p4info.txtpb b/backends/ebpf/psa/examples/upf.p4info.txtpb
index 937103e69e7..f8e96a303cc 100644
--- a/backends/ebpf/psa/examples/upf.p4info.txtpb
+++ b/backends/ebpf/psa/examples/upf.p4info.txtpb
@@ -27,6 +27,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 512
 }
 tables {
@@ -52,6 +55,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 512
 }
 tables {
@@ -86,6 +92,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
@@ -114,6 +123,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
+  initial_default_action {
+    action_id: 28485346
+  }
   size: 1024
 }
 tables {
@@ -137,6 +149,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
+  initial_default_action {
+    action_id: 28485346
+  }
   size: 1024
 }
 tables {
@@ -158,6 +173,9 @@ tables {
     id: 28485346
   }
   const_default_action_id: 28485346
+  initial_default_action {
+    action_id: 28485346
+  }
   size: 1024
 }
 tables {
@@ -217,6 +235,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 19604500
+  initial_default_action {
+    action_id: 19604500
+  }
   size: 1024
 }
 tables {
@@ -241,6 +262,9 @@ tables {
     id: 19604500
   }
   const_default_action_id: 19604500
+  initial_default_action {
+    action_id: 19604500
+  }
   size: 1024
 }
 tables {
@@ -268,6 +292,9 @@ tables {
     id: 23916784
   }
   const_default_action_id: 23916784
+  initial_default_action {
+    action_id: 23916784
+  }
   size: 1024
 }
 actions {
diff --git a/backends/ebpf/tests/p4testdata/action-profile2.p4info.txtpb b/backends/ebpf/tests/p4testdata/action-profile2.p4info.txtpb
index 43db0560ce0..993b33ff64d 100644
--- a/backends/ebpf/tests/p4testdata/action-profile2.p4info.txtpb
+++ b/backends/ebpf/tests/p4testdata/action-profile2.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 298015716
   size: 1024
 }
@@ -49,6 +52,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 298015716
   size: 1024
 }
diff --git a/backends/ebpf/tests/p4testdata/action-selector2.p4info.txtpb b/backends/ebpf/tests/p4testdata/action-selector2.p4info.txtpb
index 5d8be1f2270..ac8dbc695d5 100644
--- a/backends/ebpf/tests/p4testdata/action-selector2.p4info.txtpb
+++ b/backends/ebpf/tests/p4testdata/action-selector2.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 30183046
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 294316857
   size: 1024
 }
@@ -43,6 +46,9 @@ tables {
   action_refs {
     id: 30183046
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 294316857
   size: 1024
 }
diff --git a/backends/ebpf/tests/p4testdata/counters.p4info.txtpb b/backends/ebpf/tests/p4testdata/counters.p4info.txtpb
index fd3a005e17d..34ee57a2b67 100644
--- a/backends/ebpf/tests/p4testdata/counters.p4info.txtpb
+++ b/backends/ebpf/tests/p4testdata/counters.p4info.txtpb
@@ -28,6 +28,13 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 30696436
+    arguments {
+      param_id: 1
+      value: "\000\000\000\005"
+    }
+  }
   size: 100
 }
 actions {
diff --git a/backends/ebpf/tests/p4testdata/meters-direct.p4info.txtpb b/backends/ebpf/tests/p4testdata/meters-direct.p4info.txtpb
index 851a90bf221..205f9cb03eb 100644
--- a/backends/ebpf/tests/p4testdata/meters-direct.p4info.txtpb
+++ b/backends/ebpf/tests/p4testdata/meters-direct.p4info.txtpb
@@ -25,6 +25,13 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 30696436
+    arguments {
+      param_id: 1
+      value: "\000\000\000\006"
+    }
+  }
   direct_resource_ids: 358755246
   size: 100
 }
diff --git a/testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.p4info.txtpb b/testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.p4info.txtpb
index 32e70c7db92..94971d563a0 100644
--- a/testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.p4info.txtpb
+++ b/testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.p4info.txtpb
@@ -23,6 +23,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -44,6 +47,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_errors_outputs/issue532.p4.p4info.txtpb b/testdata/p4_16_errors_outputs/issue532.p4.p4info.txtpb
index 102d122c522..4c76c6b2ef0 100644
--- a/testdata/p4_16_errors_outputs/issue532.p4.p4info.txtpb
+++ b/testdata/p4_16_errors_outputs/issue532.p4.p4info.txtpb
@@ -17,6 +17,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.p4info.txtpb b/testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.p4info.txtpb
index 1693608bd91..9bdad5d3968 100644
--- a/testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.p4info.txtpb
+++ b/testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 17165658
   }
+  initial_default_action {
+    action_id: 21186165
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_errors_outputs/table-entries-optional-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_errors_outputs/table-entries-optional-2-bmv2.p4.p4info.txtpb
index 16fea8f083b..4108cf322f9 100644
--- a/testdata/p4_16_errors_outputs/table-entries-optional-2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_errors_outputs/table-entries-optional-2-bmv2.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 17165658
   }
+  initial_default_action {
+    action_id: 21186165
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/action-two-params.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action-two-params.p4.p4info.txtpb
index 908f12a1cba..0cbbd5f6938 100644
--- a/testdata/p4_16_samples_outputs/action-two-params.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/action-two-params.p4.p4info.txtpb
@@ -23,6 +23,9 @@ tables {
     id: 25652968
   }
   const_default_action_id: 25652968
+  initial_default_action {
+    action_id: 25652968
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/action_call_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action_call_ubpf.p4.p4info.txtpb
index 747112451c2..d40f0a8377b 100644
--- a/testdata/p4_16_samples_outputs/action_call_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/action_call_ubpf.p4.p4info.txtpb
@@ -19,6 +19,13 @@ tables {
   action_refs {
     id: 26966999
   }
+  initial_default_action {
+    action_id: 16865584
+    arguments {
+      param_id: 1
+      value: "\000"
+    }
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.p4info.txtpb
index 83a6b066d04..199aca959c4 100644
--- a/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.p4info.txtpb
@@ -17,6 +17,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 294074782
   size: 1024
 }
@@ -33,6 +36,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 300324846
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.p4info.txtpb
index d83ae9ac0f6..523ba82ca5a 100644
--- a/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.p4info.txtpb
@@ -17,6 +17,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 294074782
   size: 1024
 }
@@ -33,6 +36,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 300324846
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/action_profile_sum_of_members_annotation.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action_profile_sum_of_members_annotation.p4.p4info.txtpb
index 80ac7dd7235..46f41893341 100644
--- a/testdata/p4_16_samples_outputs/action_profile_sum_of_members_annotation.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/action_profile_sum_of_members_annotation.p4.p4info.txtpb
@@ -17,6 +17,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 289199568
   size: 1024
 }
@@ -33,6 +36,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 285903678
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.p4info.txtpb
index 097e2ec7760..c0662170ebb 100644
--- a/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.p4info.txtpb
@@ -17,6 +17,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 291652621
   size: 1024
 }
@@ -33,6 +36,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 291652621
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.p4info.txtpb
index e07c4fb0fe3..07fb9890cb7 100644
--- a/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.p4info.txtpb
@@ -17,6 +17,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/arith-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith-bmv2.p4.p4info.txtpb
index 29a3be03d2d..d193270eb70 100644
--- a/testdata/p4_16_samples_outputs/arith-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/arith-bmv2.p4.p4info.txtpb
@@ -14,6 +14,9 @@ tables {
     id: 20728178
   }
   const_default_action_id: 20728178
+  initial_default_action {
+    action_id: 20728178
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.p4info.txtpb
index ddadf42bc63..6276106d6fc 100644
--- a/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.p4info.txtpb
@@ -14,6 +14,9 @@ tables {
     id: 29022044
   }
   const_default_action_id: 29022044
+  initial_default_action {
+    action_id: 29022044
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/arith1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith1-bmv2.p4.p4info.txtpb
index e9a7c87335a..3973f71eca5 100644
--- a/testdata/p4_16_samples_outputs/arith1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/arith1-bmv2.p4.p4info.txtpb
@@ -14,6 +14,9 @@ tables {
     id: 25073243
   }
   const_default_action_id: 25073243
+  initial_default_action {
+    action_id: 25073243
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/arith2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith2-bmv2.p4.p4info.txtpb
index e9a7c87335a..3973f71eca5 100644
--- a/testdata/p4_16_samples_outputs/arith2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/arith2-bmv2.p4.p4info.txtpb
@@ -14,6 +14,9 @@ tables {
     id: 25073243
   }
   const_default_action_id: 25073243
+  initial_default_action {
+    action_id: 25073243
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/arith3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith3-bmv2.p4.p4info.txtpb
index 62774f2d1e8..0b04e67e062 100644
--- a/testdata/p4_16_samples_outputs/arith3-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/arith3-bmv2.p4.p4info.txtpb
@@ -14,6 +14,9 @@ tables {
     id: 32554999
   }
   const_default_action_id: 32554999
+  initial_default_action {
+    action_id: 32554999
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/arith4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith4-bmv2.p4.p4info.txtpb
index 62774f2d1e8..0b04e67e062 100644
--- a/testdata/p4_16_samples_outputs/arith4-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/arith4-bmv2.p4.p4info.txtpb
@@ -14,6 +14,9 @@ tables {
     id: 32554999
   }
   const_default_action_id: 32554999
+  initial_default_action {
+    action_id: 32554999
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/arith5-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith5-bmv2.p4.p4info.txtpb
index 62774f2d1e8..0b04e67e062 100644
--- a/testdata/p4_16_samples_outputs/arith5-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/arith5-bmv2.p4.p4info.txtpb
@@ -14,6 +14,9 @@ tables {
     id: 32554999
   }
   const_default_action_id: 32554999
+  initial_default_action {
+    action_id: 32554999
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/basic2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/basic2-bmv2.p4.p4info.txtpb
index e8156b06312..bed07b33cb1 100644
--- a/testdata/p4_16_samples_outputs/basic2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/basic2-bmv2.p4.p4info.txtpb
@@ -32,6 +32,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.p4info.txtpb
index 7033385f7e1..fc7a0562067 100644
--- a/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 65536
 }
 tables {
@@ -55,6 +58,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 131072
 }
 tables {
@@ -86,6 +92,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 16384
 }
 tables {
@@ -111,6 +120,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 32768
 }
 tables {
@@ -133,6 +145,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 32768
 }
 tables {
@@ -158,6 +173,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 32768
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.p4info.txtpb
index 4ed10559c15..15090f20fbc 100644
--- a/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 17165658
   }
+  initial_default_action {
+    action_id: 21186165
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.p4info.txtpb
index eaa0bc5ef6a..79cc89957c6 100644
--- a/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.p4info.txtpb
@@ -23,6 +23,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
@@ -46,6 +49,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.p4info.txtpb
index ce33ebd07b1..d6a77910f69 100644
--- a/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 25131402
   }
+  initial_default_action {
+    action_id: 25131402
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/concat-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/concat-bmv2.p4.p4info.txtpb
index 77cf8912f75..02191f93b14 100644
--- a/testdata/p4_16_samples_outputs/concat-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/concat-bmv2.p4.p4info.txtpb
@@ -14,6 +14,9 @@ tables {
     id: 30378945
   }
   const_default_action_id: 30378945
+  initial_default_action {
+    action_id: 30378945
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.p4info.txtpb
index 4cfc1acc62a..a6b825e4bd7 100644
--- a/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/copyprop1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/copyprop1.p4.p4info.txtpb
index 8adb84a3404..775e2680bdd 100644
--- a/testdata/p4_16_samples_outputs/copyprop1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/copyprop1.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/crc32-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/crc32-bmv2.p4.p4info.txtpb
index 3af394a4c07..13b6a278270 100644
--- a/testdata/p4_16_samples_outputs/crc32-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/crc32-bmv2.p4.p4info.txtpb
@@ -38,6 +38,9 @@ tables {
     id: 32121835
   }
   const_default_action_id: 32121835
+  initial_default_action {
+    action_id: 32121835
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.p4info.txtpb
index 5e45df90b2f..5290a11db40 100644
--- a/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.p4info.txtpb
@@ -29,6 +29,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/dash/dash-pipeline-v1model-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/dash/dash-pipeline-v1model-bmv2.p4.p4info.txtpb
index 3f4798bbd96..7785cab3cb7 100644
--- a/testdata/p4_16_samples_outputs/dash/dash-pipeline-v1model-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/dash/dash-pipeline-v1model-bmv2.p4.p4info.txtpb
@@ -59,6 +59,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 23563653
+  initial_default_action {
+    action_id: 23563653
+  }
   size: 1024
 }
 tables {
@@ -92,6 +95,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -155,6 +161,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 23563653
+  initial_default_action {
+    action_id: 23563653
+  }
   size: 1024
 }
 tables {
@@ -229,6 +238,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 23563653
+  initial_default_action {
+    action_id: 23563653
+  }
   size: 1024
 }
 tables {
@@ -323,6 +335,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 23563653
+  initial_default_action {
+    action_id: 23563653
+  }
   size: 1024
 }
 tables {
@@ -385,6 +400,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -436,6 +454,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21063902
+  initial_default_action {
+    action_id: 21063902
+  }
   size: 1024
 }
 tables {
@@ -499,6 +520,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 20772460
+  initial_default_action {
+    action_id: 20772460
+  }
   size: 1024
 }
 tables {
@@ -734,6 +758,9 @@ tables {
   action_refs {
     id: 26077229
   }
+  initial_default_action {
+    action_id: 29962337
+  }
   direct_resource_ids: 324963620
   size: 1024
 }
@@ -970,6 +997,9 @@ tables {
   action_refs {
     id: 26077229
   }
+  initial_default_action {
+    action_id: 29962337
+  }
   direct_resource_ids: 334749261
   size: 1024
 }
@@ -1206,6 +1236,9 @@ tables {
   action_refs {
     id: 26077229
   }
+  initial_default_action {
+    action_id: 29962337
+  }
   direct_resource_ids: 320450761
   size: 1024
 }
@@ -1299,6 +1332,9 @@ tables {
     id: 18759588
   }
   const_default_action_id: 18759588
+  initial_default_action {
+    action_id: 18759588
+  }
   direct_resource_ids: 331716030
   size: 1024
 }
@@ -1388,6 +1424,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 18759588
+  initial_default_action {
+    action_id: 18759588
+  }
   direct_resource_ids: 334791879
   size: 1024
 }
@@ -1445,6 +1484,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -1680,6 +1722,9 @@ tables {
   action_refs {
     id: 31424218
   }
+  initial_default_action {
+    action_id: 28146588
+  }
   direct_resource_ids: 320981527
   size: 1024
 }
@@ -1916,6 +1961,9 @@ tables {
   action_refs {
     id: 31424218
   }
+  initial_default_action {
+    action_id: 28146588
+  }
   direct_resource_ids: 322865948
   size: 1024
 }
@@ -2152,6 +2200,9 @@ tables {
   action_refs {
     id: 31424218
   }
+  initial_default_action {
+    action_id: 28146588
+  }
   direct_resource_ids: 328370481
   size: 1024
 }
@@ -2214,6 +2265,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -2265,6 +2319,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -2363,6 +2420,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -2432,6 +2492,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -2483,6 +2546,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 321751294
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/def-use.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/def-use.p4.p4info.txtpb
index 616d9801aaa..2fc1eacbd9d 100644
--- a/testdata/p4_16_samples_outputs/def-use.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/def-use.p4.p4info.txtpb
@@ -13,6 +13,9 @@ tables {
   action_refs {
     id: 21913698
   }
+  initial_default_action {
+    action_id: 21913698
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/default-action-arg-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/default-action-arg-bmv2.p4.p4info.txtpb
index 60ec69e011d..7efe605032f 100644
--- a/testdata/p4_16_samples_outputs/default-action-arg-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/default-action-arg-bmv2.p4.p4info.txtpb
@@ -20,6 +20,17 @@ tables {
     id: 29022044
   }
   const_default_action_id: 29022044
+  initial_default_action {
+    action_id: 29022044
+    arguments {
+      param_id: 1
+      value: "\000\000\000\n"
+    }
+    arguments {
+      param_id: 2
+      value: "\000\000\000\000"
+    }
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/default_action-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/default_action-bmv2.p4.p4info.txtpb
index 1dce9d362fb..c1ad560760a 100644
--- a/testdata/p4_16_samples_outputs/default_action-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/default_action-bmv2.p4.p4info.txtpb
@@ -14,6 +14,13 @@ tables {
     id: 29022044
   }
   const_default_action_id: 29022044
+  initial_default_action {
+    action_id: 29022044
+    arguments {
+      param_id: 1
+      value: "\000\000\000\n"
+    }
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/default_action_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/default_action_ubpf.p4.p4info.txtpb
index 45005334560..31a1da9611b 100644
--- a/testdata/p4_16_samples_outputs/default_action_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/default_action_ubpf.p4.p4info.txtpb
@@ -13,6 +13,13 @@ tables {
   action_refs {
     id: 23144899
   }
+  initial_default_action {
+    action_id: 23144899
+    arguments {
+      param_id: 1
+      value: "\000\000\000\n"
+    }
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/drop-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/drop-bmv2.p4.p4info.txtpb
index ead32dc500d..d672decd957 100644
--- a/testdata/p4_16_samples_outputs/drop-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/drop-bmv2.p4.p4info.txtpb
@@ -14,6 +14,9 @@ tables {
     id: 18759588
   }
   const_default_action_id: 18759588
+  initial_default_action {
+    action_id: 18759588
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.p4info.txtpb
index b06fa2c5d91..82d80cc916b 100644
--- a/testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.p4info.txtpb
@@ -38,6 +38,9 @@ tables {
     id: 24266015
   }
   const_default_action_id: 17164167
+  initial_default_action {
+    action_id: 17164167
+  }
   direct_resource_ids: 326221069
   size: 1024
 }
@@ -69,6 +72,13 @@ tables {
     id: 25032921
   }
   const_default_action_id: 25032921
+  initial_default_action {
+    action_id: 25032921
+    arguments {
+      param_id: 1
+      value: "\000"
+    }
+  }
   direct_resource_ids: 335473470
   size: 1024
 }
@@ -99,6 +109,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
+  initial_default_action {
+    action_id: 28485346
+  }
   direct_resource_ids: 330959985
   size: 1024
 }
@@ -123,6 +136,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
+  initial_default_action {
+    action_id: 28485346
+  }
   direct_resource_ids: 318961579
   size: 1024
 }
@@ -150,6 +166,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
+  initial_default_action {
+    action_id: 28485346
+  }
   direct_resource_ids: 333425635
   size: 1024
 }
@@ -247,6 +266,9 @@ tables {
     id: 29607214
   }
   const_default_action_id: 29607214
+  initial_default_action {
+    action_id: 29607214
+  }
   direct_resource_ids: 319194241
   size: 1024
 }
@@ -271,6 +293,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
+  initial_default_action {
+    action_id: 28485346
+  }
   direct_resource_ids: 326370320
   size: 1024
 }
@@ -304,6 +329,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
+  initial_default_action {
+    action_id: 28485346
+  }
   direct_resource_ids: 321989420
   size: 1024
 }
@@ -334,6 +362,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
+  initial_default_action {
+    action_id: 28485346
+  }
   implementation_id: 291115404
   direct_resource_ids: 322798228
   size: 1024
@@ -359,6 +390,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
+  initial_default_action {
+    action_id: 28485346
+  }
   direct_resource_ids: 319194968
   size: 1024
 }
@@ -383,6 +417,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
+  initial_default_action {
+    action_id: 28485346
+  }
   direct_resource_ids: 334575698
   size: 1024
 }
@@ -402,6 +439,9 @@ tables {
     id: 28485346
   }
   const_default_action_id: 28485346
+  initial_default_action {
+    action_id: 28485346
+  }
   size: 1024
 }
 tables {
@@ -431,6 +471,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28485346
+  initial_default_action {
+    action_id: 28485346
+  }
   direct_resource_ids: 318892680
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.p4info.txtpb
index 7ec1dd5f264..446d6c761ff 100644
--- a/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 33281717
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.p4info.txtpb
index f6f0ac9972e..c8cabd596a9 100644
--- a/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -48,6 +51,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 16384
 }
 tables {
@@ -62,6 +68,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -85,6 +94,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 512
 }
 tables {
@@ -99,6 +111,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -122,6 +137,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 256
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.p4info.txtpb
index 09213a032d1..3c21a1295d8 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.p4info.txtpb
index 9a4f8a1b232..45153d08c09 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.p4info.txtpb
index 4edd46d542c..5fe1c80fdf5 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.p4info.txtpb
index b46cd7b7a7b..12192fe8819 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.p4info.txtpb
index fd308934fa3..0042ba8ca68 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.p4info.txtpb
index c6991d20a2b..fe9a0218b5b 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.p4info.txtpb
index 672dd7c0270..d885a15b7c5 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.p4info.txtpb
index dc34c0f3e5b..d230e790962 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.p4info.txtpb
index 14fe5675e29..b8a40a9449e 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -46,6 +49,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.p4info.txtpb
index da58ddfecb6..0756a671747 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.p4info.txtpb
index 0387a5ea8fc..ef8d2349795 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.p4info.txtpb
index 439fdd83ac4..8bf1426336d 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.p4info.txtpb
index 167055d8651..184cb8dee63 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.p4info.txtpb
index 954f9302351..7482116e544 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.p4info.txtpb
index 6335e986db3..94f6cd6ef64 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.p4info.txtpb
index d15d7f39246..f6b65cfd7a2 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.p4info.txtpb
index 6dbbb04c2e4..f671454231b 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.p4info.txtpb
index 3916da78de4..f9016eb27ed 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.p4info.txtpb
index eac31d11dc1..207cce7419b 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.p4info.txtpb
index 098a163ce5d..97e11411570 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.p4info.txtpb
index fe58351d5ae..6679d822388 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.p4info.txtpb
@@ -15,6 +15,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.p4info.txtpb
index c03ae60e4f1..2427fbfd29a 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.p4info.txtpb
index dc15762b635..0da506e8415 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.p4info.txtpb
@@ -27,6 +27,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.p4info.txtpb
index 42972d745ec..0a4c2014757 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -41,6 +44,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.p4info.txtpb
index 1b7a0ad10b0..fd979d15799 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.p4info.txtpb
@@ -27,6 +27,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.p4info.txtpb
index f2fe672ed8c..56e04b73347 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.p4info.txtpb
@@ -27,6 +27,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.p4info.txtpb
index 92557c02569..2b455398b15 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.p4info.txtpb
index b4f4b802538..0d9c882704e 100644
--- a/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.p4info.txtpb
index dac37ed60b6..9d7811dbe7c 100644
--- a/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.p4info.txtpb
@@ -21,6 +21,9 @@ tables {
     id: 16785644
   }
   const_default_action_id: 16785644
+  initial_default_action {
+    action_id: 16785644
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.p4info.txtpb
index a4f1a040523..a9ee45fc368 100644
--- a/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.p4info.txtpb
@@ -13,6 +13,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.p4info.txtpb
index 96fcc8aa477..a64eec7a5af 100644
--- a/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 26776898
   }
+  initial_default_action {
+    action_id: 25218163
+  }
   size: 1024
   has_initial_entries: true
 }
@@ -55,6 +58,9 @@ tables {
   action_refs {
     id: 26776898
   }
+  initial_default_action {
+    action_id: 25218163
+  }
   size: 1024
   has_initial_entries: true
 }
@@ -82,6 +88,9 @@ tables {
   action_refs {
     id: 26776898
   }
+  initial_default_action {
+    action_id: 25218163
+  }
   size: 1024
   has_initial_entries: true
 }
@@ -109,6 +118,9 @@ tables {
   action_refs {
     id: 26776898
   }
+  initial_default_action {
+    action_id: 25218163
+  }
   size: 1024
   has_initial_entries: true
 }
@@ -136,6 +148,9 @@ tables {
   action_refs {
     id: 26776898
   }
+  initial_default_action {
+    action_id: 25218163
+  }
   size: 1024
   has_initial_entries: true
 }
@@ -163,6 +178,9 @@ tables {
   action_refs {
     id: 26776898
   }
+  initial_default_action {
+    action_id: 25218163
+  }
   size: 1024
   has_initial_entries: true
 }
@@ -190,6 +208,9 @@ tables {
   action_refs {
     id: 26776898
   }
+  initial_default_action {
+    action_id: 25218163
+  }
   size: 1024
   has_initial_entries: true
 }
@@ -217,6 +238,9 @@ tables {
   action_refs {
     id: 26776898
   }
+  initial_default_action {
+    action_id: 25218163
+  }
   size: 1024
   has_initial_entries: true
 }
@@ -244,6 +268,9 @@ tables {
   action_refs {
     id: 26776898
   }
+  initial_default_action {
+    action_id: 25218163
+  }
   size: 1024
   has_initial_entries: true
 }
diff --git a/testdata/p4_16_samples_outputs/inline-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/inline-bmv2.p4.p4info.txtpb
index c38b7239725..7bc0b3d1fca 100644
--- a/testdata/p4_16_samples_outputs/inline-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/inline-bmv2.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/inline1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/inline1-bmv2.p4.p4info.txtpb
index c38b7239725..7bc0b3d1fca 100644
--- a/testdata/p4_16_samples_outputs/inline1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/inline1-bmv2.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.p4info.txtpb
index b3a73ec34f9..0ee9a3ca6a0 100644
--- a/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.p4info.txtpb
@@ -67,6 +67,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.p4info.txtpb
index 071cf165897..bf1a47e67eb 100644
--- a/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.p4info.txtpb
@@ -43,6 +43,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.p4info.txtpb
index 024e3a868a1..93ddc6d81ae 100644
--- a/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -52,6 +55,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -72,6 +78,9 @@ tables {
   action_refs {
     id: 20119496
   }
+  initial_default_action {
+    action_id: 20119496
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue-2123.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue-2123.p4.p4info.txtpb
index 7033385f7e1..fc7a0562067 100644
--- a/testdata/p4_16_samples_outputs/issue-2123.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue-2123.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 65536
 }
 tables {
@@ -55,6 +58,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 131072
 }
 tables {
@@ -86,6 +92,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 16384
 }
 tables {
@@ -111,6 +120,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 32768
 }
 tables {
@@ -133,6 +145,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 32768
 }
 tables {
@@ -158,6 +173,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 32768
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.p4info.txtpb
index ebeb2be7504..26f5ccb803d 100644
--- a/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.p4info.txtpb
@@ -17,6 +17,9 @@ tables {
     id: 26265154
   }
   const_default_action_id: 20728178
+  initial_default_action {
+    action_id: 20728178
+  }
   size: 1024
 }
 tables {
@@ -29,6 +32,9 @@ tables {
     id: 26265154
   }
   const_default_action_id: 26265154
+  initial_default_action {
+    action_id: 26265154
+  }
   size: 1024
 }
 tables {
@@ -41,6 +47,9 @@ tables {
     id: 20728178
   }
   const_default_action_id: 20728178
+  initial_default_action {
+    action_id: 20728178
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.p4info.txtpb
index fbf612b2228..eb602f0e767 100644
--- a/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 28550627
   }
+  initial_default_action {
+    action_id: 28550627
+  }
   size: 1024
 }
 tables {
@@ -42,6 +45,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1107.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1107.p4.p4info.txtpb
index f0dd0f1d5b1..8589cd85610 100644
--- a/testdata/p4_16_samples_outputs/issue1107.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1107.p4.p4info.txtpb
@@ -30,6 +30,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.p4info.txtpb
index 47aadf9cc67..da343f49732 100644
--- a/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.p4info.txtpb
@@ -18,6 +18,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.p4info.txtpb
index ab1dfb29a54..84810bb35b5 100644
--- a/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -48,6 +51,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -68,6 +74,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.p4info.txtpb
index 3e9d6e3d9de..b92c8fe023f 100644
--- a/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.p4info.txtpb
index 025e575aa86..57fa8975527 100644
--- a/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.p4info.txtpb
@@ -14,6 +14,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 3
 }
 tables {
@@ -31,6 +34,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 10
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/issue1538.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1538.p4.p4info.txtpb
index e16e05a8794..f53c8ed84d4 100644
--- a/testdata/p4_16_samples_outputs/issue1538.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1538.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 32609675
   }
+  initial_default_action {
+    action_id: 32609675
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.p4info.txtpb
index e16e05a8794..f53c8ed84d4 100644
--- a/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 32609675
   }
+  initial_default_action {
+    action_id: 32609675
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.p4info.txtpb
index e16e05a8794..f53c8ed84d4 100644
--- a/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 32609675
   }
+  initial_default_action {
+    action_id: 32609675
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.p4info.txtpb
index e16e05a8794..f53c8ed84d4 100644
--- a/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 32609675
   }
+  initial_default_action {
+    action_id: 32609675
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.p4info.txtpb
index 24f6e3908e5..cffa1ea96c5 100644
--- a/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.p4info.txtpb
@@ -27,6 +27,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 8
 }
 tables {
@@ -52,6 +55,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 8
 }
 tables {
@@ -77,6 +83,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 16
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1595.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1595.p4.p4info.txtpb
index 66c34ab5c58..d9b17a47ea3 100644
--- a/testdata/p4_16_samples_outputs/issue1595.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1595.p4.p4info.txtpb
@@ -31,6 +31,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.p4info.txtpb
index 89e1868e4d8..30318020b80 100644
--- a/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.p4info.txtpb
index 149090280c1..87d64e24d72 100644
--- a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.p4info.txtpb
@@ -30,6 +30,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.p4info.txtpb
index 3c7887c18bf..264bf8e35a4 100644
--- a/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.p4info.txtpb
@@ -23,6 +23,9 @@ tables {
     id: 27086398
   }
   const_default_action_id: 25451019
+  initial_default_action {
+    action_id: 25451019
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.p4info.txtpb
index b77a01f32e9..0ea3b17c199 100644
--- a/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 32609675
   }
+  initial_default_action {
+    action_id: 32609675
+  }
   size: 1024
 }
 tables {
@@ -49,6 +52,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.p4info.txtpb
index 07fc30ea424..2886f213a71 100644
--- a/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 64
 }
 tables {
@@ -54,6 +57,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 64
 }
 tables {
@@ -74,6 +80,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 64
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.p4info.txtpb
index ce33ebd07b1..d6a77910f69 100644
--- a/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 25131402
   }
+  initial_default_action {
+    action_id: 25131402
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.p4info.txtpb
index 405b5ac2936..a883847cf09 100644
--- a/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.p4info.txtpb
@@ -27,6 +27,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.p4info.txtpb
index 086bb9baf1a..889ec1e72d5 100644
--- a/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.p4info.txtpb
index 045f5ad9615..8dc206b4db1 100644
--- a/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.p4info.txtpb
@@ -20,6 +20,9 @@ tables {
     id: 23080345
   }
   const_default_action_id: 23080345
+  initial_default_action {
+    action_id: 23080345
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.p4info.txtpb
index bc9fdb13c70..e7382debb82 100644
--- a/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/issue1958.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1958.p4.p4info.txtpb
index 03c5a037a37..db2c93712ae 100644
--- a/testdata/p4_16_samples_outputs/issue1958.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1958.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1985.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1985.p4.p4info.txtpb
index 7808e055bf0..0396a9e8ece 100644
--- a/testdata/p4_16_samples_outputs/issue1985.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1985.p4.p4info.txtpb
@@ -18,6 +18,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.p4info.txtpb
index 4f0834a91c8..f3a18114ac3 100644
--- a/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.p4info.txtpb
index d13d4bb0b2d..cebbd76eeb4 100644
--- a/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.p4info.txtpb
index 2f5bb2b992f..e09d9e901c7 100644
--- a/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 30461719
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.p4info.txtpb
index 2f5bb2b992f..e09d9e901c7 100644
--- a/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 30461719
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.p4info.txtpb
index 2418089ad0d..66bd76c53eb 100644
--- a/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.p4info.txtpb
@@ -21,6 +21,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2266.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2266.p4.p4info.txtpb
index 78f6118a1b3..acef4f91209 100644
--- a/testdata/p4_16_samples_outputs/issue2266.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2266.p4.p4info.txtpb
@@ -18,6 +18,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.p4info.txtpb
index dd754263575..8f4c6b50dc0 100644
--- a/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.p4info.txtpb
@@ -39,6 +39,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2321.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2321.p4.p4info.txtpb
index ff39c1978ec..3fe60b6b0f1 100644
--- a/testdata/p4_16_samples_outputs/issue2321.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2321.p4.p4info.txtpb
@@ -29,6 +29,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2344.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2344.p4.p4info.txtpb
index 9b93fad2579..0addefe832a 100644
--- a/testdata/p4_16_samples_outputs/issue2344.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2344.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.p4info.txtpb
index 7dd4621a878..0070ceb9a07 100644
--- a/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.p4info.txtpb
@@ -21,6 +21,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -40,6 +43,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.p4info.txtpb
index c82b49a7071..57e69844dad 100644
--- a/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.p4info.txtpb
@@ -18,6 +18,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.p4info.txtpb
index e1f5aece048..10ba1a0afe4 100644
--- a/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.p4info.txtpb
@@ -15,6 +15,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue2904.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2904.p4.p4info.txtpb
index 9b46cec4465..f564d957b5f 100644
--- a/testdata/p4_16_samples_outputs/issue2904.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2904.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.p4info.txtpb
index a1660a74f90..83eed5d825c 100644
--- a/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 17165658
   }
+  initial_default_action {
+    action_id: 21186165
+  }
   size: 1024
   is_const_table: true
 }
diff --git a/testdata/p4_16_samples_outputs/issue297-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue297-bmv2.p4.p4info.txtpb
index daa752d32bc..4fdcb3bed12 100644
--- a/testdata/p4_16_samples_outputs/issue297-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue297-bmv2.p4.p4info.txtpb
@@ -17,6 +17,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 289199568
   size: 1024
 }
@@ -33,6 +36,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 300324846
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/issue298-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue298-bmv2.p4.p4info.txtpb
index bd032289690..2e1c1ee6545 100644
--- a/testdata/p4_16_samples_outputs/issue298-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue298-bmv2.p4.p4info.txtpb
@@ -13,6 +13,9 @@ tables {
   action_refs {
     id: 28773984
   }
+  initial_default_action {
+    action_id: 28773984
+  }
   size: 8
 }
 tables {
@@ -33,6 +36,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 2
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue3374.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3374.p4.p4info.txtpb
index 92b3135ef87..871fbf9098f 100644
--- a/testdata/p4_16_samples_outputs/issue3374.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue3374.p4.p4info.txtpb
@@ -20,6 +20,9 @@ tables {
     id: 18712486
   }
   const_default_action_id: 18712486
+  initial_default_action {
+    action_id: 18712486
+  }
   size: 1000000
 }
 tables {
@@ -38,6 +41,9 @@ tables {
     id: 32723879
   }
   const_default_action_id: 32723879
+  initial_default_action {
+    action_id: 32723879
+  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.p4info.txtpb
index 52820be944a..f4b43beba49 100644
--- a/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.p4info.txtpb
index f9f65d27610..90214ed996d 100644
--- a/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.p4info.txtpb
@@ -30,6 +30,13 @@ tables {
     annotations: "@defaut_only"
   }
   const_default_action_id: 18870058
+  initial_default_action {
+    action_id: 18870058
+    arguments {
+      param_id: 1
+      value: "\000\002"
+    }
+  }
   size: 1024
 }
 tables {
@@ -52,6 +59,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -74,6 +84,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.p4info.txtpb
index 864b97a3c87..4d228a233b4 100644
--- a/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.p4info.txtpb
@@ -30,6 +30,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -52,6 +55,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -74,6 +80,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue3550.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3550.p4.p4info.txtpb
index b3cf3e31341..1ad6a7ef6b8 100644
--- a/testdata/p4_16_samples_outputs/issue3550.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue3550.p4.p4info.txtpb
@@ -58,6 +58,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
@@ -98,6 +101,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/issue364-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue364-bmv2.p4.p4info.txtpb
index 5b7beb2db3b..d7aed5ce8e0 100644
--- a/testdata/p4_16_samples_outputs/issue364-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue364-bmv2.p4.p4info.txtpb
@@ -14,6 +14,13 @@ tables {
     id: 32530319
   }
   const_default_action_id: 32530319
+  initial_default_action {
+    action_id: 32530319
+    arguments {
+      param_id: 1
+      value: "\000\000"
+    }
+  }
   direct_resource_ids: 330698586
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/issue383-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue383-bmv2.p4.p4info.txtpb
index f77a28f00ad..e180094dfbf 100644
--- a/testdata/p4_16_samples_outputs/issue383-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue383-bmv2.p4.p4info.txtpb
@@ -30,6 +30,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue414-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue414-bmv2.p4.p4info.txtpb
index ae22de48280..e4a66262630 100644
--- a/testdata/p4_16_samples_outputs/issue414-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue414-bmv2.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 25131402
   }
+  initial_default_action {
+    action_id: 25131402
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue420.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue420.p4.p4info.txtpb
index 4fd7500740f..ad665b2242f 100644
--- a/testdata/p4_16_samples_outputs/issue420.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue420.p4.p4info.txtpb
@@ -16,6 +16,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue422.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue422.p4.p4info.txtpb
index cbfa0ac99fa..c0531ab84a6 100644
--- a/testdata/p4_16_samples_outputs/issue422.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue422.p4.p4info.txtpb
@@ -16,6 +16,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue461-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue461-bmv2.p4.p4info.txtpb
index 83ac102dd90..1a39f517bde 100644
--- a/testdata/p4_16_samples_outputs/issue461-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue461-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 20279829
   }
+  initial_default_action {
+    action_id: 20279829
+  }
   direct_resource_ids: 323801931
   size: 1024
 }
@@ -43,6 +46,9 @@ tables {
   action_refs {
     id: 32609675
   }
+  initial_default_action {
+    action_id: 32609675
+  }
   size: 1024
 }
 tables {
@@ -63,6 +69,9 @@ tables {
   action_refs {
     id: 32609675
   }
+  initial_default_action {
+    action_id: 32609675
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue486-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue486-bmv2.p4.p4info.txtpb
index 50f6a8d4acf..5b8235110ce 100644
--- a/testdata/p4_16_samples_outputs/issue486-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue486-bmv2.p4.p4info.txtpb
@@ -37,6 +37,9 @@ tables {
   action_refs {
     id: 25131402
   }
+  initial_default_action {
+    action_id: 25131402
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue512.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue512.p4.p4info.txtpb
index ae22de48280..e4a66262630 100644
--- a/testdata/p4_16_samples_outputs/issue512.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue512.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 25131402
   }
+  initial_default_action {
+    action_id: 25131402
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.p4info.txtpb
index 8c8387495fb..8f22c165f1b 100644
--- a/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.p4info.txtpb
@@ -32,6 +32,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.p4info.txtpb
index 8c8387495fb..8f22c165f1b 100644
--- a/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.p4info.txtpb
@@ -32,6 +32,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.p4info.txtpb
index 8c8387495fb..8f22c165f1b 100644
--- a/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.p4info.txtpb
@@ -32,6 +32,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.p4info.txtpb
index a71d778d8b8..122c9f33eac 100644
--- a/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.p4info.txtpb
@@ -44,6 +44,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.p4info.txtpb
index 1a88daa3980..40709797cbd 100644
--- a/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.p4info.txtpb
@@ -32,6 +32,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.p4info.txtpb
index a71d778d8b8..122c9f33eac 100644
--- a/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.p4info.txtpb
@@ -44,6 +44,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.p4info.txtpb
index 1a88daa3980..40709797cbd 100644
--- a/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.p4info.txtpb
@@ -32,6 +32,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue561-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-bmv2.p4.p4info.txtpb
index 310a9d0dec0..c28e6ae9121 100644
--- a/testdata/p4_16_samples_outputs/issue561-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue561-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 32609675
   }
+  initial_default_action {
+    action_id: 32609675
+  }
   size: 1024
 }
 tables {
@@ -42,6 +45,9 @@ tables {
   action_refs {
     id: 32609675
   }
+  initial_default_action {
+    action_id: 32609675
+  }
   size: 1024
 }
 tables {
@@ -62,6 +68,9 @@ tables {
   action_refs {
     id: 32609675
   }
+  initial_default_action {
+    action_id: 32609675
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue949.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue949.p4.p4info.txtpb
index 15fcacbb4e9..72877387113 100644
--- a/testdata/p4_16_samples_outputs/issue949.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue949.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue983-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue983-bmv2.p4.p4info.txtpb
index bb9aa73dd5c..3044596a2bf 100644
--- a/testdata/p4_16_samples_outputs/issue983-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue983-bmv2.p4.p4info.txtpb
@@ -91,6 +91,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.p4info.txtpb
index ce5f08ab7a6..2ab0b915fdb 100644
--- a/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.p4info.txtpb
@@ -13,6 +13,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -24,6 +27,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/issue986-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue986-bmv2.p4.p4info.txtpb
index 8f364ae7217..08e34cd070c 100644
--- a/testdata/p4_16_samples_outputs/issue986-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/issue986-bmv2.p4.p4info.txtpb
@@ -13,6 +13,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.p4info.txtpb
index a4f1a040523..a9ee45fc368 100644
--- a/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.p4info.txtpb
@@ -13,6 +13,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/key-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/key-bmv2.p4.p4info.txtpb
index b4f4b802538..0d9c882704e 100644
--- a/testdata/p4_16_samples_outputs/key-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/key-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/key1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/key1-bmv2.p4.p4info.txtpb
index b4f4b802538..0d9c882704e 100644
--- a/testdata/p4_16_samples_outputs/key1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/key1-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/logging-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/logging-bmv2.p4.p4info.txtpb
index 4a19a73f522..d72bed92c9e 100644
--- a/testdata/p4_16_samples_outputs/logging-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/logging-bmv2.p4.p4info.txtpb
@@ -18,6 +18,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/lpm_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/lpm_ubpf.p4.p4info.txtpb
index 2a43c9dbbd8..1c5e80eab6a 100644
--- a/testdata/p4_16_samples_outputs/lpm_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/lpm_ubpf.p4.p4info.txtpb
@@ -28,6 +28,13 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 18876683
+    arguments {
+      param_id: 1
+      value: "\000\000\000\000"
+    }
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb
index 8846805c4eb..ad33c5e8b0c 100644
--- a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb
@@ -16,6 +16,13 @@ tables {
   action_refs {
     id: 29027610
   }
+  initial_default_action {
+    action_id: 20013177
+    arguments {
+      param_id: 1
+      value: "\000\000\000\003"
+    }
+  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.p4info.txtpb
index 7c191c13e2a..25d7da9a25d 100644
--- a/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.p4info.txtpb
@@ -38,6 +38,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.p4info.txtpb
index 541eb7cfc51..cceeadb1fb0 100644
--- a/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.p4info.txtpb
@@ -38,6 +38,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/metadata_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/metadata_ubpf.p4.p4info.txtpb
index 7774c0a1bd5..a6abfdbcd3d 100644
--- a/testdata/p4_16_samples_outputs/metadata_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/metadata_ubpf.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -42,6 +45,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/multicast-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/multicast-bmv2.p4.p4info.txtpb
index 70cda0e2a85..eb21c0eabd8 100644
--- a/testdata/p4_16_samples_outputs/multicast-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/multicast-bmv2.p4.p4info.txtpb
@@ -18,6 +18,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1
 }
 tables {
@@ -43,6 +46,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 512
 }
 tables {
@@ -68,6 +74,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -93,6 +102,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 256
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.p4info.txtpb
index 885acc8c7c8..398c9670544 100644
--- a/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 16
 }
 tables {
@@ -48,6 +51,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 368209065
   size: 16384
 }
diff --git a/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.p4info.txtpb
index 3d63970c4a3..30a57fc6528 100644
--- a/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 16
 }
 tables {
@@ -48,6 +51,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 354402025
   size: 16384
 }
diff --git a/testdata/p4_16_samples_outputs/nested_if_else.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/nested_if_else.p4.p4info.txtpb
index 070d1468b0a..1ffb865d7dd 100644
--- a/testdata/p4_16_samples_outputs/nested_if_else.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/nested_if_else.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.p4info.txtpb
index 070d1468b0a..1ffb865d7dd 100644
--- a/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/nested_if_statement.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/nested_if_statement.p4.p4info.txtpb
index 070d1468b0a..1ffb865d7dd 100644
--- a/testdata/p4_16_samples_outputs/nested_if_statement.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/nested_if_statement.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.p4info.txtpb
index fbab1a0a231..265b3f38eef 100644
--- a/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 24698652
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -42,6 +45,9 @@ tables {
   action_refs {
     id: 24698652
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -62,6 +68,9 @@ tables {
   action_refs {
     id: 24698652
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -82,6 +91,9 @@ tables {
   action_refs {
     id: 24698652
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -102,6 +114,9 @@ tables {
   action_refs {
     id: 24698652
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/omec/up4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/omec/up4.p4.p4info.txtpb
index 89bc7eaf0e5..ba24742db5e 100644
--- a/testdata/p4_16_samples_outputs/omec/up4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/omec/up4.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -37,6 +40,21 @@ tables {
     id: 26090030
   }
   const_default_action_id: 26090030
+  initial_default_action {
+    action_id: 26090030
+    arguments {
+      param_id: 1
+      value: "\000"
+    }
+    arguments {
+      param_id: 2
+      value: "\000"
+    }
+    arguments {
+      param_id: 3
+      value: "\000"
+    }
+  }
   size: 1024
 }
 tables {
@@ -69,6 +87,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28401267
+  initial_default_action {
+    action_id: 28401267
+  }
   size: 1024
 }
 tables {
@@ -98,6 +119,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28401267
+  initial_default_action {
+    action_id: 28401267
+  }
   size: 1024
 }
 tables {
@@ -130,6 +154,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28401267
+  initial_default_action {
+    action_id: 28401267
+  }
   size: 1024
 }
 tables {
@@ -162,6 +189,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 28401267
+  initial_default_action {
+    action_id: 28401267
+  }
   size: 1024
 }
 tables {
@@ -198,6 +228,13 @@ tables {
     id: 23010411
   }
   const_default_action_id: 23010411
+  initial_default_action {
+    action_id: 23010411
+    arguments {
+      param_id: 1
+      value: "\000"
+    }
+  }
   size: 1024
 }
 tables {
@@ -220,6 +257,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -242,6 +282,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 297808402
   size: 1024
 }
@@ -327,6 +370,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 325583051
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/p416-type-use3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/p416-type-use3.p4.p4info.txtpb
index 5dca49d1870..c0b80bcaa87 100644
--- a/testdata/p4_16_samples_outputs/p416-type-use3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/p416-type-use3.p4.p4info.txtpb
@@ -124,6 +124,9 @@ tables {
   action_refs {
     id: 21580947
   }
+  initial_default_action {
+    action_id: 21580947
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.p4info.txtpb
index fe1faf07f47..d9d468738dd 100644
--- a/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/parser-locals2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-locals2.p4.p4info.txtpb
index ae22de48280..e4a66262630 100644
--- a/testdata/p4_16_samples_outputs/parser-locals2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/parser-locals2.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 25131402
   }
+  initial_default_action {
+    action_id: 25131402
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/pins/pins_fabric.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pins/pins_fabric.p4.p4info.txtpb
index 5dee71f377b..1c1bd35a300 100644
--- a/testdata/p4_16_samples_outputs/pins/pins_fabric.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/pins/pins_fabric.p4.p4info.txtpb
@@ -38,6 +38,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 126
 }
 tables {
@@ -63,6 +66,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1
 }
 tables {
@@ -162,6 +168,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 318767361
   size: 254
 }
@@ -198,6 +207,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 64
 }
 tables {
@@ -222,6 +234,9 @@ tables {
     annotations: "@proto_id(1)"
   }
   const_default_action_id: 24742814
+  initial_default_action {
+    action_id: 24742814
+  }
   size: 64
 }
 tables {
@@ -273,6 +288,9 @@ tables {
     annotations: "@proto_id(7)"
   }
   const_default_action_id: 16777222
+  initial_default_action {
+    action_id: 16777222
+  }
   size: 131072
 }
 tables {
@@ -324,6 +342,9 @@ tables {
     annotations: "@proto_id(7)"
   }
   const_default_action_id: 16777222
+  initial_default_action {
+    action_id: 16777222
+  }
   size: 17000
 }
 tables {
@@ -359,6 +380,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1600
 }
 tables {
@@ -394,6 +418,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1600
 }
 tables {
@@ -573,6 +600,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 318767362
   direct_resource_ids: 352321792
   size: 255
@@ -694,6 +724,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 318767367
   direct_resource_ids: 352321794
   size: 511
@@ -753,6 +786,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 318767369
   size: 255
 }
@@ -790,6 +826,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -822,6 +861,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 256
 }
 tables {
@@ -862,6 +904,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -890,6 +935,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 2048
 }
 tables {
@@ -919,6 +967,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 299650760
   size: 3968
 }
@@ -952,6 +1003,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 4
 }
 tables {
@@ -993,6 +1047,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -1028,6 +1085,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 110
 }
 tables {
@@ -1108,6 +1168,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 318767364
   size: 127
 }
diff --git a/testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.p4info.txtpb
index a874de55c50..63827bfced6 100644
--- a/testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.p4info.txtpb
@@ -38,6 +38,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 126
 }
 tables {
@@ -63,6 +66,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1
 }
 tables {
@@ -154,6 +160,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 318767361
   size: 254
 }
@@ -190,6 +199,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 64
 }
 tables {
@@ -214,6 +226,9 @@ tables {
     annotations: "@proto_id(1)"
   }
   const_default_action_id: 24742814
+  initial_default_action {
+    action_id: 24742814
+  }
   size: 64
 }
 tables {
@@ -265,6 +280,9 @@ tables {
     annotations: "@proto_id(7)"
   }
   const_default_action_id: 16777222
+  initial_default_action {
+    action_id: 16777222
+  }
   size: 131072
 }
 tables {
@@ -316,6 +334,9 @@ tables {
     annotations: "@proto_id(7)"
   }
   const_default_action_id: 16777222
+  initial_default_action {
+    action_id: 16777222
+  }
   size: 17000
 }
 tables {
@@ -351,6 +372,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1600
 }
 tables {
@@ -386,6 +410,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1600
 }
 tables {
@@ -549,6 +576,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 318767362
   direct_resource_ids: 352321792
   size: 255
@@ -639,6 +669,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 255
 }
 tables {
@@ -721,6 +754,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 318767370
   size: 255
 }
@@ -758,6 +794,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -790,6 +829,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 256
 }
 tables {
@@ -830,6 +872,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -858,6 +903,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 2048
 }
 tables {
@@ -887,6 +935,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 299650760
   size: 3968
 }
@@ -920,6 +971,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 4
 }
 tables {
@@ -961,6 +1015,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -996,6 +1053,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 110
 }
 tables {
@@ -1063,6 +1123,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 318767364
   size: 127
 }
diff --git a/testdata/p4_16_samples_outputs/pins/pins_wbb.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pins/pins_wbb.p4.p4info.txtpb
index cccb2bd1c28..d96a3b482f4 100644
--- a/testdata/p4_16_samples_outputs/pins/pins_wbb.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/pins/pins_wbb.p4.p4info.txtpb
@@ -65,6 +65,9 @@ tables {
     scope: DEFAULT_ONLY
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 318767363
   direct_resource_ids: 352321793
   size: 8
diff --git a/testdata/p4_16_samples_outputs/psa-action-profile1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-profile1.p4.p4info.txtpb
index a86dbc7c757..c723ce74b49 100644
--- a/testdata/p4_16_samples_outputs/psa-action-profile1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-profile1.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 298015716
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-action-profile3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-profile3.p4.p4info.txtpb
index 960fa335b31..3199659d2af 100644
--- a/testdata/p4_16_samples_outputs/psa-action-profile3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-profile3.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 298015716
   size: 1024
 }
@@ -49,6 +52,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 298015716
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-action-profile4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-profile4.p4.p4info.txtpb
index 2064dc01292..9180233b7f5 100644
--- a/testdata/p4_16_samples_outputs/psa-action-profile4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-profile4.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 298015716
   size: 1024
 }
@@ -43,6 +46,9 @@ tables {
   action_refs {
     id: 21832421
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 298015716
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-action-selector1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector1.p4.p4info.txtpb
index b81118f47ff..da28f349119 100644
--- a/testdata/p4_16_samples_outputs/psa-action-selector1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-selector1.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 294316857
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-action-selector2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector2.p4.p4info.txtpb
index b81118f47ff..da28f349119 100644
--- a/testdata/p4_16_samples_outputs/psa-action-selector2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-selector2.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 294316857
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-action-selector3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector3.p4.p4info.txtpb
index e7789178f0b..05c285e6a6c 100644
--- a/testdata/p4_16_samples_outputs/psa-action-selector3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-selector3.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-action-selector4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector4.p4.p4info.txtpb
index 6f30891066a..217b1a61e63 100644
--- a/testdata/p4_16_samples_outputs/psa-action-selector4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-selector4.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 294316857
   size: 1024
 }
@@ -37,6 +40,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-action-selector5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector5.p4.p4info.txtpb
index b9d5a175e0f..de2185fdbc6 100644
--- a/testdata/p4_16_samples_outputs/psa-action-selector5.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-selector5.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 28661769
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 294316857
   size: 1024
 }
@@ -37,6 +40,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -48,6 +54,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-action-selector6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector6.p4.p4info.txtpb
index 0ed6e61f2df..7c83d385d42 100644
--- a/testdata/p4_16_samples_outputs/psa-action-selector6.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-action-selector6.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 28661769
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 294316857
   size: 1024
 }
@@ -49,6 +52,9 @@ tables {
   action_refs {
     id: 28661769
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 298015716
   size: 1024
 }
@@ -61,6 +67,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -72,6 +81,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.p4info.txtpb
index d7d77b34cea..d94f2103aa1 100644
--- a/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.p4info.txtpb
@@ -13,6 +13,9 @@ tables {
   action_refs {
     id: 17064084
   }
+  initial_default_action {
+    action_id: 17064084
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.p4info.txtpb
index d75ec35b4b7..83cb287cb4f 100644
--- a/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 22078320
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-counter1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-counter1.p4.p4info.txtpb
index fd7c56f2b61..650c37a0fd7 100644
--- a/testdata/p4_16_samples_outputs/psa-counter1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-counter1.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 22078320
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-counter2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-counter2.p4.p4info.txtpb
index 8d86d076601..cad6ce583a1 100644
--- a/testdata/p4_16_samples_outputs/psa-counter2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-counter2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 22078320
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-counter4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-counter4.p4.p4info.txtpb
index 952cc49eedc..6054071343f 100644
--- a/testdata/p4_16_samples_outputs/psa-counter4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-counter4.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 319980461
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.p4info.txtpb
index e1b0f5fadb3..c8bf5bbdfcd 100644
--- a/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 22078320
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.p4info.txtpb
index 09088e7de68..81a2daffd1c 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.p4info.txtpb
@@ -18,6 +18,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.p4info.txtpb
index 023eccf53fe..43f28f44ca0 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 25756908
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.p4info.txtpb
index 023eccf53fe..43f28f44ca0 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 25756908
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.p4info.txtpb
index 625352189b8..184a3258e59 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.p4info.txtpb
@@ -23,6 +23,9 @@ tables {
     id: 33281717
   }
   const_default_action_id: 33281717
+  initial_default_action {
+    action_id: 33281717
+  }
   size: 1048576
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.p4info.txtpb
index 4d8217e326e..4e0ff220a3c 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.p4info.txtpb
index 4d8217e326e..4e0ff220a3c 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.p4info.txtpb
index 4d8217e326e..4e0ff220a3c 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.p4info.txtpb
index 7f1b884aadb..f100bbad25f 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.p4info.txtpb
@@ -23,6 +23,9 @@ tables {
     id: 33281717
   }
   const_default_action_id: 33281717
+  initial_default_action {
+    action_id: 33281717
+  }
   size: 1048576
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.p4info.txtpb
index 09088e7de68..81a2daffd1c 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.p4info.txtpb
@@ -18,6 +18,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.p4info.txtpb
index 023eccf53fe..43f28f44ca0 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 25756908
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.p4info.txtpb
index 0b83ddc89a2..6fe7a7cf614 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.p4info.txtpb
index 0b83ddc89a2..6fe7a7cf614 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.p4info.txtpb
index a04e3806dfb..d26cd56e56f 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.p4info.txtpb
index 7420b70cf80..5f576ce84dd 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.p4info.txtpb
index f0ee79747a8..43416054c88 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.p4info.txtpb
@@ -34,6 +34,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.p4info.txtpb
index 670e570b20b..e2498ffb34d 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.p4info.txtpb
index 475d27e1e73..bb39cf44a6a 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.p4info.txtpb
@@ -17,6 +17,17 @@ tables {
     id: 29027610
   }
   const_default_action_id: 20013177
+  initial_default_action {
+    action_id: 20013177
+    arguments {
+      param_id: 1
+      value: "\000\000\000\001"
+    }
+    arguments {
+      param_id: 2
+      value: "\000\000\000\002"
+    }
+  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.p4info.txtpb
index 0daf777cb88..8725084d5a9 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.p4info.txtpb
@@ -16,6 +16,17 @@ tables {
   action_refs {
     id: 29027610
   }
+  initial_default_action {
+    action_id: 20013177
+    arguments {
+      param_id: 1
+      value: "\000\000\000\001"
+    }
+    arguments {
+      param_id: 2
+      value: "\000\000\000\002"
+    }
+  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.p4info.txtpb
index 441125e182b..fdf219b16ea 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.p4info.txtpb
@@ -17,6 +17,9 @@ tables {
     id: 29027610
   }
   const_default_action_id: 20013177
+  initial_default_action {
+    action_id: 20013177
+  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.p4info.txtpb
index 13e5c55ff81..eca7342ab41 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.p4info.txtpb
@@ -16,6 +16,9 @@ tables {
   action_refs {
     id: 29027610
   }
+  initial_default_action {
+    action_id: 20013177
+  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.p4info.txtpb
index 43bddf7c1b3..47b82b25f60 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.p4info.txtpb
@@ -20,6 +20,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.p4info.txtpb
index f192d8515f8..b89a8069823 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.p4info.txtpb
index f192d8515f8..b89a8069823 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb
index 8846805c4eb..ad33c5e8b0c 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb
@@ -16,6 +16,13 @@ tables {
   action_refs {
     id: 29027610
   }
+  initial_default_action {
+    action_id: 20013177
+    arguments {
+      param_id: 1
+      value: "\000\000\000\003"
+    }
+  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.p4info.txtpb
index 82a9d5531d3..f82d8cb9465 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.p4info.txtpb
@@ -17,6 +17,17 @@ tables {
     id: 29027610
   }
   const_default_action_id: 20013177
+  initial_default_action {
+    action_id: 20013177
+    arguments {
+      param_id: 1
+      value: "\000\000\000\001"
+    }
+    arguments {
+      param_id: 2
+      value: "\000"
+    }
+  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.p4info.txtpb
index 09088e7de68..81a2daffd1c 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.p4info.txtpb
@@ -18,6 +18,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.p4info.txtpb
index 345ec80604b..d5431fb0ad9 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 17165658
   }
+  initial_default_action {
+    action_id: 21186165
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.p4info.txtpb
index fb0d08432a7..3d3496bceb1 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.p4info.txtpb
@@ -37,6 +37,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -72,6 +75,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -83,6 +89,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.p4info.txtpb
index 8ee44cc3c11..14c1af2274d 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.p4info.txtpb
@@ -37,6 +37,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -48,6 +51,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -59,6 +65,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.p4info.txtpb
index 4178a2c7ebc..f6ae1f58d37 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.p4info.txtpb
@@ -40,6 +40,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.p4info.txtpb
index 748bb905ef7..04ac91d27dd 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.p4info.txtpb
@@ -40,6 +40,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.p4info.txtpb
index f0ee79747a8..43416054c88 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.p4info.txtpb
@@ -34,6 +34,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.p4info.txtpb
index 4f465726169..e8ed6be661f 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.p4info.txtpb
index 194188737ae..ca28450d720 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 17082815
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.p4info.txtpb
index ef53980e224..513edb7efe0 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.p4info.txtpb
index 151cad032af..6e335c05517 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.p4info.txtpb
index 2cbdf65dee8..fb7f4486469 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.p4info.txtpb
@@ -34,6 +34,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.p4info.txtpb
index 6d2a2368c01..f5a8bbd9de7 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.p4info.txtpb
index ca16113e5c6..23f31f4d382 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.p4info.txtpb
@@ -64,6 +64,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.p4info.txtpb
index 23416c7c00e..025c0b5bec2 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.p4info.txtpb
@@ -40,6 +40,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.p4info.txtpb
index dcdf86beca4..7b101056e17 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.p4info.txtpb
@@ -31,6 +31,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -42,6 +45,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -53,6 +59,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.p4info.txtpb
index 451e8cdda37..97dbb782cd3 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.p4info.txtpb
@@ -70,6 +70,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.p4info.txtpb
index 4cb050950c6..240482df0cb 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.p4info.txtpb
@@ -40,6 +40,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.p4info.txtpb
index 991c4258c87..ce78d137f5f 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.p4info.txtpb
@@ -34,6 +34,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.p4info.txtpb
index b3b736dc129..6493d525582 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.p4info.txtpb
@@ -34,6 +34,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.p4info.txtpb
index b3b736dc129..6493d525582 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.p4info.txtpb
@@ -34,6 +34,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.p4info.txtpb
index ff148623905..85ad51c596c 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.p4info.txtpb
@@ -34,6 +34,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.p4info.txtpb
index b3b736dc129..6493d525582 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.p4info.txtpb
@@ -34,6 +34,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.p4info.txtpb
index b3b736dc129..6493d525582 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.p4info.txtpb
@@ -34,6 +34,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.p4info.txtpb
index e09bbd5fd24..753f06aea5f 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.p4info.txtpb
@@ -34,6 +34,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.p4info.txtpb
index 4d8217e326e..4e0ff220a3c 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.p4info.txtpb
index df3e94091b8..1466f96cf61 100644
--- a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.p4info.txtpb
@@ -23,6 +23,9 @@ tables {
     id: 33281717
   }
   const_default_action_id: 33281717
+  initial_default_action {
+    action_id: 33281717
+  }
   size: 1048576
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.p4info.txtpb
index b2b2ebe63c4..170b719ba47 100644
--- a/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 25648360
   }
+  initial_default_action {
+    action_id: 25648360
+  }
   direct_resource_ids: 332805598
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.p4info.txtpb
index 4062f6e4d31..665e268f377 100644
--- a/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 26564927
   }
+  initial_default_action {
+    action_id: 26564927
+  }
   size: 1024
 }
 tables {
@@ -42,6 +45,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -65,6 +71,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.p4info.txtpb
index 56dae4ad817..40a5c471c8d 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.p4info.txtpb
index 56dae4ad817..40a5c471c8d 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.p4info.txtpb
index ad34f0d5599..6fe0bcb5abb 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.p4info.txtpb
@@ -34,6 +34,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.p4info.txtpb
index 77222614921..4c5e44dbf6c 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.p4info.txtpb
@@ -27,6 +27,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.p4info.txtpb
index 56dae4ad817..40a5c471c8d 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.p4info.txtpb
index 56dae4ad817..40a5c471c8d 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.p4info.txtpb
index 56dae4ad817..40a5c471c8d 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.p4info.txtpb
index 56dae4ad817..40a5c471c8d 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.p4info.txtpb
index 1724d0a1d4e..eb5991b882a 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.p4info.txtpb
@@ -34,6 +34,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.p4info.txtpb
index 0c406d853b7..16d219ea349 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 18579058
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 368068636
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.p4info.txtpb
index 505b55555b1..bd87741eb00 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.p4info.txtpb
index 56dae4ad817..40a5c471c8d 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.p4info.txtpb
index c4b75a7c0a4..44545b327f7 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.p4info.txtpb
index c79b9282c89..06ab4c05a74 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.p4info.txtpb
index aec60b621d7..6668b1b57db 100644
--- a/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 298015716
   size: 1024
 }
@@ -43,6 +46,9 @@ tables {
   action_refs {
     id: 21832421
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   implementation_id: 298015716
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.p4info.txtpb
index 77222614921..4c5e44dbf6c 100644
--- a/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.p4info.txtpb
@@ -27,6 +27,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.p4info.txtpb
index 0da67b1427e..d433db4d248 100644
--- a/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.p4info.txtpb
index 4d8217e326e..4e0ff220a3c 100644
--- a/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.p4info.txtpb
index 4d8217e326e..4e0ff220a3c 100644
--- a/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.p4info.txtpb
index 84b170de324..6f9e14f84a2 100644
--- a/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-range-match.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-range-match.p4.p4info.txtpb
index c8318f04900..1cdb547647c 100644
--- a/testdata/p4_16_samples_outputs/psa-example-range-match.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-range-match.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.p4info.txtpb
index 4d8217e326e..4e0ff220a3c 100644
--- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.p4info.txtpb
index 4d8217e326e..4e0ff220a3c 100644
--- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.p4info.txtpb
index 4d8217e326e..4e0ff220a3c 100644
--- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.p4info.txtpb
index 4d8217e326e..4e0ff220a3c 100644
--- a/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 29480552
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.p4info.txtpb
index 39765ee4796..6288bc21f4f 100644
--- a/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-02.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-02.p4.p4info.txtpb
index 1bac5d60713..62f25822e31 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-02.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-02.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21832421
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-03.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-03.p4.p4info.txtpb
index 1bac5d60713..62f25822e31 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-03.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-03.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21832421
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-04.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-04.p4.p4info.txtpb
index 1bac5d60713..62f25822e31 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-04.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-04.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21832421
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-05.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-05.p4.p4info.txtpb
index 1bac5d60713..62f25822e31 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-05.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-05.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21832421
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-06.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-06.p4.p4info.txtpb
index 28172e0b6fd..0d6ab4949eb 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-06.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-06.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21832421
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-07.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-07.p4.p4info.txtpb
index 1bac5d60713..62f25822e31 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-07.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-07.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21832421
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-08.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-08.p4.p4info.txtpb
index 28172e0b6fd..0d6ab4949eb 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-08.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-08.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21832421
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-09.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-09.p4.p4info.txtpb
index 1bac5d60713..62f25822e31 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-09.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-09.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21832421
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash-10.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-10.p4.p4info.txtpb
index 1bac5d60713..62f25822e31 100644
--- a/testdata/p4_16_samples_outputs/psa-hash-10.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash-10.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21832421
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-hash.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash.p4.p4info.txtpb
index 1bac5d60713..62f25822e31 100644
--- a/testdata/p4_16_samples_outputs/psa-hash.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-hash.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21832421
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-header-stack.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-header-stack.p4.p4info.txtpb
index f49cf68d40c..11acc71332c 100644
--- a/testdata/p4_16_samples_outputs/psa-header-stack.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-header-stack.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.p4info.txtpb
index 3aa21217e0c..9effd68d4df 100644
--- a/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
   idle_timeout_behavior: NOTIFY_CONTROL
 }
@@ -49,6 +52,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -72,6 +78,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-isvalid.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-isvalid.p4.p4info.txtpb
index 65e4717c1fb..189f18323a9 100644
--- a/testdata/p4_16_samples_outputs/psa-isvalid.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-isvalid.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-meter1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-meter1.p4.p4info.txtpb
index ed9d74c242c..2743b14840a 100644
--- a/testdata/p4_16_samples_outputs/psa-meter1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-meter1.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 22078320
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-meter3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-meter3.p4.p4info.txtpb
index b96cb9212b7..824e35c60f8 100644
--- a/testdata/p4_16_samples_outputs/psa-meter3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-meter3.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-meter4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-meter4.p4.p4info.txtpb
index ac49d6ee797..803e5413ed7 100644
--- a/testdata/p4_16_samples_outputs/psa-meter4.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-meter4.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 368068636
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-meter5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-meter5.p4.p4info.txtpb
index ac49d6ee797..803e5413ed7 100644
--- a/testdata/p4_16_samples_outputs/psa-meter5.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-meter5.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   direct_resource_ids: 368068636
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/psa-random.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-random.p4.p4info.txtpb
index 314edf21bb5..ddf12f95d83 100644
--- a/testdata/p4_16_samples_outputs/psa-random.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-random.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 18493089
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.p4info.txtpb
index 3d7cd41ac85..ff26c700be8 100644
--- a/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.p4info.txtpb
@@ -13,6 +13,9 @@ tables {
   action_refs {
     id: 25218586
   }
+  initial_default_action {
+    action_id: 25218586
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-register1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-register1.p4.p4info.txtpb
index 439bfee0bde..9a643f5dbe0 100644
--- a/testdata/p4_16_samples_outputs/psa-register1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-register1.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 23115527
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-register2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-register2.p4.p4info.txtpb
index 439bfee0bde..9a643f5dbe0 100644
--- a/testdata/p4_16_samples_outputs/psa-register2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-register2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 23115527
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-register3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-register3.p4.p4info.txtpb
index 0b8fdf17d58..e5668c48cd1 100644
--- a/testdata/p4_16_samples_outputs/psa-register3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-register3.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 23115527
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-remove-header.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-remove-header.p4.p4info.txtpb
index 3d9852d8302..c196d5d9fcb 100644
--- a/testdata/p4_16_samples_outputs/psa-remove-header.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-remove-header.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21620615
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.p4info.txtpb
index 7803495564f..77000ea616d 100644
--- a/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.p4info.txtpb
@@ -14,6 +14,9 @@ tables {
     id: 29027610
   }
   const_default_action_id: 29027610
+  initial_default_action {
+    action_id: 29027610
+  }
   size: 1000000
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.p4info.txtpb
index dcdf86beca4..7b101056e17 100644
--- a/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.p4info.txtpb
@@ -31,6 +31,9 @@ tables {
   action_refs {
     id: 23466264
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -42,6 +45,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -53,6 +59,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.p4info.txtpb
index d20ace0ae39..ebd66b5024a 100644
--- a/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21620615
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/psa-variable-index.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-variable-index.p4.p4info.txtpb
index c31e25dffa7..8cc14ddebb3 100644
--- a/testdata/p4_16_samples_outputs/psa-variable-index.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/psa-variable-index.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.p4info.txtpb
index 51220445cf2..3832a089452 100644
--- a/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.p4info.txtpb
index 089dd093472..a33dce39f0d 100644
--- a/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.p4info.txtpb
index 37a50337c7f..7c3aa3b3d3e 100644
--- a/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.p4info.txtpb
index 82d5e1bcea7..f398c960407 100644
--- a/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.p4info.txtpb
index 4e5eebfd067..b66ce6c3ca1 100644
--- a/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.p4info.txtpb
@@ -23,6 +23,9 @@ tables {
     id: 21257015
   }
   const_default_action_id: 21257015
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/saturated-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/saturated-bmv2.p4.p4info.txtpb
index 5df64c64875..5df3458c926 100644
--- a/testdata/p4_16_samples_outputs/saturated-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/saturated-bmv2.p4.p4info.txtpb
@@ -31,6 +31,9 @@ tables {
   action_refs {
     id: 33281717
   }
+  initial_default_action {
+    action_id: 33281717
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.p4info.txtpb
index 1cb229f9da2..aaab2091ed9 100644
--- a/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.p4info.txtpb
@@ -49,6 +49,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/slice-def-use1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/slice-def-use1.p4.p4info.txtpb
index 564f0106992..f7ff739f41f 100644
--- a/testdata/p4_16_samples_outputs/slice-def-use1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/slice-def-use1.p4.p4info.txtpb
@@ -14,6 +14,9 @@ tables {
     id: 30218393
   }
   const_default_action_id: 30218393
+  initial_default_action {
+    action_id: 30218393
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.p4info.txtpb
index b48fd73166a..413520298e3 100644
--- a/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.p4info.txtpb
@@ -14,6 +14,9 @@ tables {
     id: 29666769
   }
   const_default_action_id: 29666769
+  initial_default_action {
+    action_id: 29666769
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/std_meta_inlining.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/std_meta_inlining.p4.p4info.txtpb
index caa9c6b17b5..63badc4011d 100644
--- a/testdata/p4_16_samples_outputs/std_meta_inlining.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/std_meta_inlining.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/strength3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/strength3.p4.p4info.txtpb
index 7c8f03dc221..d8ad68e8a28 100644
--- a/testdata/p4_16_samples_outputs/strength3.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/strength3.p4.p4info.txtpb
@@ -35,6 +35,9 @@ tables {
     id: 19874155
   }
   const_default_action_id: 25451019
+  initial_default_action {
+    action_id: 25451019
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/strength6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/strength6.p4.p4info.txtpb
index c6640a95c50..e20b804aabb 100644
--- a/testdata/p4_16_samples_outputs/strength6.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/strength6.p4.p4info.txtpb
@@ -26,6 +26,9 @@ tables {
     id: 32959729
   }
   const_default_action_id: 25451019
+  initial_default_action {
+    action_id: 25451019
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/structured_annotations.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/structured_annotations.p4.p4info.txtpb
index 9a23f101f32..e98eef4c7fe 100644
--- a/testdata/p4_16_samples_outputs/structured_annotations.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/structured_annotations.p4.p4info.txtpb
@@ -78,6 +78,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.p4info.txtpb
index ecb1485917c..0ac84aaf112 100644
--- a/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 17165658
   }
+  initial_default_action {
+    action_id: 21186165
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.p4info.txtpb
index 99083cba15a..55bfaefb129 100644
--- a/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 17165658
   }
+  initial_default_action {
+    action_id: 21186165
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.p4info.txtpb
index 1693608bd91..9bdad5d3968 100644
--- a/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 17165658
   }
+  initial_default_action {
+    action_id: 21186165
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.p4info.txtpb
index 16fea8f083b..4108cf322f9 100644
--- a/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 17165658
   }
+  initial_default_action {
+    action_id: 21186165
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.p4info.txtpb
index 654c254029a..f5b6d8d7a8d 100644
--- a/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 17165658
   }
+  initial_default_action {
+    action_id: 21186165
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.p4info.txtpb
index 14f99e39995..cc955db21f5 100644
--- a/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 17165658
   }
+  initial_default_action {
+    action_id: 21186165
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.p4info.txtpb
index a57bdd471fe..2ad292b650e 100644
--- a/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.p4info.txtpb
@@ -29,6 +29,9 @@ tables {
     id: 17165658
   }
   const_default_action_id: 21186165
+  initial_default_action {
+    action_id: 21186165
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.p4info.txtpb
index 654c254029a..f5b6d8d7a8d 100644
--- a/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 17165658
   }
+  initial_default_action {
+    action_id: 21186165
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.p4info.txtpb
index ca0b6b5a5ad..536a1edc827 100644
--- a/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 17165658
   }
+  initial_default_action {
+    action_id: 21186165
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.p4info.txtpb
index 31fb3a2a65e..edeeb6eb0ef 100644
--- a/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.p4info.txtpb
@@ -24,6 +24,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.p4info.txtpb
index 6b38e3a88ea..be46d587722 100644
--- a/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 27489497
   }
+  initial_default_action {
+    action_id: 27489497
+  }
   size: 1024
 }
 tables {
@@ -51,6 +54,9 @@ tables {
   action_refs {
     id: 27489497
   }
+  initial_default_action {
+    action_id: 27489497
+  }
   size: 1024
 }
 tables {
@@ -71,6 +77,9 @@ tables {
   action_refs {
     id: 27489497
   }
+  initial_default_action {
+    action_id: 27489497
+  }
   size: 1024
 }
 tables {
@@ -91,6 +100,9 @@ tables {
   action_refs {
     id: 27489497
   }
+  initial_default_action {
+    action_id: 27489497
+  }
   size: 1024
 }
 tables {
@@ -111,6 +123,9 @@ tables {
   action_refs {
     id: 27489497
   }
+  initial_default_action {
+    action_id: 27489497
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.p4info.txtpb
index 8588efe5e00..570ab4d0bc8 100644
--- a/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -42,6 +45,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.p4info.txtpb
index 20348e1c0a8..eea1ef198c6 100644
--- a/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.p4info.txtpb
@@ -19,6 +19,9 @@ tables {
   action_refs {
     id: 21186165
   }
+  initial_default_action {
+    action_id: 21186165
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.p4info.txtpb
index 5b7beb2db3b..d7aed5ce8e0 100644
--- a/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.p4info.txtpb
@@ -14,6 +14,13 @@ tables {
     id: 32530319
   }
   const_default_action_id: 32530319
+  initial_default_action {
+    action_id: 32530319
+    arguments {
+      param_id: 1
+      value: "\000\000"
+    }
+  }
   direct_resource_ids: 330698586
   size: 1024
 }
diff --git a/testdata/p4_16_samples_outputs/use-priority-as-name.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/use-priority-as-name.p4.p4info.txtpb
index 1d875662069..fb6160b6512 100644
--- a/testdata/p4_16_samples_outputs/use-priority-as-name.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/use-priority-as-name.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 32254556
   }
+  initial_default_action {
+    action_id: 32254556
+  }
   size: 1024
 }
 tables {
@@ -42,6 +45,9 @@ tables {
   action_refs {
     id: 32254556
   }
+  initial_default_action {
+    action_id: 32254556
+  }
   size: 1024
 }
 tables {
@@ -62,6 +68,9 @@ tables {
   action_refs {
     id: 27859478
   }
+  initial_default_action {
+    action_id: 27859478
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.p4info.txtpb
index be3e316af74..874a938ec03 100644
--- a/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.p4info.txtpb
@@ -23,6 +23,9 @@ tables {
     id: 28447573
   }
   const_default_action_id: 30352513
+  initial_default_action {
+    action_id: 30352513
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
diff --git a/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.p4info.txtpb
index 809e574c4c0..f38263d436e 100644
--- a/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.p4info.txtpb
@@ -25,6 +25,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -48,6 +51,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -68,6 +74,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.p4info.txtpb
index f10ad8453e2..1a89cfe410b 100644
--- a/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.p4info.txtpb
@@ -28,6 +28,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -54,6 +57,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -74,6 +80,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.p4info.txtpb
index a5570779506..e6fb07d2c32 100644
--- a/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.p4info.txtpb
@@ -238,6 +238,9 @@ tables {
   action_refs {
     id: 21580947
   }
+  initial_default_action {
+    action_id: 21580947
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.p4info.txtpb
index a5570779506..e6fb07d2c32 100644
--- a/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.p4info.txtpb
@@ -238,6 +238,9 @@ tables {
   action_refs {
     id: 21580947
   }
+  initial_default_action {
+    action_id: 21580947
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.p4info.txtpb
index 23eac0411d1..93acd7a0875 100644
--- a/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.p4info.txtpb
@@ -31,6 +31,9 @@ tables {
   action_refs {
     id: 32609675
   }
+  initial_default_action {
+    action_id: 32609675
+  }
   size: 1024
 }
 tables {
@@ -51,6 +54,9 @@ tables {
   action_refs {
     id: 32609675
   }
+  initial_default_action {
+    action_id: 32609675
+  }
   size: 1024
 }
 tables {
@@ -79,6 +85,9 @@ tables {
     annotations: "@defaultonly"
     scope: DEFAULT_ONLY
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 tables {
@@ -105,6 +114,9 @@ tables {
   action_refs {
     id: 32609675
   }
+  initial_default_action {
+    action_id: 32609675
+  }
   size: 1024
 }
 actions {
diff --git a/testdata/p4_16_samples_outputs/xor_test.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/xor_test.p4.p4info.txtpb
index 5e34fe562f0..0a66de9e3bf 100644
--- a/testdata/p4_16_samples_outputs/xor_test.p4.p4info.txtpb
+++ b/testdata/p4_16_samples_outputs/xor_test.p4.p4info.txtpb
@@ -22,6 +22,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
   is_const_table: true
   has_initial_entries: true
@@ -83,6 +86,9 @@ tables {
   action_refs {
     id: 21257015
   }
+  initial_default_action {
+    action_id: 21257015
+  }
   size: 1024
 }
 actions {