diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 2ca81f5..859e464 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -21,22 +21,22 @@
   "deps": {
     "dart": {
       "branch": "refs/heads/main",
-      "revision": "1688a772e560683621d973f57beb7a0d9cd4ffe6",
+      "revision": "de897fff3261f035de00d3a0f230a248f0ee997e",
       "url": "https://dart.googlesource.com/recipes.git"
     },
     "depot_tools": {
       "branch": "refs/heads/main",
-      "revision": "927e02b156cb205fd4cfeb94b12ba664011acc6a",
+      "revision": "1a616deaac7e579d5d6ab463f99657dcec5ce9b5",
       "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
     },
     "fuchsia": {
       "branch": "refs/heads/main",
-      "revision": "8e166f279a984166d2f7cd9817ee1a8fc3f617b6",
+      "revision": "19eec9b6c12545e29835f25a45575af13369e59f",
       "url": "https://fuchsia.googlesource.com/infra/recipes.git"
     },
     "recipe_engine": {
       "branch": "refs/heads/main",
-      "revision": "ea27cb4d3bbc4556feb13ad4f2b7387abb024904",
+      "revision": "d6fc92b071f47d5b8848dae4854bf3fd6531a5c1",
       "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
     }
   },
diff --git a/recipes/infra/ci_yaml.expected/basic.json b/recipes/infra/ci_yaml.expected/basic.json
index e3b1415..1532c78 100644
--- a/recipes/infra/ci_yaml.expected/basic.json
+++ b/recipes/infra/ci_yaml.expected/basic.json
@@ -1339,7 +1339,14 @@
       "@@@STEP_LOG_LINE@json.output@  \"current_revision\": \"abc123\",@@@",
       "@@@STEP_LOG_LINE@json.output@  \"labels\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"Commit-Queue\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"approved\": {}@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"all\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@        {@@@",
+      "@@@STEP_LOG_LINE@json.output@          \"value\": 2@@@",
+      "@@@STEP_LOG_LINE@json.output@        }@@@",
+      "@@@STEP_LOG_LINE@json.output@      ],@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"approved\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"email\": \"roller@fuchsia-service-account.com\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  },@@@",
       "@@@STEP_LOG_LINE@json.output@  \"status\": \"MERGED\"@@@",
diff --git a/recipes/infra/ci_yaml.expected/release.json b/recipes/infra/ci_yaml.expected/release.json
index 9de3bbd..ebdb6ad 100644
--- a/recipes/infra/ci_yaml.expected/release.json
+++ b/recipes/infra/ci_yaml.expected/release.json
@@ -1339,7 +1339,14 @@
       "@@@STEP_LOG_LINE@json.output@  \"current_revision\": \"abc123\",@@@",
       "@@@STEP_LOG_LINE@json.output@  \"labels\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"Commit-Queue\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"approved\": {}@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"all\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@        {@@@",
+      "@@@STEP_LOG_LINE@json.output@          \"value\": 2@@@",
+      "@@@STEP_LOG_LINE@json.output@        }@@@",
+      "@@@STEP_LOG_LINE@json.output@      ],@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"approved\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"email\": \"roller@fuchsia-service-account.com\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  },@@@",
       "@@@STEP_LOG_LINE@json.output@  \"status\": \"MERGED\"@@@",
diff --git a/recipes/infra/ci_yaml.expected/staging.json b/recipes/infra/ci_yaml.expected/staging.json
index 4b7b250..7040b31 100644
--- a/recipes/infra/ci_yaml.expected/staging.json
+++ b/recipes/infra/ci_yaml.expected/staging.json
@@ -1339,7 +1339,14 @@
       "@@@STEP_LOG_LINE@json.output@  \"current_revision\": \"abc123\",@@@",
       "@@@STEP_LOG_LINE@json.output@  \"labels\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"Commit-Queue\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"approved\": {}@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"all\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@        {@@@",
+      "@@@STEP_LOG_LINE@json.output@          \"value\": 2@@@",
+      "@@@STEP_LOG_LINE@json.output@        }@@@",
+      "@@@STEP_LOG_LINE@json.output@      ],@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"approved\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"email\": \"roller@fuchsia-service-account.com\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  },@@@",
       "@@@STEP_LOG_LINE@json.output@  \"status\": \"MERGED\"@@@",
diff --git a/recipes/infra/luci_config.expected/basic.json b/recipes/infra/luci_config.expected/basic.json
index f3d68b3..a111790 100644
--- a/recipes/infra/luci_config.expected/basic.json
+++ b/recipes/infra/luci_config.expected/basic.json
@@ -1,7 +1,10 @@
 [
   {
     "cmd": [],
-    "name": "checkout"
+    "name": "checkout",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@https://flutter.googlesource.com/infra@@@"
+    ]
   },
   {
     "cmd": [
diff --git a/recipes/infra/luci_config.expected/cq.json b/recipes/infra/luci_config.expected/cq.json
index ef6a4c4..f68a209 100644
--- a/recipes/infra/luci_config.expected/cq.json
+++ b/recipes/infra/luci_config.expected/cq.json
@@ -1,7 +1,10 @@
 [
   {
     "cmd": [],
-    "name": "checkout"
+    "name": "checkout",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@https://flutter.googlesource.com/infra@@@"
+    ]
   },
   {
     "cmd": [
diff --git a/recipes/recipes.expected/ci.json b/recipes/recipes.expected/ci.json
index c9f24ea..fc6dfbf 100644
--- a/recipes/recipes.expected/ci.json
+++ b/recipes/recipes.expected/ci.json
@@ -1,7 +1,10 @@
 [
   {
     "cmd": [],
-    "name": "checkout"
+    "name": "checkout",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@https://flutter.googlesource.com/recipes@@@"
+    ]
   },
   {
     "cmd": [],
@@ -1482,6 +1485,7 @@
     "cmd": [
       "git",
       "rebase",
+      "--rebase-merges",
       "deadbeef"
     ],
     "cwd": "[START_DIR]/recipes",
diff --git a/recipes/recipes.expected/cq_try.json b/recipes/recipes.expected/cq_try.json
index c9f24ea..fc6dfbf 100644
--- a/recipes/recipes.expected/cq_try.json
+++ b/recipes/recipes.expected/cq_try.json
@@ -1,7 +1,10 @@
 [
   {
     "cmd": [],
-    "name": "checkout"
+    "name": "checkout",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@https://flutter.googlesource.com/recipes@@@"
+    ]
   },
   {
     "cmd": [],
@@ -1482,6 +1485,7 @@
     "cmd": [
       "git",
       "rebase",
+      "--rebase-merges",
       "deadbeef"
     ],
     "cwd": "[START_DIR]/recipes",
diff --git a/recipes/tricium/tricium.expected/basic.json b/recipes/tricium/tricium.expected/basic.json
index 48bae44..4ab9964 100644
--- a/recipes/tricium/tricium.expected/basic.json
+++ b/recipes/tricium/tricium.expected/basic.json
@@ -1,7 +1,10 @@
 [
   {
     "cmd": [],
-    "name": "checkout"
+    "name": "checkout",
+    "~followup_annotations": [
+      "@@@STEP_TEXT@https://flutter.googlesource.com/recipes@@@"
+    ]
   },
   {
     "cmd": [