diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 7b78690da44..b3fc551e6d5 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,5 +1,5 @@
 {
-  "image": "ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273",
+  "image": "ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3",
   "remoteUser": "ubuntu",
   "privileged": true,
   "runArgs": [
@@ -16,7 +16,8 @@
   "workspaceFolder": "/ic",
   "initializeCommand": "mkdir -p ~/.aws ~/.ssh ~/.cache/cargo ~/.local/share/fish && touch ~/.zsh_history ~/.bash_history",
   "containerEnv": {
-    "CARGO_TARGET_DIR": "/home/ubuntu/.cache/cargo"
+    "CARGO_TARGET_DIR": "/home/ubuntu/.cache/cargo",
+    "USER": "${localEnv:USER}"
   },
   "mounts": [
     {
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 6bfa4dc3463..54a6a0e0288 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -94,7 +94,7 @@ go_deps.bzl               @dfinity/idx
 /rs/bitcoin/                                            @dfinity/ic-interface-owners
 /rs/bitcoin/adapter/                                    @dfinity/networking
 /rs/bitcoin/ckbtc/                                      @dfinity/cross-chain-team
-/rs/bitcoin/mock/                                       @dfinity/finint
+/rs/bitcoin/mock/                                       @dfinity/cross-chain-team
 /rs/bitcoin/client/                                     @dfinity/networking
 /rs/bitcoin/consensus/                                  @dfinity/execution @dfinity/consensus
 /rs/bitcoin/kyt/                                        @dfinity/cross-chain-team
diff --git a/.github/actions/bazel-test-all/action.yaml b/.github/actions/bazel-test-all/action.yaml
index f7273739779..85d5e2f62bb 100644
--- a/.github/actions/bazel-test-all/action.yaml
+++ b/.github/actions/bazel-test-all/action.yaml
@@ -68,6 +68,7 @@ runs:
           BAZEL_CI_CONFIG: ${{ inputs.BAZEL_CI_CONFIG }}
           BAZEL_EXTRA_ARGS: ${{ inputs.BAZEL_EXTRA_ARGS }}
           BAZEL_STARTUP_ARGS: ${{ inputs.BAZEL_STARTUP_ARGS }}
+          CI_EVENT_NAME: ${{ github.event_name }}
           CI_PULL_REQUEST_TARGET_BRANCH_NAME: ${{ github.event.pull_request.base.ref }}
           MERGE_BASE_SHA: ${{ github.event.pull_request.base.sha }}
           BRANCH_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
diff --git a/.github/workflows-source/ci-main.yml b/.github/workflows-source/ci-main.yml
index 0624b743927..b99f14cf3f5 100644
--- a/.github/workflows-source/ci-main.yml
+++ b/.github/workflows-source/ci-main.yml
@@ -24,7 +24,6 @@ env:
   CI_COMMIT_SHA: ${{ github.sha }}
   CI_JOB_NAME: ${{ github.job }}
   CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-  CI_PIPELINE_SOURCE: ${{ github.event_name }}
   CI_PROJECT_DIR: ${{ github.workspace }}
   CI_EVENT_NAME: ${{ github.event_name }}
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
@@ -34,7 +33,7 @@ env:
 
 anchors:
   image: &image
-    image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+    image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
   dind-large-setup: &dind-large-setup
     runs-on:
       labels: dind-large
diff --git a/.github/workflows-source/ci-pr-only.yml b/.github/workflows-source/ci-pr-only.yml
index b3f280aa35a..4f0f439016e 100644
--- a/.github/workflows-source/ci-pr-only.yml
+++ b/.github/workflows-source/ci-pr-only.yml
@@ -11,14 +11,13 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref }}
   cancel-in-progress: true
 env:
-  CI_PIPELINE_SOURCE: ${{ github.event_name }}
   CI_PROJECT_DIR: ${{ github.workspace }}
   MERGE_BRANCH: ${{ github.event.pull_request.base.ref }}
   ORG: ${{ github.repository_owner }}
 
 anchors:
   image: &image
-    image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+    image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
   dind-small-setup: &dind-small-setup
     timeout-minutes: 30
     runs-on:
@@ -81,6 +80,8 @@ jobs:
     name: Lock Generate
     <<: *dind-small-setup
     <<: *skip-merge-group
+    env:
+      CI_EVENT_NAME: ${{ github.event_name }}
     steps:
       - name: Create GitHub App Token
         uses: actions/create-github-app-token@v1
diff --git a/.github/workflows-source/release-testing.yml b/.github/workflows-source/release-testing.yml
index 903f22d9304..8611ef4d72e 100644
--- a/.github/workflows-source/release-testing.yml
+++ b/.github/workflows-source/release-testing.yml
@@ -16,7 +16,6 @@ env:
   CI_COMMIT_SHA: ${{ github.sha }}
   CI_JOB_NAME: ${{ github.job }}
   CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-  CI_PIPELINE_SOURCE: ${{ github.event_name }}
   CI_PROJECT_DIR: ${{ github.workspace }}
   BRANCH_NAME: ${{ github.event.workflow_run.head_branch || github.ref_name }}
   CI_RUN_ID: ${{ github.run_id }}
@@ -25,7 +24,7 @@ env:
 
 anchors:
   image: &image
-    image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+    image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
   dind-large-setup: &dind-large-setup
     runs-on:
       group: zh1
diff --git a/.github/workflows-source/schedule-daily.yml b/.github/workflows-source/schedule-daily.yml
index 8311e68fbca..8026c4b14e4 100644
--- a/.github/workflows-source/schedule-daily.yml
+++ b/.github/workflows-source/schedule-daily.yml
@@ -11,14 +11,13 @@ env:
   CI_COMMIT_SHA: ${{ github.sha }}
   CI_JOB_NAME: ${{ github.job }}
   CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-  CI_PIPELINE_SOURCE: ${{ github.event_name }}
   CI_PROJECT_DIR: ${{ github.workspace }}
   CI_RUN_ID: ${{ github.run_id }}
   BUILDEVENT_DATASET: "github-ci-dfinity"
 
 anchors:
   image: &image
-    image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+    image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
   dind-large-setup: &dind-large-setup
     runs-on:
       group: zh1
diff --git a/.github/workflows-source/schedule-hourly.yml b/.github/workflows-source/schedule-hourly.yml
index c5a3091434d..d8c123d4986 100644
--- a/.github/workflows-source/schedule-hourly.yml
+++ b/.github/workflows-source/schedule-hourly.yml
@@ -10,7 +10,6 @@ env:
   CI_COMMIT_SHA: ${{ github.sha }}
   CI_JOB_NAME: ${{ github.job }}
   CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-  CI_PIPELINE_SOURCE: ${{ github.event_name }}
   CI_PROJECT_DIR: ${{ github.workspace }}
   CI_RUN_ID: ${{ github.run_id }}
   RUSTFLAGS: "--remap-path-prefix=${CI_PROJECT_DIR}=/ic"
@@ -18,7 +17,7 @@ env:
 
 anchors:
   image: &image
-    image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+    image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
   dind-large-setup: &dind-large-setup
     runs-on:
       labels: dind-large
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index 41e3956cf8b..c4c85e35889 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -21,7 +21,6 @@ env:
   CI_COMMIT_SHA: ${{ github.sha }}
   CI_JOB_NAME: ${{ github.job }}
   CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-  CI_PIPELINE_SOURCE: ${{ github.event_name }}
   CI_PROJECT_DIR: ${{ github.workspace }}
   CI_EVENT_NAME: ${{ github.event_name }}
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
@@ -32,7 +31,7 @@ jobs:
   bazel-test-all:
     name: Bazel Test All
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info
     timeout-minutes: 90
@@ -131,7 +130,7 @@ jobs:
     runs-on:
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info
     timeout-minutes: 90
@@ -225,7 +224,7 @@ jobs:
     runs-on:
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info
     timeout-minutes: 90
@@ -260,7 +259,7 @@ jobs:
     runs-on:
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info
     timeout-minutes: 90
@@ -295,7 +294,7 @@ jobs:
     runs-on:
       labels: dind-small
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
     timeout-minutes: 30
     steps:
       - name: Checkout
@@ -325,7 +324,7 @@ jobs:
   build-ic:
     name: Build IC
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp -v /ceph-s3-info:/ceph-s3-info
     timeout-minutes: 90
@@ -428,7 +427,7 @@ jobs:
   cargo-clippy-linux:
     name: Cargo Clippy Linux
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
     timeout-minutes: 30
     runs-on:
       group: ch1
@@ -465,7 +464,7 @@ jobs:
   cargo-build-release-linux:
     name: Cargo Build Release Linux
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
     timeout-minutes: 30
     runs-on:
       group: ch1
diff --git a/.github/workflows/ci-pr-only.yml b/.github/workflows/ci-pr-only.yml
index 7f68ca8856c..b5762b2af44 100644
--- a/.github/workflows/ci-pr-only.yml
+++ b/.github/workflows/ci-pr-only.yml
@@ -10,7 +10,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref }}
   cancel-in-progress: true
 env:
-  CI_PIPELINE_SOURCE: ${{ github.event_name }}
   CI_PROJECT_DIR: ${{ github.workspace }}
   MERGE_BRANCH: ${{ github.event.pull_request.base.ref }}
   ORG: ${{ github.repository_owner }}
@@ -21,7 +20,7 @@ jobs:
     runs-on:
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME
     if: ${{ github.event_name != 'merge_group' }}
@@ -62,10 +61,12 @@ jobs:
     runs-on:
       labels: dind-small
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME
     if: ${{ github.event_name != 'merge_group' }}
+    env:
+      CI_EVENT_NAME: ${{ github.event_name }}
     steps:
       - name: Create GitHub App Token
         uses: actions/create-github-app-token@v1
@@ -101,7 +102,7 @@ jobs:
     runs-on:
       labels: dind-small
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME
     if: ${{ github.event_name != 'merge_group' }}
@@ -149,7 +150,7 @@ jobs:
     runs-on:
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME
     if: contains(github.event.pull_request.labels.*.name, 'CI_COVERAGE')
diff --git a/.github/workflows/release-testing.yml b/.github/workflows/release-testing.yml
index 7faa7d9365f..a685050eaed 100644
--- a/.github/workflows/release-testing.yml
+++ b/.github/workflows/release-testing.yml
@@ -13,7 +13,6 @@ env:
   CI_COMMIT_SHA: ${{ github.sha }}
   CI_JOB_NAME: ${{ github.job }}
   CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-  CI_PIPELINE_SOURCE: ${{ github.event_name }}
   CI_PROJECT_DIR: ${{ github.workspace }}
   BRANCH_NAME: ${{ github.event.workflow_run.head_branch || github.ref_name }}
   CI_RUN_ID: ${{ github.run_id }}
@@ -30,7 +29,7 @@ jobs:
       group: zh1
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp
     timeout-minutes: 180 # 3 hours
@@ -73,7 +72,7 @@ jobs:
       group: zh1
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp
     timeout-minutes: 180 # 3 hours
@@ -116,7 +115,7 @@ jobs:
       group: zh1
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp
     timeout-minutes: 90
@@ -159,7 +158,7 @@ jobs:
       group: zh1
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp
     timeout-minutes: 60
@@ -207,7 +206,7 @@ jobs:
       group: zh1
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp
     timeout-minutes: 180 # 3 hours
@@ -235,7 +234,7 @@ jobs:
       group: zh1
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp
     timeout-minutes: 180 # 3 hours
diff --git a/.github/workflows/rosetta-release.yml b/.github/workflows/rosetta-release.yml
index 0b8c1336c8f..02bc9f13215 100644
--- a/.github/workflows/rosetta-release.yml
+++ b/.github/workflows/rosetta-release.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on:
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -89,5 +89,5 @@ jobs:
           for tag in "v${ICRC_ROSETTA_RELEASE_VERSION}" latest; do
             bazel run --stamp --embed_label="$tag" //rs/rosetta-api/icrc1:push_ic_icrc_rosetta_image
           done
-          git tag "icrc-rosetta-release-$ICRC_ROSETTA_RELEASE_VERSION" "${{ github.sha }}"
-          git push origin "icrc-rosetta-release-$ICRC_ROSETTA_RELEASE_VERSION"
+          git tag "rosetta-icrc-release-$ICRC_ROSETTA_RELEASE_VERSION" "${{ github.sha }}"
+          git push origin "rosetta-icrc-release-$ICRC_ROSETTA_RELEASE_VERSION"
diff --git a/.github/workflows/schedule-daily.yml b/.github/workflows/schedule-daily.yml
index 16c2cab989b..8ba8c49678e 100644
--- a/.github/workflows/schedule-daily.yml
+++ b/.github/workflows/schedule-daily.yml
@@ -9,7 +9,6 @@ env:
   CI_COMMIT_SHA: ${{ github.sha }}
   CI_JOB_NAME: ${{ github.job }}
   CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-  CI_PIPELINE_SOURCE: ${{ github.event_name }}
   CI_PROJECT_DIR: ${{ github.workspace }}
   CI_RUN_ID: ${{ github.run_id }}
   BUILDEVENT_DATASET: "github-ci-dfinity"
@@ -17,7 +16,7 @@ jobs:
   bazel-test-bare-metal:
     name: Bazel Test Bare Metal
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp
     timeout-minutes: 120
@@ -75,7 +74,7 @@ jobs:
       group: zh1
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp
     timeout-minutes: 720 # 12 hours
@@ -117,7 +116,7 @@ jobs:
       group: zh1
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp
     timeout-minutes: 20
@@ -159,7 +158,7 @@ jobs:
       group: zh1
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp
     timeout-minutes: 480
@@ -206,7 +205,7 @@ jobs:
       group: zh1
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp
     timeout-minutes: 60
@@ -258,7 +257,7 @@ jobs:
       group: zh1
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp
     timeout-minutes: 120
diff --git a/.github/workflows/schedule-hourly.yml b/.github/workflows/schedule-hourly.yml
index 3cc86817af1..f313e5c6bc5 100644
--- a/.github/workflows/schedule-hourly.yml
+++ b/.github/workflows/schedule-hourly.yml
@@ -8,7 +8,6 @@ env:
   CI_COMMIT_SHA: ${{ github.sha }}
   CI_JOB_NAME: ${{ github.job }}
   CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-  CI_PIPELINE_SOURCE: ${{ github.event_name }}
   CI_PROJECT_DIR: ${{ github.workspace }}
   CI_RUN_ID: ${{ github.run_id }}
   RUSTFLAGS: "--remap-path-prefix=${CI_PROJECT_DIR}=/ic"
@@ -19,7 +18,7 @@ jobs:
     runs-on:
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp
     timeout-minutes: 120
@@ -56,7 +55,7 @@ jobs:
   bazel-system-test-hourly:
     name: Bazel System Tests Hourly
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp
     timeout-minutes: 120
@@ -99,7 +98,7 @@ jobs:
     runs-on:
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME --privileged --cgroupns host -v /cache:/cache -v /var/sysimage:/var/sysimage -v /var/tmp:/var/tmp
     timeout-minutes: 120
diff --git a/.github/workflows/schedule-rust-bench.yml b/.github/workflows/schedule-rust-bench.yml
index fbd4035e9cc..a16e5c3bc36 100644
--- a/.github/workflows/schedule-rust-bench.yml
+++ b/.github/workflows/schedule-rust-bench.yml
@@ -11,7 +11,6 @@ env:
   CI_COMMIT_SHA: ${{ github.sha }}
   CI_JOB_NAME: ${{ github.job }}
   CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-  CI_PIPELINE_SOURCE: ${{ github.event_name }}
   CI_PROJECT_DIR: ${{ github.workspace }}
   CI_RUN_ID: ${{ github.run_id }}
   BUILDEVENT_DATASET: "github-ci-dfinity"
@@ -24,7 +23,7 @@ jobs:
       # see linux-x86-64 runner group
       labels: rust-benchmarks
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       # running on bare metal machine using ubuntu user
       options: --user ubuntu -v /cache:/cache
     timeout-minutes: 720 # 12 hours
diff --git a/.github/workflows/schedule-weekly.yml b/.github/workflows/schedule-weekly.yml
index 4d3e5283ce3..9c19416ec36 100644
--- a/.github/workflows/schedule-weekly.yml
+++ b/.github/workflows/schedule-weekly.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on:
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME
         -v /cache:/cache
diff --git a/.github/workflows/sync-public-with-private.yml b/.github/workflows/sync-public-with-private.yml
index 9996dc8c3a7..5bbb48c2bc8 100644
--- a/.github/workflows/sync-public-with-private.yml
+++ b/.github/workflows/sync-public-with-private.yml
@@ -13,17 +13,25 @@ jobs:
       image: ghcr.io/dfinity/minimal-runner-image:0.1
     if: ${{ github.repository != 'dfinity/ic' }}
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        ref: 'master-private'
-        token: ${{ secrets.PUSH_TO_IC_PRIVATE }}
-
-    - name: Sync changes from public ic
-      run: |
-        git config --global user.name "IDX GitHub Automation"
-        git config --global user.email "idx@dfinity.org"
-
-        git remote add public https://github.com/dfinity/ic.git
-        git fetch public master
-        git push origin public/master:master-private
+      - name: Create GitHub App Token
+        uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          # The app used for this is actually PR_AUTOMATION_BOT_PRIVATE, but because the env
+          # vars need to be the same across both repos, we use the same names as the public one
+          app-id: ${{ vars.PR_AUTOMATION_BOT_PUBLIC_APP_ID }}
+          private-key: ${{ secrets.PR_AUTOMATION_BOT_PUBLIC_PRIVATE_KEY }}
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: 'master-private'
+          token: ${{ steps.app-token.outputs.token }}
+  
+      - name: Sync changes from public ic
+        run: |
+          git config --global user.name "IDX GitHub Automation"
+          git config --global user.email "idx@dfinity.org"
+  
+          git remote add public https://github.com/dfinity/ic.git
+          git fetch public master
+          git push origin public/master:master-private
diff --git a/.github/workflows/system-tests-k8s.yml b/.github/workflows/system-tests-k8s.yml
index 3441f547092..9b63accc484 100644
--- a/.github/workflows/system-tests-k8s.yml
+++ b/.github/workflows/system-tests-k8s.yml
@@ -49,7 +49,7 @@ jobs:
       group: ln1
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME -e KUBECONFIG
         --privileged --cgroupns host
@@ -104,7 +104,7 @@ jobs:
       group: ln1
       labels: dind-large
     container:
-      image: ghcr.io/dfinity/ic-build@sha256:3cc80d1a2d5789b69f6a7f170280bb3763a54acce299430903f59718f904f273
+      image: ghcr.io/dfinity/ic-build@sha256:6a548dd4cfee96260b6938fddaa74abc86fc0df5c407d4eef135694b64c288e3
       options: >-
         -e NODE_NAME -e KUBECONFIG
         --privileged --cgroupns host
diff --git a/Cargo.Bazel.Fuzzing.json.lock b/Cargo.Bazel.Fuzzing.json.lock
index 6a4abb6e55e..39bd2bcf3d2 100644
--- a/Cargo.Bazel.Fuzzing.json.lock
+++ b/Cargo.Bazel.Fuzzing.json.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "1771e8a5f1fdb0c8cf153411c37a9a8aab8ff03252dbb22817a79363ad197c9b",
+  "checksum": "3fbe6f0bc1150dc7e649e3be6d14ab3560751213130f5f2404d9e38092e2d002",
   "crates": {
     "abnf 0.12.0": {
       "name": "abnf",
@@ -19028,6 +19028,10 @@
               "id": "lru 0.7.8",
               "target": "lru"
             },
+            {
+              "id": "macaddr 1.0.1",
+              "target": "macaddr"
+            },
             {
               "id": "mach2 0.4.2",
               "target": "mach2"
@@ -40066,7 +40070,13 @@
           "commitish": {
             "Rev": "4d952c8f1dca79de855af892b444d7112567b58d"
           },
-          "strip_prefix": "lmdb-sys"
+          "strip_prefix": "lmdb-sys",
+          "patch_args": [
+            "-p1"
+          ],
+          "patches": [
+            "@@//bazel:lmdb_rkv_sys.patch"
+          ]
         }
       },
       "targets": [
@@ -40119,12 +40129,6 @@
           ],
           "selects": {}
         },
-        "extra_deps": {
-          "common": [
-            "@lmdb//:lmdb"
-          ],
-          "selects": {}
-        },
         "edition": "2015",
         "version": "0.11.99"
       },
@@ -40134,6 +40138,7 @@
         ],
         "data": {
           "common": [
+            "@lmdb//:liblmdb",
             "@lmdb//:lmdb.h"
           ],
           "selects": {}
@@ -40157,7 +40162,7 @@
         "build_script_env": {
           "common": {
             "LMDB_H_PATH": "$(location @lmdb//:lmdb.h)",
-            "LMDB_NO_BUILD": "1"
+            "LMDB_OVERRIDE": "$(location @lmdb//:liblmdb)"
           },
           "selects": {}
         }
@@ -40974,6 +40979,52 @@
       ],
       "license_file": null
     },
+    "macaddr 1.0.1": {
+      "name": "macaddr",
+      "version": "1.0.1",
+      "package_url": "https://github.com/svartalf/rust-macaddr",
+      "repository": {
+        "Http": {
+          "url": "https://static.crates.io/crates/macaddr/1.0.1/download",
+          "sha256": "baee0bbc17ce759db233beb01648088061bf678383130602a298e6998eedb2d8"
+        }
+      },
+      "targets": [
+        {
+          "Library": {
+            "crate_name": "macaddr",
+            "crate_root": "src/lib.rs",
+            "srcs": {
+              "allow_empty": true,
+              "include": [
+                "**/*.rs"
+              ]
+            }
+          }
+        }
+      ],
+      "library_target_name": "macaddr",
+      "common_attrs": {
+        "compile_data_glob": [
+          "**"
+        ],
+        "crate_features": {
+          "common": [
+            "default",
+            "std"
+          ],
+          "selects": {}
+        },
+        "edition": "2018",
+        "version": "1.0.1"
+      },
+      "license": "Apache-2.0 OR MIT",
+      "license_ids": [
+        "Apache-2.0",
+        "MIT"
+      ],
+      "license_file": "LICENSE-APACHE"
+    },
     "mach2 0.4.2": {
       "name": "mach2",
       "version": "0.4.2",
@@ -87754,6 +87805,7 @@
     "lmdb-rkv-sys 0.11.99",
     "local-ip-address 0.5.6",
     "lru 0.7.8",
+    "macaddr 1.0.1",
     "mach2 0.4.2",
     "maplit 1.0.2",
     "maxminddb 0.24.0",
diff --git a/Cargo.Bazel.Fuzzing.toml.lock b/Cargo.Bazel.Fuzzing.toml.lock
index 16442ffcaa4..75d9febc2e9 100644
--- a/Cargo.Bazel.Fuzzing.toml.lock
+++ b/Cargo.Bazel.Fuzzing.toml.lock
@@ -3140,6 +3140,7 @@ dependencies = [
  "lmdb-rkv-sys",
  "local-ip-address",
  "lru",
+ "macaddr",
  "mach2",
  "maplit",
  "maxminddb",
@@ -6686,6 +6687,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
 
+[[package]]
+name = "macaddr"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baee0bbc17ce759db233beb01648088061bf678383130602a298e6998eedb2d8"
+
 [[package]]
 name = "mach2"
 version = "0.4.2"
diff --git a/Cargo.Bazel.json.lock b/Cargo.Bazel.json.lock
index d79b92c2d18..1aaef252187 100644
--- a/Cargo.Bazel.json.lock
+++ b/Cargo.Bazel.json.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "8a0463c997697666d544fe6b2e5aae9ebf90ceb2daaaaca94f6e0664819e9af0",
+  "checksum": "a3824c6dae08a250d31e5907e2eff62575b38fd163dbb7e1c0f0ba342d66dc29",
   "crates": {
     "abnf 0.12.0": {
       "name": "abnf",
@@ -18856,6 +18856,10 @@
               "id": "lru 0.7.8",
               "target": "lru"
             },
+            {
+              "id": "macaddr 1.0.1",
+              "target": "macaddr"
+            },
             {
               "id": "mach2 0.4.2",
               "target": "mach2"
@@ -39903,7 +39907,13 @@
           "commitish": {
             "Rev": "4d952c8f1dca79de855af892b444d7112567b58d"
           },
-          "strip_prefix": "lmdb-sys"
+          "strip_prefix": "lmdb-sys",
+          "patch_args": [
+            "-p1"
+          ],
+          "patches": [
+            "@@//bazel:lmdb_rkv_sys.patch"
+          ]
         }
       },
       "targets": [
@@ -39956,12 +39966,6 @@
           ],
           "selects": {}
         },
-        "extra_deps": {
-          "common": [
-            "@lmdb//:lmdb"
-          ],
-          "selects": {}
-        },
         "edition": "2015",
         "version": "0.11.99"
       },
@@ -39971,6 +39975,7 @@
         ],
         "data": {
           "common": [
+            "@lmdb//:liblmdb",
             "@lmdb//:lmdb.h"
           ],
           "selects": {}
@@ -39994,7 +39999,7 @@
         "build_script_env": {
           "common": {
             "LMDB_H_PATH": "$(location @lmdb//:lmdb.h)",
-            "LMDB_NO_BUILD": "1"
+            "LMDB_OVERRIDE": "$(location @lmdb//:liblmdb)"
           },
           "selects": {}
         }
@@ -40815,6 +40820,52 @@
       ],
       "license_file": null
     },
+    "macaddr 1.0.1": {
+      "name": "macaddr",
+      "version": "1.0.1",
+      "package_url": "https://github.com/svartalf/rust-macaddr",
+      "repository": {
+        "Http": {
+          "url": "https://static.crates.io/crates/macaddr/1.0.1/download",
+          "sha256": "baee0bbc17ce759db233beb01648088061bf678383130602a298e6998eedb2d8"
+        }
+      },
+      "targets": [
+        {
+          "Library": {
+            "crate_name": "macaddr",
+            "crate_root": "src/lib.rs",
+            "srcs": {
+              "allow_empty": true,
+              "include": [
+                "**/*.rs"
+              ]
+            }
+          }
+        }
+      ],
+      "library_target_name": "macaddr",
+      "common_attrs": {
+        "compile_data_glob": [
+          "**"
+        ],
+        "crate_features": {
+          "common": [
+            "default",
+            "std"
+          ],
+          "selects": {}
+        },
+        "edition": "2018",
+        "version": "1.0.1"
+      },
+      "license": "Apache-2.0 OR MIT",
+      "license_ids": [
+        "Apache-2.0",
+        "MIT"
+      ],
+      "license_file": "LICENSE-APACHE"
+    },
     "mach2 0.4.2": {
       "name": "mach2",
       "version": "0.4.2",
@@ -87634,6 +87685,7 @@
     "lmdb-rkv-sys 0.11.99",
     "local-ip-address 0.5.6",
     "lru 0.7.8",
+    "macaddr 1.0.1",
     "mach2 0.4.2",
     "maplit 1.0.2",
     "maxminddb 0.24.0",
diff --git a/Cargo.Bazel.toml.lock b/Cargo.Bazel.toml.lock
index 46261e373f7..556b8d5bc51 100644
--- a/Cargo.Bazel.toml.lock
+++ b/Cargo.Bazel.toml.lock
@@ -3129,6 +3129,7 @@ dependencies = [
  "lmdb-rkv-sys",
  "local-ip-address",
  "lru",
+ "macaddr",
  "mach2",
  "maplit",
  "maxminddb",
@@ -6677,6 +6678,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
 
+[[package]]
+name = "macaddr"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baee0bbc17ce759db233beb01648088061bf678383130602a298e6998eedb2d8"
+
 [[package]]
 name = "mach2"
 version = "0.4.2"
diff --git a/Cargo.lock b/Cargo.lock
index cad39cd54bc..c5c1eb3fde9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -362,24 +362,6 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
-[[package]]
-name = "anonymization-backend"
-version = "0.1.0"
-dependencies = [
- "anonymization-interface",
- "anyhow",
- "async-trait",
- "candid",
- "ic-cdk 0.16.0",
- "ic-cdk-timers",
- "ic-nns-constants",
- "ic-stable-structures",
- "lazy_static",
- "prometheus",
- "serde",
- "thiserror 2.0.3",
-]
-
 [[package]]
 name = "anonymization-client"
 version = "0.1.0"
@@ -405,6 +387,24 @@ dependencies = [
  "serde_bytes",
 ]
 
+[[package]]
+name = "anonymization_backend"
+version = "0.1.0"
+dependencies = [
+ "anonymization-interface",
+ "anyhow",
+ "async-trait",
+ "candid",
+ "ic-cdk 0.16.0",
+ "ic-cdk-timers",
+ "ic-nns-constants",
+ "ic-stable-structures",
+ "lazy_static",
+ "prometheus",
+ "serde",
+ "thiserror 2.0.3",
+]
+
 [[package]]
 name = "anstream"
 version = "0.6.15"
@@ -1822,7 +1822,7 @@ name = "canister_client"
 version = "0.9.0"
 dependencies = [
  "candid",
- "ic-agent",
+ "ic-agent 0.37.1",
  "k256",
  "rate-limits-api",
  "regex",
@@ -1929,7 +1929,7 @@ dependencies = [
  "flate2",
  "futures",
  "http 1.1.0",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-http-certification",
  "ic-response-verification",
  "ic-utils 0.37.0",
@@ -2354,8 +2354,8 @@ dependencies = [
  "anyhow",
  "clap 4.5.20",
  "config_types",
- "deterministic_ips",
  "ic-types",
+ "macaddr",
  "network",
  "once_cell",
  "regex",
@@ -2372,13 +2372,14 @@ name = "config_types"
 version = "1.0.0"
 dependencies = [
  "anyhow",
- "deterministic_ips",
  "ic-types",
+ "macaddr",
  "once_cell",
  "serde",
  "serde_json",
  "serde_with 1.14.0",
  "tempfile",
+ "thiserror 2.0.3",
  "url",
 ]
 
@@ -2409,7 +2410,7 @@ dependencies = [
  "anyhow",
  "canister-test",
  "canister_http",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-interfaces-registry",
  "ic-nns-common",
@@ -2441,7 +2442,7 @@ dependencies = [
  "candid",
  "canister-test",
  "canister_http",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-canister-client",
  "ic-management-canister-types",
@@ -2469,7 +2470,7 @@ dependencies = [
  "canister-test",
  "chrono",
  "futures",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-config",
  "ic-limits",
@@ -2502,7 +2503,7 @@ dependencies = [
  "anyhow",
  "candid",
  "futures",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-canister-client",
  "ic-management-canister-types",
  "ic-nervous-system-common-test-keys",
@@ -3374,7 +3375,9 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "clap 4.5.20",
+ "config_types",
  "ic-crypto-sha2",
+ "macaddr",
  "thiserror 2.0.3",
 ]
 
@@ -4088,7 +4091,7 @@ dependencies = [
  "bitcoincore-rpc",
  "candid",
  "futures",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-cdk 0.16.0",
  "ic-config",
@@ -4932,6 +4935,7 @@ dependencies = [
  "anyhow",
  "clap 4.5.20",
  "config",
+ "config_types",
  "deterministic_ips",
  "network",
  "utils",
@@ -5389,7 +5393,7 @@ dependencies = [
  "hyper-rustls 0.27.3",
  "hyper-util",
  "ic-certification 2.6.0",
- "ic-transport-types",
+ "ic-transport-types 0.37.1",
  "ic-verify-bls-signature 0.5.0",
  "k256",
  "leb128",
@@ -5415,6 +5419,50 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "ic-agent"
+version = "0.39.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "158138fcb769fe6288e63d5db221c904e472cfb7d376aba13a38c060f2984e63"
+dependencies = [
+ "async-lock",
+ "async-trait",
+ "backoff",
+ "cached 0.52.0",
+ "candid",
+ "der",
+ "ecdsa",
+ "ed25519-consensus",
+ "elliptic-curve",
+ "futures-util",
+ "hex",
+ "http 1.1.0",
+ "http-body 1.0.1",
+ "ic-certification 2.6.0",
+ "ic-transport-types 0.39.1",
+ "ic-verify-bls-signature 0.5.0",
+ "k256",
+ "leb128",
+ "p256",
+ "pem 3.0.4",
+ "pkcs8",
+ "rand 0.8.5",
+ "rangemap",
+ "reqwest 0.12.9",
+ "sec1",
+ "serde",
+ "serde_bytes",
+ "serde_cbor",
+ "serde_repr",
+ "sha2 0.10.8",
+ "simple_asn1",
+ "thiserror 1.0.68",
+ "time",
+ "tokio",
+ "tower-service",
+ "url",
+]
+
 [[package]]
 name = "ic-artifact-downloader"
 version = "0.1.0"
@@ -5616,7 +5664,7 @@ dependencies = [
 [[package]]
 name = "ic-bn-lib"
 version = "0.1.0"
-source = "git+https://github.com/dfinity/ic-bn-lib?rev=2496803db52d8182f578f098a3ffe4fcb9573fcd#2496803db52d8182f578f098a3ffe4fcb9573fcd"
+source = "git+https://github.com/dfinity/ic-bn-lib?rev=526d34d15cfbf369d8baf2dae9932aa18d570a1d#526d34d15cfbf369d8baf2dae9932aa18d570a1d"
 dependencies = [
  "ahash 0.8.11",
  "anyhow",
@@ -5664,7 +5712,7 @@ dependencies = [
  "strum_macros",
  "sync_wrapper 1.0.1",
  "systemstat",
- "thiserror 2.0.3",
+ "thiserror 1.0.68",
  "tokio",
  "tokio-io-timeout",
  "tokio-rustls 0.26.0",
@@ -5684,6 +5732,7 @@ dependencies = [
 name = "ic-boundary"
 version = "0.9.0"
 dependencies = [
+ "anonymization-client",
  "anyhow",
  "arc-swap",
  "async-scoped",
@@ -5702,14 +5751,20 @@ dependencies = [
  "http 1.1.0",
  "http-body 1.0.1",
  "humantime",
+ "ic-agent 0.39.1",
  "ic-base-types",
  "ic-bn-lib",
+ "ic-canister-client",
+ "ic-canister-client-sender",
  "ic-certification-test-utils",
  "ic-config",
+ "ic-crypto",
  "ic-crypto-ed25519",
  "ic-crypto-tree-hash",
+ "ic-crypto-utils-basic-sig",
  "ic-crypto-utils-threshold-sig-der",
  "ic-crypto-utils-tls",
+ "ic-interfaces",
  "ic-interfaces-registry",
  "ic-limits",
  "ic-logger",
@@ -5773,7 +5828,7 @@ dependencies = [
  "candid",
  "certificate_orchestrator_interface",
  "chacha20poly1305",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-interfaces-registry",
  "ic-protobuf",
  "ic-registry-keys",
@@ -5798,7 +5853,7 @@ version = "0.9.0"
 dependencies = [
  "anyhow",
  "futures",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-boundary-nodes-system-test-utils",
  "ic-crypto-tree-hash",
  "ic-system-test-driver",
@@ -5817,7 +5872,7 @@ version = "0.9.0"
 dependencies = [
  "anyhow",
  "candid",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-boundary-nodes-system-test-utils",
  "ic-protobuf",
  "ic-registry-keys",
@@ -5838,7 +5893,7 @@ version = "0.9.0"
 dependencies = [
  "anyhow",
  "futures",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-interfaces-registry",
  "ic-protobuf",
@@ -5990,12 +6045,15 @@ dependencies = [
  "hex",
  "ic-base-types",
  "ic-btc-interface",
+ "ic-canister-log 0.2.0",
  "ic-canisters-http-types",
  "ic-cdk 0.16.0",
+ "ic-metrics-encoder",
  "ic-stable-structures",
  "ic-test-utilities-load-wasm",
  "ic-types",
  "ic-universal-canister",
+ "num-traits",
  "pocket-ic",
  "scraper",
  "serde",
@@ -6065,6 +6123,7 @@ dependencies = [
  "ic-crypto-tree-hash",
  "ic-management-canister-types",
  "ic-protobuf",
+ "ic-read-state-response-parser",
  "ic-test-utilities",
  "ic-test-utilities-types",
  "ic-types",
@@ -6522,7 +6581,7 @@ name = "ic-ckbtc-agent"
 version = "0.9.0"
 dependencies = [
  "candid",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-canisters-http-types",
  "ic-ckbtc-minter",
  "ic-icrc1",
@@ -6570,7 +6629,7 @@ dependencies = [
  "ciborium",
  "flate2",
  "hex",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-bitcoin-canister-mock",
  "ic-btc-interface",
@@ -6627,7 +6686,7 @@ dependencies = [
  "futures",
  "hex",
  "hex-literal",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-canister-log 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ic-canisters-http-types",
@@ -8465,6 +8524,7 @@ dependencies = [
  "ic-metrics",
  "ic-pprof",
  "ic-protobuf",
+ "ic-read-state-response-parser",
  "ic-registry-client-helpers",
  "ic-registry-keys",
  "ic-registry-provisional-whitelist",
@@ -8556,7 +8616,7 @@ dependencies = [
  "http 1.1.0",
  "http-body 1.0.1",
  "http-body-util",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-http-certification",
  "ic-response-verification",
  "ic-utils 0.37.0",
@@ -8781,7 +8841,7 @@ dependencies = [
  "clap 4.5.20",
  "futures",
  "hex",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-icrc-rosetta-client",
  "ic-icrc-rosetta-runner",
@@ -8837,7 +8897,7 @@ dependencies = [
  "candid",
  "clap 4.5.20",
  "hex",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-crypto-ed25519",
  "ic-crypto-secp256k1",
  "ic-icrc-rosetta",
@@ -9021,7 +9081,7 @@ dependencies = [
  "candid",
  "candid_parser",
  "ciborium",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-canister-log 0.2.0",
  "ic-canister-profiler",
@@ -9067,7 +9127,7 @@ dependencies = [
  "cddl",
  "ciborium",
  "hex",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-canister-log 0.2.0",
  "ic-canisters-http-types",
@@ -9103,7 +9163,7 @@ name = "ic-icrc1-test-utils"
 version = "0.9.0"
 dependencies = [
  "candid",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-crypto-ed25519",
  "ic-crypto-secp256k1",
  "ic-crypto-test-utils-reproducible-rng",
@@ -9315,7 +9375,7 @@ dependencies = [
  "chrono",
  "ciborium",
  "dfn_protobuf",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-certification 0.9.0",
  "ic-crypto-sha2",
  "ic-ledger-canister-blocks-synchronizer-test-utils",
@@ -9461,7 +9521,7 @@ dependencies = [
  "cddl",
  "futures",
  "hex",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-canisters-http-types",
  "ic-config",
@@ -9728,7 +9788,7 @@ version = "0.0.1"
 dependencies = [
  "anyhow",
  "candid",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-nervous-system-clients",
  "ic-nns-common",
@@ -10107,7 +10167,7 @@ name = "ic-networking-subnet-update-workload"
 version = "0.9.0"
 dependencies = [
  "anyhow",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-interfaces-registry",
  "ic-protobuf",
  "ic-registry-canister-api",
@@ -10146,7 +10206,7 @@ version = "0.9.0"
 dependencies = [
  "candid",
  "colored",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-neurons-fund",
  "ic-sns-governance",
  "ic-sns-swap",
@@ -10582,11 +10642,13 @@ dependencies = [
  "ic-xrc-types",
  "icp-ledger",
  "icrc-ledger-types",
+ "itertools 0.12.1",
  "lazy_static",
  "lifeline",
  "maplit",
  "on_wire",
  "phantom_newtype",
+ "pocket-ic",
  "prometheus-parse",
  "prost 0.13.3",
  "rand 0.8.5",
@@ -10907,6 +10969,20 @@ dependencies = [
  "turmoil",
 ]
 
+[[package]]
+name = "ic-read-state-response-parser"
+version = "0.9.0"
+dependencies = [
+ "ic-canonical-state",
+ "ic-certification 0.9.0",
+ "ic-certification-test-utils",
+ "ic-crypto-tree-hash",
+ "ic-types",
+ "serde",
+ "serde_cbor",
+ "tree-deserializer",
+]
+
 [[package]]
 name = "ic-recovery"
 version = "0.1.0"
@@ -11585,9 +11661,8 @@ dependencies = [
  "dfn_protobuf",
  "futures",
  "hex",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
- "ic-canister-client",
  "ic-crypto-ed25519",
  "ic-crypto-sha2",
  "ic-crypto-tree-hash",
@@ -11611,6 +11686,7 @@ dependencies = [
  "ic-nns-governance-init",
  "ic-nns-handler-root",
  "ic-nns-test-utils",
+ "ic-read-state-response-parser",
  "ic-rosetta-test-utils",
  "ic-types",
  "icp-ledger",
@@ -11727,7 +11803,7 @@ dependencies = [
  "candid",
  "colored",
  "csv",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-nervous-system-agent",
  "ic-nervous-system-common-test-keys",
@@ -11755,7 +11831,7 @@ dependencies = [
  "clap 4.5.20",
  "futures",
  "hex",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-crypto-sha2",
  "ic-nervous-system-agent",
@@ -11856,6 +11932,7 @@ dependencies = [
  "strum",
  "strum_macros",
  "tempfile",
+ "time",
  "tokio",
  "tokio-test",
 ]
@@ -12531,7 +12608,7 @@ version = "0.1.0"
 dependencies = [
  "clap 4.5.20",
  "hex",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-crypto-utils-threshold-sig",
  "ic-crypto-utils-threshold-sig-der",
@@ -12626,6 +12703,7 @@ dependencies = [
  "canister-test",
  "chrono",
  "clap 4.5.20",
+ "config_types",
  "crossbeam-channel",
  "cycles-minting-canister",
  "deterministic_ips",
@@ -12638,7 +12716,7 @@ dependencies = [
  "humantime",
  "humantime-serde",
  "hyper 1.5.1",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-artifact-pool",
  "ic-base-types",
  "ic-btc-interface",
@@ -12714,6 +12792,7 @@ dependencies = [
  "lazy_static",
  "leb128",
  "lifeline",
+ "macaddr",
  "maplit",
  "nix 0.24.3",
  "num_cpus",
@@ -13069,7 +13148,7 @@ dependencies = [
  "candid",
  "canister-test",
  "dfn_candid",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-btc-interface",
  "ic-btc-kyt",
@@ -13155,6 +13234,24 @@ dependencies = [
  "thiserror 1.0.68",
 ]
 
+[[package]]
+name = "ic-transport-types"
+version = "0.39.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d8789a5c176bb1b925fa58ca97c651a3995d504e76101e93d2a17f558bdcf66"
+dependencies = [
+ "candid",
+ "hex",
+ "ic-certification 2.6.0",
+ "leb128",
+ "serde",
+ "serde_bytes",
+ "serde_cbor",
+ "serde_repr",
+ "sha2 0.10.8",
+ "thiserror 1.0.68",
+]
+
 [[package]]
 name = "ic-tvl-canister"
 version = "0.9.0"
@@ -13270,7 +13367,7 @@ dependencies = [
  "async-trait",
  "candid",
  "futures-util",
- "ic-agent",
+ "ic-agent 0.37.1",
  "once_cell",
  "semver",
  "serde",
@@ -13668,7 +13765,7 @@ dependencies = [
  "anyhow",
  "candid",
  "certificate_orchestrator_interface",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-boundary-nodes-integration-test-common",
  "ic-boundary-nodes-performance-test-common",
@@ -13712,7 +13809,7 @@ version = "0.9.0"
 dependencies = [
  "anyhow",
  "futures",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-system-test-driver",
  "ic-types",
@@ -13731,7 +13828,7 @@ dependencies = [
  "canister-test",
  "chrono",
  "futures",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-canister-client",
  "ic-config",
@@ -13771,7 +13868,7 @@ dependencies = [
  "candid",
  "canister-test",
  "futures",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-crypto-test-utils-reproducible-rng",
  "ic-management-canister-types",
@@ -13809,7 +13906,7 @@ dependencies = [
  "candid",
  "canister-test",
  "ed25519-dalek",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-canister-client",
  "ic-config",
@@ -13840,7 +13937,7 @@ version = "0.9.0"
 dependencies = [
  "anyhow",
  "candid",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-crypto-test-utils-reproducible-rng",
  "ic-fstrim-tool",
  "ic-registry-subnet-type",
@@ -13937,7 +14034,7 @@ version = "0.9.0"
 dependencies = [
  "anyhow",
  "candid",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-icrc-rosetta",
  "ic-icrc-rosetta-client",
  "ic-ledger-test-utils",
@@ -13975,7 +14072,7 @@ dependencies = [
  "candid",
  "ciborium",
  "hex",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-cbor",
  "ic-certification 2.6.0",
  "icrc-ledger-types",
@@ -14891,7 +14988,7 @@ dependencies = [
  "dfn_http_metrics",
  "dfn_protobuf",
  "hex",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-canister-log 0.2.0",
  "ic-cdk 0.16.0",
@@ -15330,6 +15427,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
 
+[[package]]
+name = "macaddr"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baee0bbc17ce759db233beb01648088061bf678383130602a298e6998eedb2d8"
+
 [[package]]
 name = "mach2"
 version = "0.4.2"
@@ -15510,8 +15613,9 @@ dependencies = [
  "candid",
  "canister-test",
  "dfn_candid",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
+ "ic-cdk 0.16.0",
  "ic-registry-subnet-type",
  "ic-system-test-driver",
  "ic-types",
@@ -15777,6 +15881,7 @@ dependencies = [
  "anyhow",
  "config_types",
  "deterministic_ips",
+ "macaddr",
  "ping",
  "rayon",
  "regex",
@@ -15797,7 +15902,7 @@ dependencies = [
  "canister_http",
  "cloner-canister-types",
  "dfn_candid",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-cdk 0.16.0",
  "ic-limits",
@@ -15913,7 +16018,7 @@ dependencies = [
  "cycles_minting",
  "dfn_candid",
  "futures",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-btc-interface",
  "ic-canister-client",
@@ -15986,7 +16091,7 @@ version = "0.9.0"
 dependencies = [
  "anyhow",
  "candid",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-nns-constants",
  "ic-registry-canister-api",
@@ -16525,6 +16630,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_cbor",
+ "serde_json",
  "slog",
  "slog-async",
  "strum",
@@ -17091,7 +17197,7 @@ dependencies = [
  "ic-cdk 0.16.0",
  "ic-certification 2.6.0",
  "ic-error-types",
- "ic-transport-types",
+ "ic-transport-types 0.37.1",
  "k256",
  "lazy_static",
  "reqwest 0.12.9",
@@ -17140,7 +17246,7 @@ dependencies = [
  "http-body-util",
  "hyper 1.5.1",
  "hyper-util",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-boundary",
  "ic-btc-adapter",
  "ic-btc-interface",
@@ -18637,7 +18743,7 @@ dependencies = [
  "anyhow",
  "candid",
  "hex",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-crypto-ed25519",
  "ic-crypto-secp256k1",
  "ic-types",
@@ -19574,6 +19680,7 @@ dependencies = [
  "anyhow",
  "clap 4.5.20",
  "config",
+ "config_types",
  "deterministic_ips",
  "network",
  "utils",
@@ -19873,7 +19980,7 @@ version = "0.9.0"
 dependencies = [
  "anyhow",
  "candid",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-canister-client",
  "ic-canister-client-sender",
@@ -20263,7 +20370,7 @@ dependencies = [
  "candid",
  "colored",
  "futures",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-base-types",
  "ic-nervous-system-agent",
  "ic-nervous-system-clients",
@@ -20358,9 +20465,11 @@ dependencies = [
 name = "systest-message-routing-common"
 version = "0.9.0"
 dependencies = [
+ "candid",
  "canister-test",
  "dfn_candid",
  "futures",
+ "ic-cdk 0.16.0",
  "ic-system-test-driver",
  "slog",
  "xnet-test",
@@ -20590,7 +20699,7 @@ dependencies = [
  "futures",
  "hex",
  "humantime",
- "ic-agent",
+ "ic-agent 0.37.1",
  "ic-async-utils",
  "ic-base-types",
  "ic-btc-interface",
@@ -22807,7 +22916,9 @@ name = "xnet-test"
 version = "0.9.0"
 dependencies = [
  "candid",
- "dfn_core",
+ "futures",
+ "ic-cdk 0.16.0",
+ "ic-cdk-macros 0.9.0",
  "rand 0.8.5",
  "rand_pcg 0.3.1",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 9bd04ae4d02..5f9fe61f536 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,6 +38,7 @@ members = [
     "rs/boundary_node/rate_limits/canister_client",
     "rs/boundary_node/systemd_journal_gatewayd_shim",
     "rs/canister_client",
+    "rs/canister_client/read_state_response_parser",
     "rs/canister_client/sender",
     "rs/cross-chain/proposal-cli",
     "rs/cycles_account_manager",
@@ -606,6 +607,7 @@ libc = "0.2.158"
 libflate = "2.1.0"
 libnss = "0.5.0"
 local-ip-address = "0.5.6"
+macaddr = "1.0"
 minicbor = { version = "0.19.1", features = ["alloc", "derive"] }
 minicbor-derive = "0.13.0"
 mockall = "0.13.0"
diff --git a/MODULE.bazel b/MODULE.bazel
index dc0907146ef..1aee2d6536a 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -37,6 +37,10 @@ archive_override(
     urls = ["https://github.com/bazelbuild/rules_foreign_cc/archive/77d4483fadbb1b7bcace18ed8e8e87e8791050f6.tar.gz"],
 )
 
+# Misc tools
+
+bazel_dep(name = "pigz", version = "2.8")  # (parallel) gzip
+
 # Python dependencies
 
 bazel_dep(name = "rules_python", version = "0.35.0")
@@ -429,38 +433,6 @@ http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_
 
 http_jar = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_jar")
 
-# Gzip tool
-http_archive(
-    name = "pigz",
-    build_file_content = """
-cc_library(
-    name = "zopfli",
-    hdrs = glob(["zopfli/src/zopfli/*.h"]),
-    srcs = glob(["zopfli/src/zopfli/*.c"]),
-)
-
-cc_binary(
-    name = "pigz",
-    srcs = [
-        "pigz.c",
-        "try.c",
-        "try.h",
-        "yarn.c",
-        "yarn.h",
-    ],
-    linkopts = [
-        "-lm",
-        "-lpthread",
-        "-lz",
-    ],
-    deps = [":zopfli"],
-    visibility = ["//visibility:public"],
-)""",
-    sha256 = "688fe1d805b33a4ae8cbf86ba56aa1a5d647e959219c7d3aeb7d041c228af1ef",
-    strip_prefix = "pigz-2.8",
-    url = "https://github.com/madler/pigz/archive/refs/tags/v2.8.zip",
-)
-
 # TLA+ tools
 http_jar(
     name = "tlaplus_community_modules",
diff --git a/bazel/external_crates.bzl b/bazel/external_crates.bzl
index a754f976caf..bb628cdcc0b 100644
--- a/bazel/external_crates.bzl
+++ b/bazel/external_crates.bzl
@@ -52,15 +52,18 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable
             ],
         )],
         "lmdb-rkv-sys": [crate.annotation(
+            # patch our fork of the lmdb-rkv-sys to allow specifying the path
+            # to the built static archive
+            patch_args = ["-p1"],
+            patches = ["@@//bazel:lmdb_rkv_sys.patch"],
             build_script_data = [
+                "@lmdb//:liblmdb",
                 "@lmdb//:lmdb.h",
             ],
             build_script_env = {
-                "LMDB_NO_BUILD": "1",
+                "LMDB_OVERRIDE": "$(location @lmdb//:liblmdb)",
                 "LMDB_H_PATH": "$(location @lmdb//:lmdb.h)",
             },
-            # ensure LMDB lib is available at runtime
-            deps = ["@lmdb"],
         )],
         "p256": [crate.annotation(
             rustc_flags = [
@@ -764,6 +767,9 @@ def external_crates_repository(name, cargo_lockfile, lockfile, sanitizers_enable
                 version = "^0.7.8",
                 default_features = False,
             ),
+            "macaddr": crate.spec(
+                version = "^1.0",
+            ),
             "mach2": crate.spec(
                 # Wasmtime depends on 0.4.2 but specifies 0.4.1.
                 # Enforce 0.4.2 using a dummy dependency until
diff --git a/bazel/lmdb_rkv_sys.patch b/bazel/lmdb_rkv_sys.patch
new file mode 100644
index 00000000000..c55f134c782
--- /dev/null
+++ b/bazel/lmdb_rkv_sys.patch
@@ -0,0 +1,29 @@
+# patch our fork of the lmdb-rkv-sys to allow specifying the path
+# to the built static archive
+diff --git a/build.rs b/build.rs
+index c422d52..b779ee0 100644
+--- a/build.rs
++++ b/build.rs
+@@ -57,7 +57,21 @@ fn main() {
+         warn!("Building with `-fsanitize=fuzzer`.");
+     }
+
+-    if let Err(_) = std::env::var("LMDB_NO_BUILD") {
++    if let Ok(lmdb) = std::env::var("LMDB_OVERRIDE") {
++        let lmdb = PathBuf::from(lmdb);
++        assert!(
++            lmdb.exists(),
++            "Path to `lmdb` '{}' does not exist",
++            lmdb.display()
++        );
++        println!(
++            "cargo:rustc-link-search=native={}",
++            lmdb.parent().unwrap().display()
++        );
++        let stem = lmdb.file_stem().unwrap().to_str().unwrap();
++        println!("cargo:rustc-link-lib=static={}", &stem[3..]);
++        return;
++    } else {
+         if pkg_config::probe_library("lmdb").is_err() {
+             let mut lmdb = PathBuf::from(&env::var("CARGO_MANIFEST_DIR").unwrap());
+             lmdb.push("lmdb");
diff --git a/bazel/upload_systest_dep.sh b/bazel/upload_systest_dep.sh
index 68f092947f3..a1d9b6788b4 100755
--- a/bazel/upload_systest_dep.sh
+++ b/bazel/upload_systest_dep.sh
@@ -64,7 +64,7 @@ else
     dep_upload_url="$UPLOAD_URL/$dep_sha256"
     echo "Using upload URL: '$dep_upload_url'" >&2
     curl_out=$(mktemp)
-    curl --silent --fail "$dep_upload_url" --upload-file "$dep_filename" -w '%{size_upload} %{time_total} %{speed_upload}\n' | tee "$curl_out" >&2
+    curl --silent --show-error --fail --retry 3 "$dep_upload_url" --upload-file "$dep_filename" -w '%{size_upload} %{time_total} %{speed_upload}\n' | tee "$curl_out" >&2
     # read & pretty print 3 metrics: upload size, upload time & upload speed
     if read -ra metrics <"$curl_out"; then
         echo "Uploaded $(numfmt --to=iec-i --suffix=B "${metrics[0]}") in ${metrics[1]}s ($(numfmt --to=iec-i --suffix=B "${metrics[2]}")/s)" >&2
diff --git a/ci/bazel-scripts/main.sh b/ci/bazel-scripts/main.sh
index 74fc662cd68..4da4bafd554 100755
--- a/ci/bazel-scripts/main.sh
+++ b/ci/bazel-scripts/main.sh
@@ -30,7 +30,7 @@ if [[ "${IS_PROTECTED_BRANCH:-}" == "true" ]] || [[ "${CI_PULL_REQUEST_TARGET_BR
     RUN_ON_DIFF_ONLY="false"
 fi
 
-if [[ "${CI_PIPELINE_SOURCE:-}" == "merge_group" ]]; then
+if [[ "${CI_EVENT_NAME:-}" == "merge_group" ]]; then
     s3_upload="False"
     RUN_ON_DIFF_ONLY="false"
 fi
diff --git a/ci/container/Dockerfile b/ci/container/Dockerfile
index 8e9293254b3..d555d8f6694 100644
--- a/ci/container/Dockerfile
+++ b/ci/container/Dockerfile
@@ -185,7 +185,7 @@ RUN curl --fail https://sh.rustup.rs -sSf \
 RUN rm -rf /tmp/rust-version
 
 # Add cargo-audit
-ARG CARGO_AUDIT_VERSION=0.20.0
+ARG CARGO_AUDIT_VERSION=0.21.0
 RUN cargo install cargo-audit --version ${CARGO_AUDIT_VERSION}
 # Add zshrc generated from zsh-newuser-install (option 2)
 COPY --chown=ubuntu:ubuntu ./ci/container/files/zshrc /home/ubuntu/.zshrc
diff --git a/ci/container/TAG b/ci/container/TAG
index 68b377acf0e..6e197c4645e 100644
--- a/ci/container/TAG
+++ b/ci/container/TAG
@@ -1 +1 @@
-f6b02fd6aa4c143cc46fe7d66403d704903a18f5f05cf987d9f33c04cbc732c7
+234270bdfedab79b1aa7a761cad77195e52c801b287b6c3cdf2beb3239e8cc14
diff --git a/ci/scripts/lock-generate.sh b/ci/scripts/lock-generate.sh
index 7cd36e2ee81..915a002e37b 100755
--- a/ci/scripts/lock-generate.sh
+++ b/ci/scripts/lock-generate.sh
@@ -16,7 +16,7 @@ git status
 if ! git diff --cached --quiet; then
     # If this is running from a pull request then update the Cargo.lock file in the PR
     # automatically.
-    if [ "$CI_PIPELINE_SOURCE" = "pull_request" ]; then
+    if [ "$CI_EVENT_NAME" = "pull_request" ]; then
         # There are some changes staged
         git config --global user.email "infra+github-automation@dfinity.org"
         git config --global user.name "IDX GitHub Automation"
diff --git a/ci/scripts/rust-lint.sh b/ci/scripts/rust-lint.sh
index 8eb35349496..362c93ad041 100755
--- a/ci/scripts/rust-lint.sh
+++ b/ci/scripts/rust-lint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -xeuo pipefail
 
-cd "$CI_PROJECT_DIR"
+cd "${CI_PROJECT_DIR:-$(git rev-parse --show-toplevel)}"
 cargo fmt -- --check
 cargo clippy --locked --all-features --workspace --all-targets -- \
     -D warnings \
diff --git a/ic-os/boundary-guestos/context/docker-base.prod b/ic-os/boundary-guestos/context/docker-base.prod
index a7ab66574b3..b9518202a1c 100644
--- a/ic-os/boundary-guestos/context/docker-base.prod
+++ b/ic-os/boundary-guestos/context/docker-base.prod
@@ -1 +1 @@
-ghcr.io/dfinity/boundaryos-base@sha256:d2034fde545b18002e08ed7f80af8beec12ca682f76f5a2fe1c3d41c6a32cbf4
+ghcr.io/dfinity/boundaryos-base@sha256:d97d5a2e72fb0c80643a707708299ae392f54ef5b41e9d0292129d9e47d52a93
diff --git a/ic-os/components/hostos-scripts/generate-guestos-config/dev-generate-guestos-config.sh b/ic-os/components/hostos-scripts/generate-guestos-config/dev-generate-guestos-config.sh
index 5dd87e9a334..024fc730284 100755
--- a/ic-os/components/hostos-scripts/generate-guestos-config/dev-generate-guestos-config.sh
+++ b/ic-os/components/hostos-scripts/generate-guestos-config/dev-generate-guestos-config.sh
@@ -84,8 +84,7 @@ function assemble_config_media() {
     cmd=(/opt/ic/bin/build-bootstrap-config-image.sh ${MEDIA})
     cmd+=(--nns_public_key "/boot/config/nns_public_key.pem")
     cmd+=(--elasticsearch_hosts "$(/opt/ic/bin/fetch-property.sh --key=.logging.hosts --metric=hostos_logging_hosts --config=${DEPLOYMENT})")
-    # 1 corresponds to GuestOS
-    cmd+=(--ipv6_address "$(/opt/ic/bin/hostos_tool generate-ipv6-address --node-type 1)")
+    cmd+=(--ipv6_address "$(/opt/ic/bin/hostos_tool generate-ipv6-address --node-type GuestOS)")
     cmd+=(--ipv6_gateway "${ipv6_gateway}")
     if [[ -n "$ipv4_address" && -n "$ipv4_prefix_length" && -n "$ipv4_gateway" && -n "$domain" ]]; then
         cmd+=(--ipv4_address "${ipv4_address}/${ipv4_prefix_length}")
@@ -110,8 +109,7 @@ function assemble_config_media() {
 
 function generate_guestos_config() {
     RESOURCES_MEMORY=$(/opt/ic/bin/fetch-property.sh --key=.resources.memory --metric=hostos_resources_memory --config=${DEPLOYMENT})
-    # 1 corresponds to GuestOS
-    MAC_ADDRESS=$(/opt/ic/bin/hostos_tool generate-mac-address --node-type 1)
+    MAC_ADDRESS=$(/opt/ic/bin/hostos_tool generate-mac-address --node-type GuestOS)
     # NOTE: `fetch-property` will error if the target is not found. Here we
     # only want to act when the field is set.
     CPU_MODE=$(jq -r ".resources.cpu" ${DEPLOYMENT})
diff --git a/ic-os/components/hostos-scripts/generate-guestos-config/generate-guestos-config.sh b/ic-os/components/hostos-scripts/generate-guestos-config/generate-guestos-config.sh
index 883beb5116e..3d125938234 100755
--- a/ic-os/components/hostos-scripts/generate-guestos-config/generate-guestos-config.sh
+++ b/ic-os/components/hostos-scripts/generate-guestos-config/generate-guestos-config.sh
@@ -84,8 +84,7 @@ function assemble_config_media() {
     cmd=(/opt/ic/bin/build-bootstrap-config-image.sh ${MEDIA})
     cmd+=(--nns_public_key "/boot/config/nns_public_key.pem")
     cmd+=(--elasticsearch_hosts "$(/opt/ic/bin/fetch-property.sh --key=.logging.hosts --metric=hostos_logging_hosts --config=${DEPLOYMENT})")
-    # 1 corresponds to GuestOS
-    cmd+=(--ipv6_address "$(/opt/ic/bin/hostos_tool generate-ipv6-address --node-type 1)")
+    cmd+=(--ipv6_address "$(/opt/ic/bin/hostos_tool generate-ipv6-address --node-type GuestOS)")
     cmd+=(--ipv6_gateway "${ipv6_gateway}")
     if [[ -n "$ipv4_address" && -n "$ipv4_prefix_length" && -n "$ipv4_gateway" && -n "$domain" ]]; then
         cmd+=(--ipv4_address "${ipv4_address}/${ipv4_prefix_length}")
@@ -108,8 +107,7 @@ function assemble_config_media() {
 
 function generate_guestos_config() {
     RESOURCES_MEMORY=$(/opt/ic/bin/fetch-property.sh --key=.resources.memory --metric=hostos_resources_memory --config=${DEPLOYMENT})
-    # 1 corresponds to GuestOS
-    MAC_ADDRESS=$(/opt/ic/bin/hostos_tool generate-mac-address --node-type 1)
+    MAC_ADDRESS=$(/opt/ic/bin/hostos_tool generate-mac-address --node-type GuestOS)
     # NOTE: `fetch-property` will error if the target is not found. Here we
     # only want to act when the field is set.
     CPU_MODE=$(jq -r ".resources.cpu" ${DEPLOYMENT})
diff --git a/ic-os/components/ic/share/ic-boundary.env b/ic-os/components/ic/share/ic-boundary.env
index d82b644f66e..570be9bb8ae 100644
--- a/ic-os/components/ic/share/ic-boundary.env
+++ b/ic-os/components/ic/share/ic-boundary.env
@@ -1,10 +1,11 @@
-LISTEN_HTTP_PORT="443"
+LISTEN_HTTPS_PORT="443"
 TLS_CERT_PATH="/var/lib/ic/data/ic-boundary-tls.crt"
 TLS_PKEY_PATH="/var/lib/ic/data/ic-boundary-tls.key"
 TLS_ACME_CREDENTIALS_PATH="/var/lib/ic/data"
 HTTP_CLIENT_TIMEOUT_CONNECT="3s"
 REGISTRY_DISABLE_REPLICATOR="true"
 REGISTRY_LOCAL_STORE_PATH="/var/lib/ic/data/ic_registry_local_store"
+OBS_LOG_ANONYMIZATION_CANISTER_ID="uz2z3-qyaaa-aaaaq-qaacq-cai"
 OBS_LOG_JOURNALD="true"
 OBS_METRICS_ADDR="[::]:9324"
 RATE_LIMIT_PER_SECOND_PER_SUBNET="1000"
diff --git a/ic-os/components/setupos-scripts/check-network.sh b/ic-os/components/setupos-scripts/check-network.sh
index aeb8c80fc6f..094cb5e6db4 100755
--- a/ic-os/components/setupos-scripts/check-network.sh
+++ b/ic-os/components/setupos-scripts/check-network.sh
@@ -101,9 +101,8 @@ function get_network_settings() {
         "echo ${ipv6_address_system_full} | awk -F '/' '{ print \$1 }'" \
         "Failed to get system's IPv6 address.")
 
-    # 0 corresponds to HostOS, 1 to GuestOS
-    HOSTOS_IPV6_ADDRESS=$(/opt/ic/bin/setupos_tool generate-ipv6-address --node-type 0)
-    GUESTOS_IPV6_ADDRESS=$(/opt/ic/bin/setupos_tool generate-ipv6-address --node-type 1)
+    HOSTOS_IPV6_ADDRESS=$(/opt/ic/bin/setupos_tool generate-ipv6-address --node-type HostOS)
+    GUESTOS_IPV6_ADDRESS=$(/opt/ic/bin/setupos_tool generate-ipv6-address --node-type GuestOS)
 }
 
 function print_network_settings() {
diff --git a/ic-os/components/upgrade/shared-resources/upgrade-shared-data-store/upgrade-shared-data-store.service b/ic-os/components/upgrade/shared-resources/upgrade-shared-data-store/upgrade-shared-data-store.service
index 99c243c2601..f516ebe3217 100644
--- a/ic-os/components/upgrade/shared-resources/upgrade-shared-data-store/upgrade-shared-data-store.service
+++ b/ic-os/components/upgrade/shared-resources/upgrade-shared-data-store/upgrade-shared-data-store.service
@@ -3,6 +3,7 @@ Description=Initialize node data storage
 DefaultDependencies=no
 Requires=var-lib-ic-data.mount
 After=var-lib-ic-data.mount
+Before=setup-permissions.service
 
 [Install]
 WantedBy=local-fs.target
diff --git a/ic-os/components/upgrade/shared-resources/upgrade-shared-data-store/upgrade-shared-data-store.sh b/ic-os/components/upgrade/shared-resources/upgrade-shared-data-store/upgrade-shared-data-store.sh
index 45465d845b7..80f25ae5ed9 100755
--- a/ic-os/components/upgrade/shared-resources/upgrade-shared-data-store/upgrade-shared-data-store.sh
+++ b/ic-os/components/upgrade/shared-resources/upgrade-shared-data-store/upgrade-shared-data-store.sh
@@ -8,6 +8,6 @@ set -e
 
 # Fix up ownership -- should be owned by the ic replica service user.
 USER=$(stat -c %U /var/lib/ic/data)
-if [ "${USER}" != replica ]; then
+if [ "${USER}" != ic-replica ]; then
     chown -R ic-replica /var/lib/ic/data
 fi
diff --git a/ic-os/guestos/context/docker-base.dev b/ic-os/guestos/context/docker-base.dev
index 55a9f389b70..d656fa23660 100644
--- a/ic-os/guestos/context/docker-base.dev
+++ b/ic-os/guestos/context/docker-base.dev
@@ -1 +1 @@
-ghcr.io/dfinity/guestos-base-dev@sha256:414eb3ecbe890440815901f36fd3bc371e44551d6a373b4d0b66e6fc22dd056d
+ghcr.io/dfinity/guestos-base-dev@sha256:981c653650c242f5490fd6c9ea46525438e472dc44c750963eac02fca321c19e
diff --git a/ic-os/guestos/context/docker-base.prod b/ic-os/guestos/context/docker-base.prod
index c7a2cde9caf..4dac2a92683 100644
--- a/ic-os/guestos/context/docker-base.prod
+++ b/ic-os/guestos/context/docker-base.prod
@@ -1 +1 @@
-ghcr.io/dfinity/guestos-base@sha256:f005a27883afc2c265d69b4312702a95d719a0d6bbcbd52840b547e6fba7bd1f
+ghcr.io/dfinity/guestos-base@sha256:f932d313bb455a59b79f78b56bbb96cd97a12e3903dd96ee8a05b377633680c7
diff --git a/ic-os/hostos/context/docker-base.dev b/ic-os/hostos/context/docker-base.dev
index c12827229c1..3e47b0c8f9d 100644
--- a/ic-os/hostos/context/docker-base.dev
+++ b/ic-os/hostos/context/docker-base.dev
@@ -1 +1 @@
-ghcr.io/dfinity/hostos-base-dev@sha256:d7308919c23c5936fb6570db23658055cc02e0620d30c1b695984062ef9fe09e
+ghcr.io/dfinity/hostos-base-dev@sha256:5cf9998a41ca100fe8b5c5e0678aa1230e1b8cb8e316097c8f1ecad1ceafe665
diff --git a/ic-os/hostos/context/docker-base.prod b/ic-os/hostos/context/docker-base.prod
index b5babe65219..b4ca677d97f 100644
--- a/ic-os/hostos/context/docker-base.prod
+++ b/ic-os/hostos/context/docker-base.prod
@@ -1 +1 @@
-ghcr.io/dfinity/hostos-base@sha256:e8eff4fc294495c75cf42053579f6c3e78ca8c682f889ffbdbc1cd917384efff
+ghcr.io/dfinity/hostos-base@sha256:5e8b448ab1c2e691e3d9c9bb30ebbaf7e94c095ec9932e0bcacddbaccfd4fe35
diff --git a/ic-os/setupos/context/docker-base.dev b/ic-os/setupos/context/docker-base.dev
index f21fab8cefc..18c05f5be1a 100644
--- a/ic-os/setupos/context/docker-base.dev
+++ b/ic-os/setupos/context/docker-base.dev
@@ -1 +1 @@
-ghcr.io/dfinity/setupos-base-dev@sha256:d5e49439fecbdf0b34ce683de2b7a891a418d629f05fe7a9369c7e485a5e3503
+ghcr.io/dfinity/setupos-base-dev@sha256:fa624ad95f31d22a3e81f66d01eeb47ec43d5583a813103b6cc0d00e2d4838f8
diff --git a/ic-os/setupos/context/docker-base.prod b/ic-os/setupos/context/docker-base.prod
index 1fcc65b5129..45bea5e2cea 100644
--- a/ic-os/setupos/context/docker-base.prod
+++ b/ic-os/setupos/context/docker-base.prod
@@ -1 +1 @@
-ghcr.io/dfinity/setupos-base@sha256:2f507b6331804e00a4fcbaee56c3450a6e62c5f4f6fa5a62a2d7d02c2fd9527c
+ghcr.io/dfinity/setupos-base@sha256:191b77c1f3cd293eb0eb255382866e15c1ef7f19419e884166b7e55a2bb50a2d
diff --git a/packages/pocket-ic/src/lib.rs b/packages/pocket-ic/src/lib.rs
index a2144c0b838..e647de89523 100644
--- a/packages/pocket-ic/src/lib.rs
+++ b/packages/pocket-ic/src/lib.rs
@@ -140,6 +140,7 @@ impl PocketIcBuilder {
         .await
     }
 
+    /// Use an already running PocketIC server.
     pub fn with_server_url(mut self, server_url: Url) -> Self {
         self.server_url = Some(server_url);
         self
diff --git a/rs/bitcoin/ckbtc/minter/src/lib.rs b/rs/bitcoin/ckbtc/minter/src/lib.rs
index 21c55c36232..cd48a462d6f 100644
--- a/rs/bitcoin/ckbtc/minter/src/lib.rs
+++ b/rs/bitcoin/ckbtc/minter/src/lib.rs
@@ -19,6 +19,7 @@ use num_traits::ToPrimitive;
 use scopeguard::{guard, ScopeGuard};
 use serde::Serialize;
 use serde_bytes::ByteBuf;
+use std::cmp::max;
 use std::collections::{BTreeMap, BTreeSet};
 use std::time::Duration;
 
@@ -52,10 +53,13 @@ pub const MIN_PENDING_REQUESTS: usize = 20;
 pub const MAX_REQUESTS_PER_BATCH: usize = 100;
 
 /// The constants used to compute the minter's fee to cover its own cycle consumption.
-/// The values are set to cover the cycle cost on a 28-node subnet.
-pub const MINTER_FEE_PER_INPUT: u64 = 246;
-pub const MINTER_FEE_PER_OUTPUT: u64 = 7;
-pub const MINTER_FEE_CONSTANT: u64 = 52;
+pub const MINTER_FEE_PER_INPUT: u64 = 146;
+pub const MINTER_FEE_PER_OUTPUT: u64 = 4;
+pub const MINTER_FEE_CONSTANT: u64 = 26;
+/// Dust limit for the minter's address.
+/// The minter's address is of type P2WPKH which means it has a dust limit of 294 sats.
+/// For additional safety, we round that value up.
+pub const MINTER_ADDRESS_DUST_LIMIT: Satoshi = 300;
 
 /// The minimum fee increment for transaction resubmission.
 /// See https://en.bitcoin.it/wiki/Miner_fees#Relaying for more detail.
@@ -998,9 +1002,7 @@ pub fn build_unsigned_transaction(
 
     debug_assert!(inputs_value >= amount);
 
-    let minter_fee = MINTER_FEE_PER_INPUT * utxos_guard.len() as u64
-        + MINTER_FEE_PER_OUTPUT * (outputs.len() + 1) as u64
-        + MINTER_FEE_CONSTANT;
+    let minter_fee = evaluate_minter_fee(utxos_guard.len() as u64, (outputs.len() + 1) as u64);
 
     let change = inputs_value - amount;
     let change_output = state::ChangeOutput {
@@ -1076,6 +1078,15 @@ pub fn build_unsigned_transaction(
     ))
 }
 
+pub fn evaluate_minter_fee(num_inputs: u64, num_outputs: u64) -> Satoshi {
+    max(
+        MINTER_FEE_PER_INPUT * num_inputs
+            + MINTER_FEE_PER_OUTPUT * num_outputs
+            + MINTER_FEE_CONSTANT,
+        MINTER_ADDRESS_DUST_LIMIT,
+    )
+}
+
 /// Distributes an amount across the specified number of shares as fairly as
 /// possible.
 ///
@@ -1239,9 +1250,7 @@ pub fn estimate_retrieve_btc_fee(
     };
 
     let vsize = tx_vsize_estimate(input_count, DEFAULT_OUTPUT_COUNT);
-    let minter_fee = MINTER_FEE_PER_INPUT * input_count
-        + MINTER_FEE_PER_OUTPUT * DEFAULT_OUTPUT_COUNT
-        + MINTER_FEE_CONSTANT;
+    let minter_fee = evaluate_minter_fee(input_count, DEFAULT_OUTPUT_COUNT);
     // We subtract one from the outputs because the minter's output
     // does not participate in fees distribution.
     let bitcoin_fee =
diff --git a/rs/bitcoin/ckbtc/minter/src/tests.rs b/rs/bitcoin/ckbtc/minter/src/tests.rs
index 1f306325364..3090e1a1ec3 100644
--- a/rs/bitcoin/ckbtc/minter/src/tests.rs
+++ b/rs/bitcoin/ckbtc/minter/src/tests.rs
@@ -1,9 +1,9 @@
 use crate::state::invariants::CheckInvariantsImpl;
-use crate::MINTER_FEE_CONSTANT;
 use crate::{
     address::BitcoinAddress, build_unsigned_transaction, estimate_retrieve_btc_fee, fake_sign,
     greedy, signature::EncodedSignature, tx, BuildTxError,
 };
+use crate::{evaluate_minter_fee, MINTER_ADDRESS_DUST_LIMIT};
 use crate::{
     lifecycle::init::InitArgs,
     state::{
@@ -17,6 +17,7 @@ use candid::Principal;
 use ic_base_types::{CanisterId, PrincipalId};
 use ic_btc_interface::{Network, OutPoint, Satoshi, Txid, Utxo};
 use icrc_ledger_types::icrc1::account::Account;
+use maplit::btreeset;
 use proptest::proptest;
 use proptest::{
     array::uniform20,
@@ -258,9 +259,7 @@ fn should_have_same_input_and_output_count() {
     )
     .expect("failed to build a transaction");
 
-    let minter_fee = crate::MINTER_FEE_PER_INPUT * tx.inputs.len() as u64
-        + crate::MINTER_FEE_PER_OUTPUT * tx.outputs.len() as u64
-        + crate::MINTER_FEE_CONSTANT;
+    let minter_fee = evaluate_minter_fee(tx.inputs.len() as u64, tx.outputs.len() as u64);
 
     assert_eq!(tx.outputs.len(), tx.inputs.len());
     assert_eq!(
@@ -274,24 +273,22 @@ fn should_have_same_input_and_output_count() {
 
 #[test]
 fn test_min_change_amount() {
-    let mut available_utxos = BTreeSet::new();
-    available_utxos.insert(Utxo {
+    let utxo_1 = Utxo {
         outpoint: OutPoint {
             txid: [0; 32].into(),
             vout: 0,
         },
         value: 100_000,
         height: 10,
-    });
-
-    available_utxos.insert(Utxo {
+    };
+    let utxo_2 = Utxo {
         outpoint: OutPoint {
             txid: [1; 32].into(),
             vout: 1,
         },
-        value: 100_000,
-        height: 10,
-    });
+        ..utxo_1.clone()
+    };
+    let mut available_utxos = btreeset! {utxo_1.clone(), utxo_2.clone()};
 
     let minter_addr = BitcoinAddress::P2wpkhV0([0; 20]);
     let out1_addr = BitcoinAddress::P2wpkhV0([1; 20]);
@@ -300,34 +297,43 @@ fn test_min_change_amount() {
 
     let (tx, change_output, _) = build_unsigned_transaction(
         &mut available_utxos,
-        vec![(out1_addr.clone(), 100_000), (out2_addr.clone(), 99_999)],
+        vec![
+            (out1_addr.clone(), utxo_1.value),
+            (out2_addr.clone(), utxo_2.value - 1),
+        ],
         minter_addr.clone(),
         fee_per_vbyte,
     )
     .expect("failed to build a transaction");
+    let change_value = 1;
 
     let fee = fake_sign(&tx).vsize() as u64 * fee_per_vbyte / 1000;
-    let minter_fee = crate::MINTER_FEE_PER_INPUT * tx.inputs.len() as u64
-        + crate::MINTER_FEE_PER_OUTPUT * tx.outputs.len() as u64
-        + crate::MINTER_FEE_CONSTANT;
+    let minter_fee = evaluate_minter_fee(tx.inputs.len() as u64, tx.outputs.len() as u64);
 
     assert_eq!(tx.outputs.len(), 3);
-    let fee_share = (fee + minter_fee - 1) / 2;
+    let fee_shares = {
+        let total_fee = fee + minter_fee;
+        let avg_fee_per_share = total_fee / 2;
+        let share_1 = avg_fee_per_share + (total_fee % 2);
+        let share_2 = avg_fee_per_share;
+        assert_eq!(share_1 + share_2, total_fee);
+        [share_1, share_2]
+    };
 
     assert_eq!(
         &tx.outputs,
         &[
             tx::TxOut {
                 address: out1_addr,
-                value: 100_000 - fee_share - 1, // Subtract the remainder
+                value: 100_000 - fee_shares[0],
             },
             tx::TxOut {
                 address: out2_addr,
-                value: 99_999 - fee_share,
+                value: 99_999 - fee_shares[1],
             },
             tx::TxOut {
                 address: minter_addr,
-                value: minter_fee + 1, // Add the remainder
+                value: minter_fee + change_value,
             }
         ]
     );
@@ -335,57 +341,104 @@ fn test_min_change_amount() {
         change_output,
         ChangeOutput {
             vout: 2,
-            value: 1 + minter_fee
+            value: change_value + minter_fee
         }
     );
 }
 
 #[test]
 fn test_no_dust_outputs() {
-    let mut available_utxos = BTreeSet::new();
-    available_utxos.insert(Utxo {
+    const P2PKH_DUST_THRESHOLD: u64 = 546;
+
+    let mut available_utxos = btreeset! {Utxo {
         outpoint: OutPoint {
             txid: [0; 32].into(),
             vout: 0,
         },
         value: 100_000,
         height: 10,
-    });
+    }};
+    assert_eq!(available_utxos.len(), 1);
+    let initial_available_utxos = available_utxos.clone();
 
     let minter_addr = BitcoinAddress::P2wpkhV0([0; 20]);
     let out1_addr = BitcoinAddress::P2wpkhV0([1; 20]);
     let out2_addr = BitcoinAddress::P2wpkhV0([2; 20]);
-    let fee_per_vbyte = 10000;
 
-    assert_eq!(
-        build_unsigned_transaction(
-            &mut available_utxos,
-            vec![(out1_addr.clone(), 99_900), (out2_addr.clone(), 100)],
-            minter_addr.clone(),
-            fee_per_vbyte,
-        ),
-        Err(BuildTxError::DustOutput {
-            address: out2_addr.clone(),
-            amount: 100
-        })
-    );
+    for dust in 0..=P2PKH_DUST_THRESHOLD {
+        let fee_per_vbyte = 10000;
+        assert_eq!(
+            build_unsigned_transaction(
+                &mut available_utxos,
+                vec![(out1_addr.clone(), 99_000), (out2_addr.clone(), dust)],
+                minter_addr.clone(),
+                fee_per_vbyte,
+            ),
+            Err(BuildTxError::DustOutput {
+                address: out2_addr.clone(),
+                amount: dust
+            })
+        );
+        assert_eq!(available_utxos, initial_available_utxos);
 
-    let fee_per_vbyte = 4000;
+        let fee_per_vbyte = 4000;
+        assert_eq!(
+            build_unsigned_transaction(
+                &mut available_utxos,
+                vec![(out1_addr.clone(), 99_000), (out2_addr.clone(), dust)],
+                minter_addr.clone(),
+                fee_per_vbyte,
+            ),
+            Err(BuildTxError::DustOutput {
+                address: out2_addr.clone(),
+                amount: dust
+            })
+        );
+        assert_eq!(available_utxos, initial_available_utxos);
+    }
+}
 
-    assert_eq!(
-        build_unsigned_transaction(
+#[test]
+fn test_no_dust_in_change_output() {
+    let utxo = Utxo {
+        outpoint: OutPoint {
+            txid: [0; 32].into(),
+            vout: 0,
+        },
+        value: 100_000,
+        height: 10,
+    };
+
+    let minter_addr = BitcoinAddress::P2wpkhV0([0; 20]);
+    let out1_addr = BitcoinAddress::P2wpkhV0([1; 20]);
+    let fee_per_vbyte = 1;
+
+    for change in 1..=100 {
+        let mut available_utxos = btreeset! {utxo.clone()};
+        let (tx, change_output, _utxos) = build_unsigned_transaction(
             &mut available_utxos,
-            vec![(out1_addr, 99_000), (out2_addr.clone(), 1000)],
-            minter_addr,
+            vec![(out1_addr.clone(), utxo.value - change)],
+            minter_addr.clone(),
             fee_per_vbyte,
-        ),
-        Err(BuildTxError::DustOutput {
-            address: out2_addr,
-            amount: 1000
-        })
-    );
+        )
+        .expect("failed to build a transaction");
+        let fee = evaluate_minter_fee(tx.inputs.len() as u64, tx.outputs.len() as u64);
 
-    assert_eq!(available_utxos.len(), 1);
+        assert_eq!(
+            &tx.outputs,
+            &[
+                tx::TxOut {
+                    value: utxo.value - change - fee,
+                    address: out1_addr.clone()
+                },
+                tx::TxOut {
+                    value: change_output.value,
+                    address: minter_addr.clone(),
+                }
+            ]
+        );
+        assert!(change_output.value >= change + MINTER_ADDRESS_DUST_LIMIT);
+    }
 }
 
 fn arb_amount() -> impl Strategy<Value = Satoshi> {
@@ -663,13 +716,14 @@ proptest! {
 
         let target = total_value / 2;
 
+        let minter_address= BitcoinAddress::P2wpkhV0(main_pkhash);
         let fee_estimate = estimate_retrieve_btc_fee(&utxos, Some(target), fee_per_vbyte);
         let fee_estimate = fee_estimate.minter_fee + fee_estimate.bitcoin_fee;
 
         let (unsigned_tx, _, _) = build_unsigned_transaction(
             &mut utxos,
             vec![(BitcoinAddress::P2wpkhV0(dst_pkhash), target)],
-            BitcoinAddress::P2wpkhV0(main_pkhash),
+            minter_address,
             fee_per_vbyte
         )
         .expect("failed to build transaction");
@@ -731,20 +785,17 @@ proptest! {
             .iter()
             .map(|utxo| (utxo.outpoint.clone(), utxo.value))
             .collect();
-
+        let minter_address = BitcoinAddress::P2wpkhV0(main_pkhash);
         let (unsigned_tx, change_output, _) = build_unsigned_transaction(
             &mut utxos,
             vec![(BitcoinAddress::P2wpkhV0(dst_pkhash), target)],
-            BitcoinAddress::P2wpkhV0(main_pkhash),
+            minter_address.clone(),
             fee_per_vbyte
         )
         .expect("failed to build transaction");
 
         let fee = fake_sign(&unsigned_tx).vsize() as u64 * fee_per_vbyte / 1000;
-        let minter_fee =
-            crate::MINTER_FEE_PER_INPUT * unsigned_tx.inputs.len() as u64 +
-            crate::MINTER_FEE_PER_OUTPUT * unsigned_tx.outputs.len() as u64 +
-            MINTER_FEE_CONSTANT;
+        let minter_fee = evaluate_minter_fee(unsigned_tx.inputs.len() as u64, unsigned_tx.outputs.len() as u64);
 
         let inputs_value = unsigned_tx.inputs
             .iter()
@@ -760,7 +811,7 @@ proptest! {
                 },
                 tx::TxOut {
                     value: inputs_value - target + minter_fee,
-                    address: BitcoinAddress::P2wpkhV0(main_pkhash),
+                    address: minter_address,
                 },
             ]
         );
diff --git a/rs/bitcoin/kyt/BUILD.bazel b/rs/bitcoin/kyt/BUILD.bazel
index 11357e91738..456322064a7 100644
--- a/rs/bitcoin/kyt/BUILD.bazel
+++ b/rs/bitcoin/kyt/BUILD.bazel
@@ -67,8 +67,11 @@ rust_canister(
         "@crate_index//:futures",
         "@crate_index//:hex",
         "@crate_index//:ic-btc-interface",
+        "@crate_index//:ic-canister-log",
         "@crate_index//:ic-cdk",
+        "@crate_index//:ic-metrics-encoder",
         "@crate_index//:ic-stable-structures",
+        "@crate_index//:num-traits",
         "@crate_index//:serde",
         "@crate_index//:serde_json",
         "@crate_index//:time",
@@ -94,6 +97,7 @@ rust_ic_test(
         ":btc_kyt_lib",
         "//:pocket-ic-server",
         "//packages/pocket-ic",
+        "//rs/rust_canisters/http_types",
         "//rs/test_utilities/load_wasm",
         "//rs/types/base_types",
         "//rs/types/types",
diff --git a/rs/bitcoin/kyt/Cargo.toml b/rs/bitcoin/kyt/Cargo.toml
index 81e1aa7a812..ea83efe59d8 100644
--- a/rs/bitcoin/kyt/Cargo.toml
+++ b/rs/bitcoin/kyt/Cargo.toml
@@ -19,9 +19,12 @@ ciborium = { workspace = true }
 futures = { workspace = true }
 hex = { workspace = true }
 ic-btc-interface = { workspace = true }
+ic-canister-log = { path = "../../rust_canisters/canister_log" }
 ic-canisters-http-types = { path = "../../rust_canisters/http_types" }
 ic-cdk = { workspace = true }
+ic-metrics-encoder = "1.1"
 ic-stable-structures = { workspace = true }
+num-traits = { workspace = true }
 serde = { workspace = true }
 serde_json = {workspace = true }
 time = { workspace = true }
diff --git a/rs/bitcoin/kyt/src/blocklist.rs b/rs/bitcoin/kyt/src/blocklist.rs
index 3f27965b5b6..c798d0e0eb7 100644
--- a/rs/bitcoin/kyt/src/blocklist.rs
+++ b/rs/bitcoin/kyt/src/blocklist.rs
@@ -1,33 +1,43 @@
-/// The list of addresses to which we do not allow retrievals.
+/// BTC is not accepted from nor sent to addresses on this list.
 /// NOTE: Keep it sorted!
 pub const BTC_ADDRESS_BLOCKLIST: &[&str] = &[
     "123WBUDmSJv4GctdVEz6Qq6z8nXSKrJ4KX",
+    "125W5ek3DT6Zqy5S2iPt4FHQdNMCbZA3FU",
     "1295rkVyNfFpqZpXvKGhDqwhP1jZcNNDMV",
     "129zKFLoVad9JtxSmDKeJoLCsjhGR7b3vr",
     "12HQDsicffSBaYdJ6BhnE22sfjTESmmzKx",
     "12NpCkhddSNiDkD9rRYUCHsTT9ReMNiJjG",
     "12QtD5BFwRsdNsAZY76UVE1xyCGNTojH9h",
     "12VrYZgS1nmf9KHHped24xBb1aLLRpV2cT",
+    "12YCfVAEzkEZXBYhUTyJJaRkgMXiFxJgcu",
     "12YyR9EpvHxBjjKjTWqfKqeyoWnvcraxpW",
+    "12jVCWW1ZhTLA5yVnroEJswqKwsfiZKsax",
     "12mNKr2YP4M3CEQvCvVqZsvxuCG47LHMu1",
     "12udabs2TkX7NXCSj6KpqXfakjE52ZPLhz",
+    "12w6v1qAaBc4W8h8C2Cu5SKFaKDSv3erUW",
     "134r8iHv69xdT6p5qVKTsHrcUEuBVZAYak",
+    "13JtX4h7G5ZuNK5mFudKGq9DHLvvMFuNuz",
     "13LQJQ1oJ9K7PsqsGfjNhoVv6UeU6hgzQz",
     "13RH4JaFhaCxDGPyYE9emjp2aDxdX18uBA",
     "13ViCDZyJxxv5cZzpDDsE7aDQ3Y552zpAH",
     "13YBQr2Cp1YY3xqq2qngaPb7ca1o4ugeq6",
     "13f59kUM5FU8MfTG7DCEugYarDhSD7XCoC",
+    "13fhnkmpBBWXUQucJd6efWvXdEj78DKavk",
     "13hfsQm6oCaDZehfYBSMFiJVAi1jsL6sQd",
     "13mnk8SvDGqsQTHbiGiHBXqtaQCUKfcsnP",
     "148LKmyZT3FGE4x1GjsFN6RsAwcjzk5iuE",
     "149w62rY42aZBox8fGcmqNsXUzSStKeq8C",
     "14gM1HuLVDELNHaFU22qpabjtiWek4HhV1",
     "14kqryJUxM3a7aEi117KX9hoLUw592WsMR",
+    "14rjAD8ZP5xaL571cMRE98qgxxbg1S8mAN",
     "158treVZBGMBThoaympxccPdZPtqUfYrT9",
     "15PggTG7YhJKiE6B16vkKzA1YDTZipXEX4",
     "15Pt4NwZaUmMUwS2bQbyyncc7mzgWShtv8",
     "15UdZbmGPa2LatD3abtGpphgkHLFWftV4R",
     "15YK647qtoZQDzNrvY6HJL6QwXduLHfT28",
+    "15cRqR3TXS1JehBGWERuxFE8NhWZzfoeeU",
+    "15kZobLkD6HZgEECtz4oS2Vz21XHTnNfSg",
+    "15qyVrZvvVGvB7GWiAZ82TNcZ6QWMKu3kx",
     "15uqdxqNXQwVf5H7yZPz4TmEGeSccCwdor",
     "15yqWQ4sqr7jzCwDtZ3U1KaCa8WMEy7Mm2",
     "16EKTes8ahD8xvwisqjc2xSNLiG3fDHatW",
@@ -36,6 +46,7 @@ pub const BTC_ADDRESS_BLOCKLIST: &[&str] = &[
     "16ZSAEfYpPCj3D94fsNt2okYj9Ue8mxy6T",
     "16p2UWTZwXRyK5bTHNVjdDyy1D3EQGsZf2",
     "16tByCYzxuWiN8kF9FrK9jJy6eQYLVkQ1i",
+    "16ti2EXaae5izfkUZ1Zc59HMcsdnHpP5QJ",
     "175BUqf8JCU1uoG1iTRKTacDa4uvJDUCw2",
     "17UVSMegvrzfobKC82dHXpZLtLcqzW9stF",
     "17V7THwHMiDJmDwZK4unhE5HgKFJKx7VCe",
@@ -45,14 +56,20 @@ pub const BTC_ADDRESS_BLOCKLIST: &[&str] = &[
     "182NGZbPJXwg2WDrhrPpR7tpiGQkNPF844",
     "18Ke1QWE9nQfXuhJijHggZuPJ5ZYxapoBK",
     "18Qj1THHuETfYhuRDZycXJbWwDMGw73Poa",
+    "18aqbRhHupgvC9K8qEqD78phmTQQWs7B5d",
     "18cFGAdYcvNHkuhXLBE7izQKCyUW8TzCJE",
+    "18gaXypKj9M23S2zT9qZfL9iPbLFM372Q5",
     "18uKfaUjgG52rVeXEi3wxnveww7zZuECtE",
+    "18yWCu6agTxYqAerMxiz9sgHrK3ViezzGa",
     "194xmrZA53UBsZau2PnJLdmVVW9m5feeS",
+    "1986rYHckYbJpGQJy6ornuMyD2N5MTqwDt",
+    "19D1iGzDr7FyAdiy3ZZdxMd6ttHj1kj6WW",
     "19D8PHBjZH29uS1uPZ4m3sVyqqfF8UFG9o",
     "19FQzHibWDhSP8pKmJS3uagFYoisXtehzw",
     "19GrL5jnUkGmHXVcraB1Etv5rXCANeLWpq",
     "19pPbUDvoSBZafkUCYkD2Z9AkuqqV6sWm7",
     "1A3iYY4c3dkgNYGewzYzr7EsqfBuWXibGo",
+    "1A7SKE2dQtezLktCY8peLsdAtkqxV9r1dC",
     "1ANpca7g93BwptUJg1zV116v49zn9gjDi3",
     "1AXUTu9y3H8w4wYx4BjyFWgRhZKDhmcMrn",
     "1AeSq93WDNdLoEJ92sex7T8xQZoYYm8BtS",
@@ -68,13 +85,16 @@ pub const BTC_ADDRESS_BLOCKLIST: &[&str] = &[
     "1CF46Rfbp97absrs7zb7dFfZS6qBXUm9EP",
     "1CG1aSCxUnbmv9G34ofxTQoHtuVnMLJtQV",
     "1CNbhgxGRZvsWnEHotfXge7k2E1UPzBDC7",
+    "1CPJak9ZyddbawMGJPyEhCiJLXXb4sYv8N",
     "1CddRqw7oSPrT4tt5oXKyx2LiHJDPszy7y",
     "1D1ej7zQzywWBDNXKNYpmH7Hso2U9koDG4",
     "1D3GuaS9eqKw8dWj9JFQtNufdRtysjSLxZ",
+    "1D6gG9iKEhPitTcWRJiniuj1jYM2hNeAfJ",
     "1DDA93oZPn7wte2eR1ABwcFoxUFxkKMwCf",
     "1DGsY4ww3BJnWXTsnmTgWa6UWdoRXgA1pX",
     "1DH2xDH7TngrDU6LXciprKCBKNcPA1xX8A",
     "1DJoEMvp95yJYWyxAZy8DDBzuvjnrTVrsN",
+    "1DJoVLgn1foJHHngduRPJvRbwpaFEKxvxd",
     "1DKGRGJXGNLAtTeFb9SNPNHtrkZ87q7qKi",
     "1DT3tenf14cxz9WFNxmYrXFbB6TFiVWA9U",
     "1DYFJ6CuBvrxyoQSuBzVsNcetY9tvdsrag",
@@ -95,6 +115,7 @@ pub const BTC_ADDRESS_BLOCKLIST: &[&str] = &[
     "1F2Gdug9ib9NQMhKMGGJczzMk5SuENoqrp",
     "1F317n2eJEMaEMGiwCqtd5XCU3wF7jzPEW",
     "1F7UL41qYm6TvnExZzPHBCyeENvX3XDEMS",
+    "1FCNgfZWpYMeYhy9t18AAkTBu8AsdoAc1Z",
     "1FE2cuvkq8n5VGwj5hi8YYQxskwJpovPyV",
     "1FFS6pX1TCKTNy668Mbk2Lyoem1qB48kYX",
     "1FRyL9gmFGbzfYDAB4iY9836DJe3KSnjP9",
@@ -117,15 +138,19 @@ pub const BTC_ADDRESS_BLOCKLIST: &[&str] = &[
     "1Hn9ErTCPRP6j5UDBeuXPGuq5RtRjFJxJQ",
     "1Hpj6qm9i7nMF3VkKfBFtjhEDpEjxHWvgv",
     "1HuYfoEwsfHgZiRhbhJrCd5ST3iksa8KEx",
+    "1J378PbmTKn2sEw6NBrSWVfjZLBZW3DZem",
     "1J6cgUVEZRKyJhpXJgHWX7YmzkdnHRaLhF",
     "1J9oGoAiHeRfeMZeUnJ9W7RpV55CdKtgYE",
     "1J9wJH2bamZVxscXAvoDH4jvtGKb7sYFDm",
+    "1JHdQHkBZiim1cb4hyUh2PbzEbbg6z2TrF",
+    "1JPfVv5cWRLx1js9NWxg46dG2CGbeRz4th",
     "1JREJdZupiFhE7ZzQPtASuMCvvpXC7wRsC",
     "1Js6goCey2NaqPQptiLANLQGuk4d6mowjP",
     "1Juv2Ks3jJFUes8jEGxwgt6T6csBRQmmRw",
     "1K2fmE9hfhbRNSZoBvCBWZAvsS5idTUxBG",
     "1KSAbh5trMCTZwhiNsuUQvfTtSSTT8zqRk",
     "1KUUJPkyDhamZXgpsyXqNGc3x1QPXtdhgz",
+    "1Kc6egXevyLEaeTxLFA1Zyw7GuhCN8jQtt",
     "1KctQENEX5QkQMpnMC3Zh9yRAzkMBLpPcr",
     "1KgudqxMfYaGzqAA7MS4DcsqejtMteqhix",
     "1KkaKujnqwJf7Cbm7JKAZGF3X9d4685m8n",
@@ -138,19 +163,24 @@ pub const BTC_ADDRESS_BLOCKLIST: &[&str] = &[
     "1LQV6yUBcfTjAWvFu3XPhdTgjqihss7i1z",
     "1LiNmTUPSJEd92ZgVJjAV3RT9BzUjvUCkx",
     "1Licqjca74n8pmNaoARXLLqcTUTHFpxbXH",
+    "1Ljk8RNNabkZ9bfDYQBn98XfFozJhTjqcZ",
     "1LpYKb3SXZPve9hsH2QEJZFX279wJVGowi",
     "1LrxsRd7zNuxPJcL5rttnoeJFy1y4AffYY",
     "1LuDiMd95Df4i2bcvrfw47t2GKpLLXAQMZ",
+    "1MLPqwaFFUBZePTjpR3nxRoK19Cv9mPCc7",
     "1MQBDeRWsiJBf7K1VGjJ7PWEL6GJXMfmLg",
     "1MbtT2ZsTtLp7EKZUV9r74cTyqvsMtTP2M",
     "1MiQRekg4BatJ12qbiSGnNakLLd8xbLMCG",
+    "1MkCnCa9agS5t6V1B15bzusBgYECB4LfWp",
     "1MnbhWe5wr7Ut45ReyQsm96PwnM9jD7KaH",
     "1MtsQsw6n2jvJCWhpCw7jifTfD9Q3rBBVg",
     "1N6XqSf3ULpNjko9LrJmHudRoLitjwkETN",
     "1NE2NiGhhbkFPSEyNWwj7hKGhGDedBtSrQ",
+    "1NaRX1GZgtZ7E8iXo8YUdTtnb8rAK5QFJa",
     "1NayLEVF3bEEbDtdF2Cwso1VdEtvVNh2qX",
     "1NbGwQwt4uEhg2srAKppLf8QaF6fbp3PZG",
     "1NpHuti9NSM9fVTXLkvSDU4AnhqGQ5N53d",
+    "1NuBZQXJPyYQGfoBib8wWBDpZmbtkJa5Ba",
     "1NvJm3jfZxENNyqws5BKQvhkLxg9chLJdo",
     "1P3ZfGFLezzYGg9k5SVzQmnjyh7nrUmF2y",
     "1PJp8diNa89cVHpiT1VPu7EQ8LxYM5HX6v",
@@ -176,6 +206,7 @@ pub const BTC_ADDRESS_BLOCKLIST: &[&str] = &[
     "32fbAZMTaQxNd2fAue1PgsiPgWfcsHBQQt",
     "32jgFkZsTEjMFaBvxJnYvJEeTNKTmq5b32",
     "32pCmCWEjwhkLwh5BgLNAeBQFp5Gi1hv81",
+    "32pTjxTNi7snk8sodrgfmdKao3DEn1nVJM",
     "32wdqwX3zCEX3DhAVEcKwXCEGdzgBnx1R9",
     "331TS6DyASY7iU5CRA8UryBnkPS78fP2B1",
     "33KKjn4exdBJQkTtdWxqpdVsWxrw3LareG",
@@ -201,6 +232,7 @@ pub const BTC_ADDRESS_BLOCKLIST: &[&str] = &[
     "35vypiSvQsxRiT3YZzGRGVaduUSx67ysZb",
     "361AkMKNNWYwZRsCE8pPNmoh5aQf4V7g4p",
     "361NP7YcBPQ4KkLT3Y2QZeDEV4M3yi65Ar",
+    "3685sEusmTwZBiKJ4cgV73EAhpVD1nbgbe",
     "36XqYWGvUQwBrYLRVuegN4pJJJSPWL1WEu",
     "36YGN5dGzqrxMomTHdkT6cYVMnWBw8S7hD",
     "36yS87PLuW7sErLg1TY26WzaVarTim7AcC",
@@ -210,6 +242,7 @@ pub const BTC_ADDRESS_BLOCKLIST: &[&str] = &[
     "386wa1UM6nA798AWNh64jdrejZyedeXgUN",
     "389Sft4nJFkPGhbagk9FN4jXncA9piYTuU",
     "38LjCapRrJEW7w2zwbyS15P9D9UGPjWS44",
+    "38TftW1heYPqvKbiAhT4ttNBqkUPpooXad",
     "38ncxqt932N9CcfNfYuHGZgCyR85hDkWBW",
     "39AALn7eTjdPzLb99hHhD6F7J8QWB3R2Rd",
     "39KQvziHwUe2vddbpfC5WkQEV72qbQhxuh",
@@ -217,6 +250,7 @@ pub const BTC_ADDRESS_BLOCKLIST: &[&str] = &[
     "39Te8MbphSgs7npDJPj2hbNzhke61NTcnB",
     "39eboeqYNFe2VoLC3mUGx4dh6GNhLB3D2q",
     "39fhoB2DohisGBbHvvfmkdPdShT75CNHdX",
+    "39p8qWp1bkBNhi4vPpFTetKPtH7goqNDZf",
     "3A1HH3PseYMkh2nSrBb4kkVt3815kUNVVC",
     "3AFcE2mbSSndcpYFgHoExSmjUc26ef2gQh",
     "3ANWhUnHujdwbw2jEuGSRH6bvFsD9BqEy9",
@@ -226,6 +260,7 @@ pub const BTC_ADDRESS_BLOCKLIST: &[&str] = &[
     "3AjyprBY5yhijiCjUC5NUJutGbwhd3AQdE",
     "3B3vmabBbeDRnVrjvvq3hm85zVB4v5bWFC",
     "3B4G1M8eF3cThbeMwhEWkKzczw9QoNTGak",
+    "3B7S6zrgxQVQUHTU8wstM23tB9afE7ojuX",
     "3BCN3WgMRJwULTz1vsEQ7NZrBjwaUBf5Ca",
     "3BQACtiMXYB9JpUMpkEWt9m8BzswpGHq4X",
     "3BWP6ZQAhc4j5wR1b95zJAthJEFvhdees7",
@@ -262,6 +297,7 @@ pub const BTC_ADDRESS_BLOCKLIST: &[&str] = &[
     "3HSZc4BLnQBznjSq7JvXgqNCZUUs3M9fZz",
     "3HWjh69cVQvcPeLWVCyVmXEq72nyDSj5zP",
     "3He6EyDaCUgmdr4GXqhxbeTQukaGLCByU2",
+    "3HePkztPU6UsdENxnyQHFrdZA6eVKeMtvz",
     "3HqA7i3ttECLvgqvq69HNxxUP5BL7Z5YgA",
     "3HupEUfKmMhvhXqf8TMoPAyqDcRC1kpe65",
     "3J19qffPT6mxQUcV6k5yVURGZtdhpdGr4y",
@@ -298,15 +334,19 @@ pub const BTC_ADDRESS_BLOCKLIST: &[&str] = &[
     "3N6WeZ6i34taX8Ditser6LKWBcXmt2XXL4",
     "3N9YcPBDky9UsMx1RTk33tL4jDkZfSnsPk",
     "3NDzzVxiLBUs1WPvVGRfCYDTAD2Ua2PvW4",
+    "3NNcbBcMZokPB2JC2dxYuZrpgcetvyGeJn",
     "3NPognMSbzyA2JYW2fpkVKWyBMi2XTq2Zt",
     "3NQ1aa9ceirMJ1JvRq3eXefvXj1L639fzX",
     "3NRJ8aXdUiZdHaiFX9ePX3DhGHzcEi14Fq",
+    "3NU9zkD8CCVGVmYnNNSN7PbU9sSFQBm5UV",
     "3P6PzdfETr4275Gn3veLkCyDxA1jV8fHKm",
     "3PDmRwotTkRAFRLGTUrucCERp2JdM1q4ar",
+    "3PKiHs4GY4rFg8dpppNVPXGPqMX6K2cBML",
     "3PUmTuVAW3LkKg53FZ7F97VDBitW4ugwnM",
     "3PiCnZrBvGfWAKQ9hr4cCpfaDjy64yNSpE",
     "3PyzSbFj3hbQQjTzDzyLSgvFVDjB7yw4Cj",
     "3Q5dGfLKkWqWSwYtbMUyc8xGjN5LrRviK4",
+    "3Q8H2ZWMtc4R1M3mkmhnTjCoYKTeCFigDP",
     "3QAdoc1rDCt8dii1GVPJXvvK6CEJLzCRZw",
     "3QEjBiPzw6WZUL4MYMmMU6DY1Y25aVbpQu",
     "3QJyT8nThEQakbfqgX86YjCK1Sp9hfNCUW",
@@ -315,30 +355,85 @@ pub const BTC_ADDRESS_BLOCKLIST: &[&str] = &[
     "3QnWE5GVfQu3wVav91RuFkqip4Ti4NWqAY",
     "3QrukkUiBrn23rFUKUgasNd1wYWNk7WdSV",
     "3Qw9Fn19gCnga9LfHfpM99aGzuqxBNjR2i",
+    "TUCsTq7TofTCJRRoHk6RvhMoS2mJLm5Yzq",
+    "bc1q05aktddf9ce4p7hh3stgsf253m4vweu7nkhtmw",
     "bc1q202ajnhxgg9d9jjczmg0g4usp6haqldyy2eakl",
     "bc1q237mvl0heyw0r38wd3xz8h5mar96rrwpams8pp",
+    "bc1q2jys00x2rgdkm3xnewuucqacytu0a7echupu8y",
     "bc1q2lpgjntr348pfvxhfy33ehmdzy3gmx8w4052z6",
+    "bc1q2q8uxjznmurg363dvd98xjg54mrr7z6mw9t825",
+    "bc1q362njxy39gnwrvj7zytn84ax39fwnhvk7n2999",
+    "bc1q3ael5my37nklgnqcrkwmnndfx9qdnp67j0739c",
     "bc1q3y5v2khlyvemcz042wl98dzflywr8ghglqws6s",
+    "bc1q49ax787wv0mnn8wjgp3sx772qz7eun822rkv5k",
+    "bc1q4namcagg5wljs0u20z6h2sqgsq4q5lts8rt2rr",
     "bc1q4rzdtlt0uslyw86cp29sctl6ct29g9a95cuup7pn5md9ddj7xgmqpp5m73",
+    "bc1q5jqgm7nvrhaw2rh2vk0dk8e4gg5g373g0vz07r",
+    "bc1q5zd0cwzd09k9r8xfk68sn5ytqp8f5aae80yfsm",
+    "bc1q68uswkjvu7nj7mhrvfzkx7cm6u5s9puvpm5dc2",
+    "bc1q6w463k7mhsgguwgqtcratm4vm42rncwhvvkeck",
+    "bc1q7hhdygx05kyfyzjku2u7lywvx5pgyng6a0nefp",
+    "bc1q7xfqqw9htr88t7vafg80p4qrlpjfyaps452x5g",
     "bc1q86tl9255vg5wldamfymaaz36uqxzm30gs7fhkljvzdlt9t38s3lqgdwdfq",
+    "bc1q8ew45w2agdffrnwp6adt2gqrc9n4mkev9ns29c",
+    "bc1q8pw85s83mdx2f3rfu64mmfd9wexqu2y856arwp",
+    "bc1q8q7z3kt37z6jalv5ujung5lem6pzlk9r3kt66k",
     "bc1q90zrdysy4flyacw7hsury3ajs9yzwtwp6guqpypx94w0d3p58hysvz6pde",
     "bc1q9lvynkfpaw330uhqmunzdz6gmafsvapv7y3zty",
+    "bc1q9ua9ypl4dhj0zut5kzasj5c2kxclhh8v2k9djd",
+    "bc1q9ws2gcq7uumm4mk3l9xezwve7w5tmcs5js5cup",
+    "bc1qa2xr7dmz5lztplp9yfp7k382nf4ma8gwrl7zgg",
+    "bc1qagp0gy58v8hqvw4p2wsphcxg067rrppp45hexr",
+    "bc1qakycg2zp8hydg95lc9cheumpa9yfpdeyrqqh5f",
+    "bc1qardcxz845jw83vgfvcmewhuxa0ag9gchjwmcfd",
+    "bc1qau9pmgc8l6rxpdwwap3fd6zprh5yp9mpe9jl0h",
+    "bc1qavwamr74qlzj8txy6jaxqnpym9062h090x6kz4",
+    "bc1qdpazd6smrkq5hmw6lupq98za2fqtgmq3azv3av",
     "bc1qdt3gml5z5n50y5hm04u2yjdphefkm0fl2zdj68",
+    "bc1qe8wclszdtshkjk7gph57crc72vpp9rylujgwa5",
     "bc1qe95l438kzjcvnsm3kn8n5augf9gpctdlhsq7f7hpnkyvlr7rc7cqupapf7",
+    "bc1qe9lz50jq0a5pmtry0h3ekng3kjdg09vejg7355",
+    "bc1qedvcgh32dud85yt7fu6s7qavthlh38gtwa7rhx",
     "bc1qfg4gfg0y6t6xjnpmlhuwx5k0wlw6nmfzxn2psc",
+    "bc1qgffxa65gr579tsz55n87pal2a777ygzg69d2yz",
+    "bc1qh33xtpjqhgysq5xlmjzkm28uewj08885n95drr",
+    "bc1qh3lw22uqwrywr8lpun20q2ma528a4yqmgf3uqp",
+    "bc1qhvzl5w99m458nm7sc6hwf5qfhxndw28sgtatk8",
     "bc1qj6j6p0jdefl6pvdzx3kx8245yy5mz6q4luhzes",
+    "bc1qkfqh5p2qsakseg5gnwen6zh5xf3elmku2xaup29mw3l0wnncy3es880dss",
+    "bc1ql526s72gycmvq7hek6j3tuwwmcpv4rgs0auxu7",
     "bc1ql7dlyh8xz6tpqk92vztrhqh88dmjvcwrmsemrm",
+    "bc1ql7rnd70aejdxt3f9fzdlfazjlc9hvdmut8ad8s",
+    "bc1qlfpg2xn39u580cmwq6rymt8jdhcmj8520jhgh0",
+    "bc1qllmlvy5u038yvwywu803p53g8udcm8w7k4qxu9",
+    "bc1qn6segn8km4nfdp9vueu6msfjsaxaqgun9h60n9",
+    "bc1qnykkrlk67f9kdqvzyw2ndu3xmef5z2e52886yl",
     "bc1qpaly5nm7pfka9v92d6qvl4fc2l9xzee8a6ys3s",
+    "bc1qq7p0es3dv5hcynjjf40f2xjjr6qp5py47d2f6n847vduuq9gvnyq7y9ecd",
     "bc1qqf8kcc9m57xjqcvsvuf989nnl48ve6d2s24cx3",
+    "bc1qrc2gchg2fmxua5u7twu4luv5p9twmny4jjmg9x",
+    "bc1qrskwdw9unhlkt87ltcqq2d5pn9s6w2f35gz3z6",
     "bc1qs9u6j78e3utj08mwvqkkmqm9de5xk3g4yh8qtq",
     "bc1qsmqpalp3gtgkltag4x3ygevmhh9y2hzk73t2ug",
     "bc1qsmv6lkrw65l30yazdqpdjjtwzpvk9f8gfh0cy7",
     "bc1qsxf77cvwcd6jv6j8d8j3uhh4g0xqw4meswmwuc",
+    "bc1qtdupwe722vcc5e0vh94cgwfs0ep4gzwyfsf75q",
+    "bc1qte9ret332gwrk6e7vqc87d807npzvdj5savg4h",
+    "bc1qtrrfhr0f3ufsrjxfv8a7p3yuqj0spe4cm6vaws",
+    "bc1qtsl3ufenrv3zgrgm9z8xarcx22x8mfztuartyn",
+    "bc1qtywfzxx6snut2mdrum8dyr5nnd5qhqd29wmvqt",
+    "bc1qu5vngdtcx8nc9d68pq8nv7pzcjrswsy87s66gk",
+    "bc1qup656lpfqfckhl580kwf62thmn5azmj2pal0sz",
     "bc1quyc6j8ca84q9gjej5jjd2n8hra0vfu0j60fefs57p6e5rerkq07q0l5u3w",
+    "bc1qv4krhj2qmpd9qz9xj9nhvj99fq8s9xsw05d485",
     "bc1qv7k70u2zynvem59u88ctdlaw7hc735d8xep9rq",
+    "bc1qvhnfknw852ephxyc5hm4q520zmvf9maphetc9z",
     "bc1qvlzfn6kmezv44d8kw0p5jsmxe6wchv3zc7gsxs",
     "bc1qw4cxpe6sxa5dg6sdwxjph959cw6yztrzl4r54s",
     "bc1qw7vfgv3r5vnehafl0y95sclg3uqsj87wxs9ad628yjjcq33cwessr6ndyw",
+    "bc1qw8evftpgc8wsmkemd8yl5fg2husza5z802xaym",
     "bc1qwa6zu6qhl6wqnlxp642vcf89nptsassle25ulf",
+    "bc1qwz0l2ceddckwdy5rh6zyrm3x4ha6gn5f2da5zg",
     "bc1qx3e2axj3wsfn0ndtvlwmkghmmgm4583nqg8ngk",
+    "bc1qx9upga7f09tsetqf78wa3qrmcjar58mkwz6ng6",
 ];
diff --git a/rs/bitcoin/kyt/src/fetch.rs b/rs/bitcoin/kyt/src/fetch.rs
index 4a7b208f8c1..81f011f6be0 100644
--- a/rs/bitcoin/kyt/src/fetch.rs
+++ b/rs/bitcoin/kyt/src/fetch.rs
@@ -1,3 +1,4 @@
+use crate::logs::WARN;
 use crate::state::{
     FetchGuardError, FetchTxStatus, FetchTxStatusError, FetchedTx, HttpGetTxError,
     TransactionKytData,
@@ -11,6 +12,7 @@ use ic_btc_kyt::{
     CheckTransactionRetriable, CheckTransactionStatus, INITIAL_MAX_RESPONSE_BYTES,
     RETRY_MAX_RESPONSE_BYTES,
 };
+use ic_canister_log::log;
 use std::convert::Infallible;
 
 #[cfg(test)]
@@ -216,14 +218,13 @@ pub trait FetchEnv {
                             state::set_fetched_address(txid, index, address.clone());
                         } else {
                             // This error shouldn't happen unless blockdata is corrupted.
-                            // TODO(XC-205): log this error
-                            return CheckTransactionIrrecoverableError::InvalidTransaction(
-                                format!(
-                                    "Tx {} vout {} has no address, but is vin {} of tx {}",
-                                    input.txid, input.vout, index, txid
-                                ),
-                            )
-                            .into();
+                            let msg = format!(
+                                "Tx {} vout {} has no address, but is vin {} of tx {}",
+                                input.txid, input.vout, index, txid
+                            );
+                            log!(WARN, "{msg}");
+                            return CheckTransactionIrrecoverableError::InvalidTransaction(msg)
+                                .into();
                         }
                     }
                     Pending => {}
@@ -259,13 +260,13 @@ pub trait FetchEnv {
                         state::set_fetched_address(txid, index, address.clone());
                     } else {
                         // This error shouldn't happen unless blockdata is corrupted.
-                        // TODO(XC-205): log this error
+                        let msg = format!(
+                            "Tx {} vout {} has no address, but is vin {} of tx {}",
+                            input_txid, vout, index, txid
+                        );
+                        log!(WARN, "{msg}");
                         error = Some(
-                            CheckTransactionIrrecoverableError::InvalidTransaction(format!(
-                                "Tx {} vout {} has no address, but is vin {} of tx {}",
-                                input_txid, vout, index, txid
-                            ))
-                            .into(),
+                            CheckTransactionIrrecoverableError::InvalidTransaction(msg).into(),
                         );
                     }
                 }
diff --git a/rs/bitcoin/kyt/src/logs.rs b/rs/bitcoin/kyt/src/logs.rs
new file mode 100644
index 00000000000..e6eba8ff83d
--- /dev/null
+++ b/rs/bitcoin/kyt/src/logs.rs
@@ -0,0 +1,29 @@
+use ic_canister_log::declare_log_buffer;
+use serde::{Deserialize, Serialize};
+
+// High-priority messages.
+declare_log_buffer!(name = WARN, capacity = 1000);
+
+// Low-priority info messages.
+declare_log_buffer!(name = DEBUG, capacity = 1000);
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub enum Priority {
+    Warn,
+    Debug,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct LogEntry {
+    pub timestamp: u64,
+    pub priority: Priority,
+    pub file: String,
+    pub line: u32,
+    pub message: String,
+    pub counter: u64,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+pub struct Log {
+    pub entries: Vec<LogEntry>,
+}
diff --git a/rs/bitcoin/kyt/src/main.rs b/rs/bitcoin/kyt/src/main.rs
index 5517f36583e..92c29cf88e4 100644
--- a/rs/bitcoin/kyt/src/main.rs
+++ b/rs/bitcoin/kyt/src/main.rs
@@ -6,19 +6,37 @@ use ic_btc_kyt::{
     CheckTransactionRetriable, CheckTransactionStatus, KytArg, KytMode,
     CHECK_TRANSACTION_CYCLES_REQUIRED, CHECK_TRANSACTION_CYCLES_SERVICE_FEE,
 };
+use ic_canister_log::{export as export_logs, log};
 use ic_canisters_http_types as http;
 use ic_cdk::api::call::RejectionCode;
 use ic_cdk::api::management_canister::http_request::{HttpResponse, TransformArgs};
+use num_traits::cast::ToPrimitive;
+use std::cell::RefCell;
+use std::collections::BTreeMap;
 use std::str::FromStr;
 
 mod dashboard;
 mod fetch;
+mod logs;
 mod providers;
 mod state;
 
 use fetch::{FetchEnv, FetchResult, TryFetchResult};
+use logs::{Log, LogEntry, Priority, DEBUG, WARN};
 use state::{get_config, set_config, Config, FetchGuardError, HttpGetTxError};
 
+#[derive(Default)]
+struct Stats {
+    https_outcall_status: BTreeMap<(String, u16), u64>,
+    http_response_size: BTreeMap<u32, u64>,
+    check_transaction_count: u64,
+    check_address_count: u64,
+}
+
+thread_local! {
+    static STATS : RefCell<Stats> = RefCell::default();
+}
+
 pub fn is_response_too_large(code: &RejectionCode, message: &str) -> bool {
     code == &RejectionCode::SysFatal
         && (message.contains("size limit") || message.contains("length limit"))
@@ -38,6 +56,7 @@ fn check_address(args: CheckAddressArgs) -> CheckAddressResponse {
             ic_cdk::trap(&format!("Not a bitcoin {} address: {}", btc_network, err))
         });
 
+    STATS.with(|s| s.borrow_mut().check_transaction_count += 1);
     match config.kyt_mode() {
         KytMode::AcceptAll => CheckAddressResponse::Passed,
         KytMode::RejectAll => CheckAddressResponse::Failed,
@@ -72,6 +91,7 @@ async fn check_transaction(args: CheckTransactionArgs) -> CheckTransactionRespon
     ic_cdk::api::call::msg_cycles_accept128(CHECK_TRANSACTION_CYCLES_SERVICE_FEE);
     match Txid::try_from(args.txid.as_ref()) {
         Ok(txid) => {
+            STATS.with(|s| s.borrow_mut().check_transaction_count += 1);
             if ic_cdk::api::call::msg_cycles_available128()
                 .checked_add(CHECK_TRANSACTION_CYCLES_SERVICE_FEE)
                 .unwrap()
@@ -126,9 +146,145 @@ fn post_upgrade(arg: KytArg) {
 
 #[ic_cdk::query(hidden = true)]
 fn http_request(req: http::HttpRequest) -> http::HttpResponse {
+    if ic_cdk::api::data_certificate().is_none() {
+        ic_cdk::trap("update call rejected");
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    fn heap_memory_size_bytes() -> usize {
+        const WASM_PAGE_SIZE_BYTES: usize = 65536;
+        core::arch::wasm32::memory_size(0) * WASM_PAGE_SIZE_BYTES
+    }
+
+    #[cfg(not(any(target_arch = "wasm32")))]
+    fn heap_memory_size_bytes() -> usize {
+        0
+    }
+
     if req.path() == "/metrics" {
-        // TODO(XC-205): Add metrics
-        unimplemented!()
+        let mut writer =
+            ic_metrics_encoder::MetricsEncoder::new(vec![], ic_cdk::api::time() as i64 / 1_000_000);
+
+        let cycle_balance = ic_cdk::api::canister_balance128() as f64;
+
+        writer
+            .gauge_vec("cycle_balance", "The canister cycle balance.")
+            .unwrap()
+            .value(&[("canister", "btc-kyt")], cycle_balance)
+            .unwrap();
+
+        writer
+            .encode_gauge(
+                "heap_memory_bytes",
+                heap_memory_size_bytes() as f64,
+                "Size of the heap memory allocated by this canister.",
+            )
+            .unwrap();
+
+        writer
+            .encode_gauge(
+                "stable_memory_bytes",
+                ic_cdk::api::stable::stable_size() as f64 * 65536.0,
+                "Size of the stable memory allocated by this canister.",
+            )
+            .unwrap();
+
+        STATS.with(|s| {
+            let stats = s.borrow();
+            let mut counter = writer
+                .counter_vec(
+                    "btc_kyt_http_calls_total",
+                    "The number of http outcalls made since the last canister upgrade.",
+                )
+                .unwrap();
+            for ((provider, status), count) in stats.https_outcall_status.iter() {
+                counter = counter
+                    .value(
+                        &[
+                            ("provider", provider.as_str()),
+                            ("status", status.to_string().as_str()),
+                        ],
+                        *count as f64,
+                    )
+                    .unwrap();
+            }
+            let mut counter = writer
+                .counter_vec(
+                    "btc_kyt_http_response_size",
+                    "The byte sizes of http outcall responses.",
+                )
+                .unwrap();
+            for (size, count) in stats.http_response_size.iter() {
+                counter = counter
+                    .value(&[("size", size.to_string().as_str())], *count as f64)
+                    .unwrap();
+            }
+            writer
+                .counter_vec(
+                    "ckbtc_kyt_requests_total",
+                    "The number of KYT requests received since the last canister upgrade.",
+                )
+                .unwrap()
+                .value(
+                    &[("type", "check_transaction")],
+                    stats.check_transaction_count as f64,
+                )
+                .unwrap()
+                .value(
+                    &[("type", "check_address")],
+                    stats.check_address_count as f64,
+                )
+                .unwrap();
+        });
+
+        http::HttpResponseBuilder::ok()
+            .header("Content-Type", "text/plain; version=0.0.4")
+            .with_body_and_content_length(writer.into_inner())
+            .build()
+    } else if req.path() == "/logs" {
+        use serde_json;
+
+        let max_skip_timestamp = match req.raw_query_param("time") {
+            Some(arg) => match u64::from_str(arg) {
+                Ok(value) => value,
+                Err(_) => {
+                    return http::HttpResponseBuilder::bad_request()
+                        .with_body_and_content_length("failed to parse the 'time' parameter")
+                        .build()
+                }
+            },
+            None => 0,
+        };
+
+        let mut entries: Log = Default::default();
+        for entry in export_logs(&WARN) {
+            if entry.timestamp >= max_skip_timestamp {
+                entries.entries.push(LogEntry {
+                    timestamp: entry.timestamp,
+                    counter: entry.counter,
+                    priority: Priority::Warn,
+                    file: entry.file.to_string(),
+                    line: entry.line,
+                    message: entry.message,
+                });
+            }
+        }
+        for entry in export_logs(&DEBUG) {
+            if entry.timestamp >= max_skip_timestamp {
+                entries.entries.push(LogEntry {
+                    timestamp: entry.timestamp,
+                    counter: entry.counter,
+                    priority: Priority::Debug,
+                    file: entry.file.to_string(),
+                    line: entry.line,
+                    message: entry.message,
+                });
+            }
+        }
+        http::HttpResponseBuilder::ok()
+            .header("Content-Type", "application/json; charset=utf-8")
+            .with_body_and_content_length(serde_json::to_string(&entries).unwrap_or_default())
+            .build()
     } else if req.path() == "/dashboard" {
         use askama::Template;
         let page_index = match req.raw_query_param("page") {
@@ -182,6 +338,18 @@ impl FetchEnv for KytCanisterEnv {
         let cycles = get_tx_cycle_cost(max_response_bytes);
         match http_request(request.clone(), cycles).await {
             Ok((response,)) => {
+                STATS.with(|s| {
+                    let mut stat = s.borrow_mut();
+                    *stat
+                        .https_outcall_status
+                        .entry((provider.name(), response.status.0.to_u16().unwrap()))
+                        .or_default() += 1;
+                    // Calculate size bucket as a series of power of 2s.
+                    // Note that the max is bounded by `max_response_bytes`, which fits `u32`.
+                    let size = 2u32.pow((response.body.len() as f64).log2().floor() as u32);
+                    *stat.http_response_size.entry(size).or_default() += 1;
+                });
+
                 // Ensure response is 200 before decoding
                 if response.status != 200u32 {
                     // All non-200 status are treated as transient errors
@@ -224,8 +392,10 @@ impl FetchEnv for KytCanisterEnv {
             }
             Err((r, m)) if is_response_too_large(&r, &m) => Err(HttpGetTxError::ResponseTooLarge),
             Err((r, m)) => {
-                // TODO(XC-158): maybe try other providers and also log the error.
-                println!("The http_request resulted into error. RejectionCode: {r:?}, Error: {m}");
+                log!(
+                    DEBUG,
+                    "The http_request resulted into error. RejectionCode: {r:?}, Error: {m}, Request: {request:?}"
+                );
                 Err(HttpGetTxError::Rejected {
                     code: r,
                     message: m,
diff --git a/rs/bitcoin/kyt/src/providers.rs b/rs/bitcoin/kyt/src/providers.rs
index c034b4b2e0c..51496544ae2 100644
--- a/rs/bitcoin/kyt/src/providers.rs
+++ b/rs/bitcoin/kyt/src/providers.rs
@@ -57,6 +57,14 @@ impl Provider {
         &self.btc_network
     }
 
+    pub fn name(&self) -> String {
+        match self.btc_network {
+            BtcNetwork::Mainnet => self.provider_id.to_string(),
+            BtcNetwork::Testnet => "Testnet".to_string(),
+            BtcNetwork::Regtest { .. } => "Regtest".to_string(),
+        }
+    }
+
     // Return the next provider by cycling through all available providers.
     pub fn next(&self) -> Self {
         let btc_network = &self.btc_network;
diff --git a/rs/bitcoin/kyt/tests/tests.rs b/rs/bitcoin/kyt/tests/tests.rs
index dd39902019e..d85f48d617b 100644
--- a/rs/bitcoin/kyt/tests/tests.rs
+++ b/rs/bitcoin/kyt/tests/tests.rs
@@ -649,3 +649,48 @@ fn tick_until_next_request(env: &PocketIc) -> Vec<CanisterHttpRequest> {
     );
     canister_http_requests
 }
+
+#[test]
+fn should_query_logs_and_metrics() {
+    use candid::Decode;
+
+    let setup = Setup::new(BtcNetwork::Mainnet);
+    test_http_query(&setup, "/metrics");
+    test_http_query(&setup, "/logs");
+
+    fn test_http_query<U: Into<String>>(setup: &Setup, url: U) {
+        let request = ic_canisters_http_types::HttpRequest {
+            method: "GET".to_string(),
+            url: url.into(),
+            headers: Default::default(),
+            body: Default::default(),
+        };
+
+        let response = Decode!(
+            &assert_reply(
+                setup
+                    .env
+                    .query_call(
+                        setup.kyt_canister,
+                        Principal::anonymous(),
+                        "http_request",
+                        Encode!(&request).expect("failed to encode HTTP request"),
+                    )
+                    .expect("failed to query get_transactions on the ledger")
+            ),
+            ic_canisters_http_types::HttpResponse
+        )
+        .unwrap();
+
+        assert_eq!(response.status_code, 200_u16);
+    }
+}
+
+fn assert_reply(result: WasmResult) -> Vec<u8> {
+    match result {
+        WasmResult::Reply(bytes) => bytes,
+        WasmResult::Reject(reject) => {
+            panic!("Expected a successful reply, got a reject: {}", reject)
+        }
+    }
+}
diff --git a/rs/boundary_node/anonymization/backend/Cargo.toml b/rs/boundary_node/anonymization/backend/Cargo.toml
index aad6ba5a5bd..875e32b65c2 100644
--- a/rs/boundary_node/anonymization/backend/Cargo.toml
+++ b/rs/boundary_node/anonymization/backend/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
-name = "anonymization-backend"
+name = "anonymization_backend"
 version = "0.1.0"
 edition = "2021"
 
 [[bin]]
-name = "anonymization-backend"
-path = "src/lib.rs"
+name = "anonymization_backend"
+path = "src/main.rs"
 
 [dependencies]
 anyhow = { workspace = true }
diff --git a/rs/boundary_node/anonymization/backend/src/lib.rs b/rs/boundary_node/anonymization/backend/src/main.rs
similarity index 84%
rename from rs/boundary_node/anonymization/backend/src/lib.rs
rename to rs/boundary_node/anonymization/backend/src/main.rs
index 391a8f8de30..c659c0b5bf5 100644
--- a/rs/boundary_node/anonymization/backend/src/lib.rs
+++ b/rs/boundary_node/anonymization/backend/src/main.rs
@@ -6,7 +6,10 @@ use anonymization_interface::{
     SubmitResponse,
 };
 use candid::Principal;
-use ic_cdk::{id, spawn, trap};
+use ic_cdk::{
+    api::{call::accept_message, stable::WASM_PAGE_SIZE_IN_BYTES, time},
+    caller, id, spawn, trap,
+};
 use ic_cdk_timers::set_timer_interval;
 use ic_nns_constants::REGISTRY_CANISTER_ID;
 use ic_stable_structures::{
@@ -97,6 +100,20 @@ thread_local! {
         ).unwrap()
     });
 
+    static GAUGE_CANISTER_STABLE_BYTES_TOTAL: RefCell<Gauge> = RefCell::new({
+        Gauge::new(
+            format!("{SERVICE_NAME}_canister_stable_bytes_total"), // name
+            "stable memory byte size", // help
+        ).unwrap()
+    });
+
+    static GAUGE_CANISTER_LAST_UPDATE_SECS: RefCell<Gauge> = RefCell::new({
+        Gauge::new(
+            format!("{SERVICE_NAME}_last_update_secs"), // name
+            "timestamp in seconds of the last canister update", // help
+        ).unwrap()
+    });
+
     static METRICS_REGISTRY: RefCell<Registry> = RefCell::new({
         let r = Registry::new();
 
@@ -135,6 +152,16 @@ thread_local! {
             r.register(g).unwrap();
         });
 
+        GAUGE_CANISTER_STABLE_BYTES_TOTAL.with(|g| {
+            let g = Box::new(g.borrow().to_owned());
+            r.register(g).unwrap();
+        });
+
+        GAUGE_CANISTER_LAST_UPDATE_SECS.with(|g| {
+            let g = Box::new(g.borrow().to_owned());
+            r.register(g).unwrap();
+        });
+
         r
     });
 }
@@ -224,9 +251,12 @@ thread_local! {
 
 // Timers
 
+const SECOND: Duration = Duration::from_secs(1);
+const DAY: Duration = Duration::from_secs(24 * 60 * 60);
+
 fn timers() {
     // ACLs
-    set_timer_interval(Duration::from_secs(10), || {
+    set_timer_interval(10 * SECOND, || {
         // Switch to async
         spawn(async {
             // List registry entries
@@ -244,6 +274,10 @@ fn timers() {
                 // Clear allowed principals
                 ps.clear_new();
 
+                // Self authorize
+                ps.insert(id(), ());
+
+                // Authorize API Boundary Nodes
                 ids.iter().for_each(|p| {
                     ps.insert(p.to_owned(), ());
                 });
@@ -293,8 +327,33 @@ fn timers() {
         });
     });
 
+    // TTLs
+    set_timer_interval(7 * DAY, || {
+        // Remove all encrypted values
+        let ids = ENCRYPTED_VALUES.with(|vs| {
+            let mut vs = vs.borrow_mut();
+
+            let ids: Vec<_> = vs.iter().map(|(k, _)| k).collect();
+            vs.clear_new();
+
+            ids
+        });
+
+        // Re-queue
+        QUEUE.with(|q| {
+            let mut q = q.borrow_mut();
+
+            for id in ids {
+                q.insert(
+                    id, // principal
+                    (), // unit
+                );
+            }
+        });
+    });
+
     // Leader
-    set_timer_interval(Duration::from_secs(30), || {
+    set_timer_interval(30 * SECOND, || {
         // Collect candidates that have registered a public-key
         let ps: Vec<Principal> =
             PUBLIC_KEYS.with(|ks| ks.borrow().iter().map(|(p, _)| p).collect());
@@ -335,22 +394,30 @@ fn main() {}
 
 #[ic_cdk::init]
 fn init(_arg: InitArg) {
-    // Self-authorize
-    ALLOWED_PRINCIPALS.with(|m| {
-        m.borrow_mut().insert(
-            id(), // canister id
-            (),   // unit
-        )
-    });
-
     // Start timers
     timers();
+
+    // Set update time
+    GAUGE_CANISTER_LAST_UPDATE_SECS.with(|g| g.borrow_mut().set((time() as f64 / 1e9).trunc()));
 }
 
 #[ic_cdk::post_upgrade]
 fn post_upgrade() {
     // Start timers
     timers();
+
+    // Set update time
+    GAUGE_CANISTER_LAST_UPDATE_SECS.with(|g| g.borrow_mut().set((time() as f64 / 1e9).trunc()));
+}
+
+#[ic_cdk::inspect_message]
+fn inspect_message() {
+    (&AUTHORIZER)
+        .authorize(&caller())
+        .err()
+        .inspect(|err| trap(&err.to_string()));
+
+    accept_message();
 }
 
 #[ic_cdk::update]
@@ -428,6 +495,11 @@ fn http_request(request: HttpRequest) -> HttpResponse {
     GAUGE_CANISTER_CYCLES_BALANCE
         .with(|g| g.borrow_mut().set(ic_cdk::api::canister_balance() as f64));
 
+    GAUGE_CANISTER_STABLE_BYTES_TOTAL.with(|g| {
+        g.borrow_mut()
+            .set((ic_cdk::api::stable::stable_size() * WASM_PAGE_SIZE_IN_BYTES) as f64)
+    });
+
     // Export metrics
     let bs = METRICS_REGISTRY.with(|r| {
         let mfs = r.borrow().gather();
diff --git a/rs/boundary_node/anonymization/client/BUILD.bazel b/rs/boundary_node/anonymization/client/BUILD.bazel
new file mode 100644
index 00000000000..9e79c57884d
--- /dev/null
+++ b/rs/boundary_node/anonymization/client/BUILD.bazel
@@ -0,0 +1,28 @@
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+DEPENDENCIES = [
+    "//rs/boundary_node/anonymization/interface",
+    "//rs/canister_client",
+    "//rs/types/types",
+    "@crate_index//:anyhow",
+    "@crate_index//:candid",
+    "@crate_index//:rand",
+    "@crate_index//:rsa",
+    "@crate_index//:thiserror",
+    "@crate_index//:tokio",
+]
+
+MACRO_DEPENDENCIES = [
+    "@crate_index//:async-trait",
+]
+
+rust_library(
+    name = "client",
+    srcs = glob(["src/**/*.rs"]),
+    crate_name = "anonymization_client",
+    proc_macro_deps = MACRO_DEPENDENCIES,
+    version = "0.1.0",
+    deps = DEPENDENCIES,
+)
diff --git a/rs/boundary_node/anonymization/client/src/lib.rs b/rs/boundary_node/anonymization/client/src/lib.rs
index f5c87e7a5d2..16a614ceab8 100644
--- a/rs/boundary_node/anonymization/client/src/lib.rs
+++ b/rs/boundary_node/anonymization/client/src/lib.rs
@@ -61,6 +61,14 @@ impl<T> WithThrottle<T> {
     }
 }
 
+#[async_trait]
+impl<T: Register> Register for WithThrottle<T> {
+    async fn register(&self, pubkey: &[u8]) -> Result<(), RegisterError> {
+        self.throttle().await;
+        self.0.register(pubkey).await
+    }
+}
+
 #[async_trait]
 impl<T: Query> Query for WithThrottle<T> {
     async fn query(&self) -> Result<Vec<u8>, QueryError> {
@@ -421,7 +429,8 @@ impl From<Canister> for CanisterMethods {
         Self {
             register: Arc::new({
                 let v = value.clone();
-                WithLogs(v)
+                let v = WithLogs(v);
+                WithThrottle(v, ThrottleParams::new(Duration::from_secs(10)))
             }),
             query: Arc::new({
                 let v = value.clone();
diff --git a/rs/boundary_node/anonymization/interface/BUILD.bazel b/rs/boundary_node/anonymization/interface/BUILD.bazel
new file mode 100644
index 00000000000..3b10d693316
--- /dev/null
+++ b/rs/boundary_node/anonymization/interface/BUILD.bazel
@@ -0,0 +1,18 @@
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+DEPENDENCIES = [
+    # Keep sorted.
+    "@crate_index//:candid",
+    "@crate_index//:serde",
+    "@crate_index//:serde_bytes",
+]
+
+rust_library(
+    name = "interface",
+    srcs = glob(["src/**/*.rs"]),
+    crate_name = "anonymization_interface",
+    version = "0.1.0",
+    deps = DEPENDENCIES,
+)
diff --git a/rs/boundary_node/ic_boundary/BUILD.bazel b/rs/boundary_node/ic_boundary/BUILD.bazel
index 991402654a1..df3c3bf81a1 100644
--- a/rs/boundary_node/ic_boundary/BUILD.bazel
+++ b/rs/boundary_node/ic_boundary/BUILD.bazel
@@ -5,12 +5,18 @@ package(default_visibility = ["//visibility:public"])
 
 DEPENDENCIES = [
     # Keep sorted.
+    "//rs/boundary_node/anonymization/client",
+    "//rs/canister_client",
+    "//rs/canister_client/sender",
     "//rs/certification/test-utils",
     "//rs/config",
+    "//rs/crypto",
     "//rs/crypto/ed25519",
     "//rs/crypto/tree_hash",
+    "//rs/crypto/utils/basic_sig",
     "//rs/crypto/utils/threshold_sig_der",
     "//rs/crypto/utils/tls",
+    "//rs/interfaces",
     "//rs/interfaces/registry",
     "//rs/limits",
     "//rs/monitoring/logger",
@@ -42,6 +48,7 @@ DEPENDENCIES = [
     "@crate_index//:http",
     "@crate_index//:http-body",
     "@crate_index//:humantime",
+    "@crate_index//:ic-agent",
     "@crate_index//:ic-bn-lib",
     "@crate_index//:lazy_static",
     "@crate_index//:little-loadshedder",
diff --git a/rs/boundary_node/ic_boundary/Cargo.toml b/rs/boundary_node/ic_boundary/Cargo.toml
index 130d5e91bcf..5325dffe7a6 100644
--- a/rs/boundary_node/ic_boundary/Cargo.toml
+++ b/rs/boundary_node/ic_boundary/Cargo.toml
@@ -16,6 +16,7 @@ tls = []
 
 [dependencies]
 anyhow = { workspace = true }
+anonymization-client = { path = "../anonymization/client" }
 arc-swap = "1.7.1"
 async-scoped = { version = "0.9", features = ["use-tokio"] }
 async-trait = { workspace = true }
@@ -32,14 +33,20 @@ hex = { workspace = true }
 http = { workspace = true }
 http-body = { workspace = true }
 humantime = "2.1"
+ic-agent = "0.39.1"
 ic-base-types = { path = "../../types/base_types" }
-ic-bn-lib = { git = "https://github.com/dfinity/ic-bn-lib", rev = "2496803db52d8182f578f098a3ffe4fcb9573fcd" }
+ic-bn-lib = { git = "https://github.com/dfinity/ic-bn-lib", rev = "526d34d15cfbf369d8baf2dae9932aa18d570a1d" }
+ic-canister-client = { path = "../../canister_client" }
+ic-canister-client-sender = { path = "../../canister_client/sender" }
 ic-certification-test-utils = { path = "../../certification/test-utils" }
 ic-config = { path = "../../config" }
+ic-crypto = { path = "../../crypto" }
 ic-crypto-ed25519 = { path = "../../crypto/ed25519" }
 ic-crypto-tree-hash = { path = "../../crypto/tree_hash" }
+ic-crypto-utils-basic-sig = { path = "../../crypto/utils/basic_sig" }
 ic-crypto-utils-threshold-sig-der = { path = "../../crypto/utils/threshold_sig_der" }
 ic-crypto-utils-tls = { path = "../../crypto/utils/tls" }
+ic-interfaces = { path = "../../interfaces" }
 ic-interfaces-registry = { path = "../../interfaces/registry" }
 ic-limits = { path = "../../limits" }
 ic-logger = { path = "../../monitoring/logger" }
diff --git a/rs/boundary_node/ic_boundary/src/cli.rs b/rs/boundary_node/ic_boundary/src/cli.rs
index 911a07e3c1d..b4aa03092b9 100644
--- a/rs/boundary_node/ic_boundary/src/cli.rs
+++ b/rs/boundary_node/ic_boundary/src/cli.rs
@@ -1,3 +1,4 @@
+use candid::Principal;
 use clap::{Args, Parser};
 use humantime::parse_duration;
 use ic_bn_lib::{
@@ -8,6 +9,7 @@ use ic_bn_lib::{
     parse_size,
     types::RequestType,
 };
+use ic_config::crypto::CryptoConfig;
 use std::time::Duration;
 use std::{net::SocketAddr, path::PathBuf};
 use url::Url;
@@ -228,6 +230,10 @@ pub struct Observability {
     /// Enables logging to /dev/null (to benchmark logging)
     #[clap(env, long)]
     pub obs_log_null: bool,
+
+    /// Log Anonymization Canister ID
+    #[clap(env, long)]
+    pub obs_log_anonymization_canister_id: Option<Principal>,
 }
 
 #[derive(Args)]
@@ -366,4 +372,12 @@ pub struct Misc {
     /// Skip replica TLS certificate verification. DANGER: to be used only for testing
     #[clap(env, long)]
     pub skip_replica_tls_verification: bool,
+
+    /// Configuration of the node's crypto-vault
+    #[clap(env, long, value_parser=parse_crypto_config)]
+    pub crypto_config: Option<CryptoConfig>,
+}
+
+fn parse_crypto_config(arg: &str) -> Result<CryptoConfig, serde_json::Error> {
+    serde_json::from_str(arg)
 }
diff --git a/rs/boundary_node/ic_boundary/src/core.rs b/rs/boundary_node/ic_boundary/src/core.rs
index 3f286a55197..e185add1881 100644
--- a/rs/boundary_node/ic_boundary/src/core.rs
+++ b/rs/boundary_node/ic_boundary/src/core.rs
@@ -6,6 +6,9 @@ use std::{
     time::{Duration, Instant},
 };
 
+use anonymization_client::{
+    Canister as AnonymizationCanister, Track, Tracker as AnonymizationTracker,
+};
 use anyhow::{anyhow, Context, Error};
 use arc_swap::ArcSwapOption;
 use async_scoped::TokioScope;
@@ -31,13 +34,19 @@ use ic_bn_lib::{
     },
     types::RequestType,
 };
+use ic_canister_client::{Agent, Sender};
+use ic_crypto::CryptoComponent;
+use ic_crypto_utils_basic_sig::conversions::derive_node_id;
+use ic_interfaces::crypto::{BasicSigner, KeyManager};
 use ic_interfaces_registry::ZERO_REGISTRY_VERSION;
-use ic_registry_client::client::RegistryClientImpl;
-use ic_registry_local_store::{LocalStoreImpl, LocalStoreReader};
+use ic_logger::replica_logger::no_op_logger;
+use ic_registry_client::client::{RegistryClient, RegistryClientImpl};
+use ic_registry_local_store::{LocalStore, LocalStoreImpl};
 use ic_registry_replicator::RegistryReplicator;
-use ic_types::crypto::threshold_sig::ThresholdSigPublicKey;
+use ic_types::{crypto::threshold_sig::ThresholdSigPublicKey, messages::MessageId};
 use nix::unistd::{getpgid, setpgid, Pid};
 use prometheus::Registry;
+use rand::rngs::OsRng;
 use tokio::sync::RwLock;
 use tokio_util::sync::CancellationToken;
 use tower::{limit::ConcurrencyLimitLayer, util::MapResponseLayer, ServiceBuilder};
@@ -210,6 +219,9 @@ pub async fn main(cli: Cli) -> Result<(), Error> {
         cli.rate_limiting.rate_limit_generic.clone(),
     ));
 
+    // HTTP Logs Anonymization
+    let anonymization_salt = Arc::new(ArcSwapOption::<Vec<u8>>::empty());
+
     // Prepare Axum Router
     let router = setup_router(
         registry_snapshot.clone(),
@@ -220,6 +232,7 @@ pub async fn main(cli: Cli) -> Result<(), Error> {
         &cli,
         &metrics_registry,
         cache.clone(),
+        anonymization_salt.clone(),
     );
 
     // HTTP server metrics
@@ -315,36 +328,171 @@ pub async fn main(cli: Cli) -> Result<(), Error> {
 
     let persister = Persister::new(Arc::clone(&routing_table));
 
-    let (registry_replicator, nns_pub_key, mut registry_runners) =
-        // Set up registry-related stuff if local store was specified
-        if cli.registry.registry_local_store_path.is_some() {
-            let RegistrySetupResult(registry_replicator, nns_pub_key, registry_runners) =
-                setup_registry(
-                    &cli,
-                    registry_snapshot.clone(),
-                    WithMetricsPersist(persister, MetricParamsPersist::new(&metrics_registry)),
-                    http_client_check,
-                    &metrics_registry,
-                )?;
-
-            (registry_replicator, nns_pub_key, registry_runners)
-        } else {
-            // Otherwise load a stub routing table and snapshot
-            let subnet = generate_stub_subnet(cli.registry.registry_stub_replica.clone());
-            let snapshot = generate_stub_snapshot(vec![subnet.clone()]);
-            let _ = persister.persist(vec![subnet]);
-            registry_snapshot.store(Some(Arc::new(snapshot)));
+    if cli.registry.registry_local_store_path.is_none() {
+        // Prepare a stub routing table and snapshot
+        let subnet = generate_stub_subnet(cli.registry.registry_stub_replica.clone());
+        let snapshot = generate_stub_snapshot(vec![subnet.clone()]);
+        let _ = persister.persist(vec![subnet]);
+        registry_snapshot.store(Some(Arc::new(snapshot)));
+    }
 
-            (None, None, vec![])
-        };
+    // Registry Client
+    let (
+        registry_client,      //
+        registry_replicator,  //
+        nns_pub_key,          //
+        mut registry_runners, //
+    ) = cli
+        .registry
+        .registry_local_store_path
+        .clone()
+        .map(|p| {
+            // Store
+            let local_store = Arc::new(LocalStoreImpl::new(p));
+
+            // Client
+            let registry_client = Arc::new(RegistryClientImpl::new(
+                local_store.clone(), // data_provider
+                None,                // metrics_registry
+            ));
+
+            registry_client
+                .fetch_and_start_polling()
+                .context("failed to start registry client")?;
+
+            // Snapshotting
+            let r = setup_registry(
+                &cli,
+                local_store.clone(),
+                registry_client.clone(),
+                registry_snapshot.clone(),
+                WithMetricsPersist(
+                    persister,                                   // T
+                    MetricParamsPersist::new(&metrics_registry), // Params
+                ),
+                http_client_check,
+                &metrics_registry,
+            )?;
+
+            let RegistrySetupResult(
+                registry_replicator, //
+                nns_pub_key,         //
+                registry_runners,    //
+            ) = r;
+
+            Ok::<_, Error>((
+                registry_client,
+                registry_replicator,
+                nns_pub_key,
+                registry_runners,
+            ))
+        })
+        .transpose()?
+        .map_or((None, None, None, vec![]), |(a, b, c, d)| {
+            (Some(a), b, c, d)
+        });
 
     let generic_limiter_runner = WithThrottle(generic_limiter, ThrottleParams::new(10 * SECOND));
 
     // Runners
-    let mut runners: Vec<Box<dyn Run>> =
-        vec![Box::new(metrics_runner), Box::new(generic_limiter_runner)];
+    let mut runners: Vec<Box<dyn Run>> = vec![
+        Box::new(metrics_runner),         //
+        Box::new(generic_limiter_runner), //
+    ];
+
     runners.append(&mut registry_runners);
 
+    // HTTP Logs Anonymization
+    let tracker = match (
+        registry_client,
+        cli.misc.crypto_config,
+        cli.obs.obs_log_anonymization_canister_id,
+    ) {
+        (Some(registry_client), Some(crypto_config), Some(log_anonymization_cid)) => {
+            let c = tokio::task::spawn_blocking({
+                let registry_client = Arc::clone(&registry_client);
+
+                move || {
+                    Arc::new(CryptoComponent::new(
+                        &crypto_config,                          // config
+                        Some(tokio::runtime::Handle::current()), // tokio_runtime_handle
+                        registry_client,                         // registry_client
+                        no_op_logger(),                          // logger
+                        None,                                    // metrics
+                    ))
+                }
+            })
+            .await?;
+
+            let pk = tokio::task::spawn_blocking({
+                let c = Arc::clone(&c);
+
+                move || {
+                    c.current_node_public_keys()
+                        .map_err(|err| anyhow!("failed to retrieve public key: {err:?}"))?
+                        .node_signing_public_key
+                        .context("missing node public key")
+                }
+            })
+            .await??;
+
+            let nid = derive_node_id(&pk).expect("failed to derive node id");
+
+            // Custom Signer
+            let s = Sender::Node {
+                pub_key: pk.key_value,
+                sign: Arc::new(move |msg: &MessageId| {
+                    #[allow(clippy::disallowed_methods)]
+                    let sig = tokio::task::block_in_place(|| {
+                        c.sign_basic(
+                            msg,                                  // message
+                            nid,                                  // signer
+                            registry_client.get_latest_version(), // registry_version
+                        )
+                        .map(|value| value.get().0)
+                        .map_err(|err| anyhow!("failed to sign message: {err:?}"))
+                    })?;
+
+                    Ok(sig)
+                }),
+            };
+
+            // Agent
+            let (proto, port) = [
+                // HTTP
+                cli.listen.listen_http_port.map(|p| ("http", p)),
+                // HTTPS
+                #[cfg(feature = "tls")]
+                cli.listen.listen_https_port.map(|p| ("https", p)),
+            ]
+            .into_iter()
+            // Choose first non-none option
+            .flatten()
+            .next()
+            .ok_or(anyhow!("missing http and https listen ports"))?;
+
+            let ag = Agent::new(
+                format!("{proto}://localhost:{port}").parse()?, // url
+                s,                                              // sender
+            );
+
+            // Canister
+            let c = AnonymizationCanister::new(
+                ag,                    // agent
+                log_anonymization_cid, // canister_id
+            );
+
+            // Rng
+            let rng = Box::new(OsRng);
+
+            // Tracker
+            let tracker = AnonymizationTracker::new(rng, c.into())?;
+
+            Some(tracker)
+        }
+        _ => None,
+    };
+
     TokioScope::scope_and_block(move |s| {
         if let Some(v) = registry_replicator {
             s.spawn(async move {
@@ -358,6 +506,16 @@ pub async fn main(cli: Cli) -> Result<(), Error> {
             });
         }
 
+        // Anonymization Tracker
+        if let Some(mut t) = tracker {
+            s.spawn(async move {
+                t.track(|value| {
+                    anonymization_salt.store(Some(Arc::new(value)));
+                })
+                .await
+            });
+        }
+
         // HTTP servers
         s.spawn(async move {
             metrics_server
@@ -414,25 +572,13 @@ struct RegistrySetupResult(
 // Sets up registry-related stuff
 fn setup_registry(
     cli: &Cli,
+    local_store: Arc<dyn LocalStore>,
+    registry_client: Arc<dyn RegistryClient>,
     registry_snapshot: Arc<ArcSwapOption<RegistrySnapshot>>,
     persister: WithMetricsPersist<Persister>,
     http_client_check: Arc<dyn http::Client>,
     metrics_registry: &Registry,
 ) -> Result<RegistrySetupResult, Error> {
-    // Registry Client
-    let local_store = Arc::new(LocalStoreImpl::new(
-        cli.registry.registry_local_store_path.clone().unwrap(),
-    ));
-
-    let registry_client = Arc::new(RegistryClientImpl::new(
-        local_store.clone(), // data_provider
-        None,                // metrics_registry
-    ));
-
-    registry_client
-        .fetch_and_start_polling()
-        .context("failed to start registry client")?;
-
     // Snapshots
     let (channel_snapshot_send, channel_snapshot_recv) = tokio::sync::watch::channel(None);
     let snapshot_runner = WithMetricsSnapshot(
@@ -661,6 +807,7 @@ pub fn setup_router(
     cli: &Cli,
     metrics_registry: &Registry,
     cache: Option<Arc<Cache>>,
+    anonymization_salt: Arc<ArcSwapOption<Vec<u8>>>,
 ) -> Router {
     let proxy_router = ProxyRouter::new(
         http_client.clone(),
@@ -735,6 +882,7 @@ pub fn setup_router(
                 metrics_registry,
                 "http_request",
                 cli.obs.obs_log_failed_requests_only,
+                anonymization_salt,
             ),
             metrics::metrics_middleware,
         ),
diff --git a/rs/boundary_node/ic_boundary/src/metrics.rs b/rs/boundary_node/ic_boundary/src/metrics.rs
index 8a499aef57d..38ff6ad18ff 100644
--- a/rs/boundary_node/ic_boundary/src/metrics.rs
+++ b/rs/boundary_node/ic_boundary/src/metrics.rs
@@ -1,6 +1,10 @@
 #![allow(clippy::disallowed_types)]
 
-use std::{sync::Arc, time::Instant};
+use std::{
+    hash::{DefaultHasher, Hash, Hasher},
+    sync::Arc,
+    time::Instant,
+};
 
 use anyhow::Error;
 use arc_swap::ArcSwapOption;
@@ -356,10 +360,16 @@ pub struct HttpMetricParams {
     pub durationer: HistogramVec,
     pub request_sizer: HistogramVec,
     pub response_sizer: HistogramVec,
+    pub anonymization_salt: Arc<ArcSwapOption<Vec<u8>>>,
 }
 
 impl HttpMetricParams {
-    pub fn new(registry: &Registry, action: &str, log_failed_requests_only: bool) -> Self {
+    pub fn new(
+        registry: &Registry,
+        action: &str,
+        log_failed_requests_only: bool,
+        anonymization_salt: Arc<ArcSwapOption<Vec<u8>>>,
+    ) -> Self {
         const LABELS_HTTP: &[&str] = &[
             "request_type",
             "status_code",
@@ -408,6 +418,8 @@ impl HttpMetricParams {
                 registry
             )
             .unwrap(),
+
+            anonymization_salt,
         }
     }
 }
@@ -492,6 +504,12 @@ pub async fn metrics_middleware(
         .map(|x| x.remote_addr.family())
         .unwrap_or("0");
 
+    let remote_addr = request
+        .extensions()
+        .get::<Arc<ConnInfo>>()
+        .map(|x| x.remote_addr.ip().to_canonical().to_string())
+        .unwrap_or_default();
+
     let request_type = &request
         .extensions()
         .get::<RequestType>()
@@ -561,6 +579,7 @@ pub async fn metrics_middleware(
         durationer,
         request_sizer,
         response_sizer,
+        anonymization_salt,
     } = metric_params;
 
     let (parts, body) = response.into_parts();
@@ -623,6 +642,25 @@ pub async fn metrics_middleware(
             .with_label_values(labels)
             .observe(response_size as f64);
 
+        // Anonymization
+        let s = anonymization_salt.load();
+
+        let hash_fn = |v: &str| -> String {
+            if s.is_none() {
+                return "N/A".to_string();
+            }
+
+            let mut h = DefaultHasher::new();
+            v.hash(&mut h);
+            s.hash(&mut h);
+
+            format!("{:x}", h.finish())
+        };
+
+        let remote_addr = hash_fn(&remote_addr);
+        let sender = hash_fn(&sender.unwrap_or_default());
+
+        // Log
         if !log_failed_requests_only || failed {
             info!(
                 action,
@@ -638,6 +676,7 @@ pub async fn metrics_middleware(
                 canister_id_actual = canister_id_actual.map(|x| x.to_string()),
                 canister_id_cbor = ctx.canister_id.map(|x| x.to_string()),
                 sender,
+                remote_addr,
                 method = ctx.method_name,
                 duration = proc_duration,
                 duration_full = full_duration,
diff --git a/rs/boundary_node/ic_boundary/src/test_utils.rs b/rs/boundary_node/ic_boundary/src/test_utils.rs
index b87f72bb912..b984b56f710 100644
--- a/rs/boundary_node/ic_boundary/src/test_utils.rs
+++ b/rs/boundary_node/ic_boundary/src/test_utils.rs
@@ -315,6 +315,8 @@ pub fn setup_test_router(
     let subnets = registry_snapshot.load_full().unwrap().subnets.clone();
     persister.persist(subnets.clone());
 
+    let salt: Arc<ArcSwapOption<Vec<u8>>> = Arc::new(ArcSwapOption::empty());
+
     let router = setup_router(
         registry_snapshot,
         routing_table,
@@ -326,6 +328,7 @@ pub fn setup_test_router(
         enable_cache.then_some(Arc::new(
             Cache::new(10485760, 262144, Duration::from_secs(1), false).unwrap(),
         )),
+        salt,
     );
 
     let router = router.layer(axum::middleware::from_fn(add_conninfo));
diff --git a/rs/canister_client/BUILD.bazel b/rs/canister_client/BUILD.bazel
index 7f200a2c24a..85ddd2fce44 100644
--- a/rs/canister_client/BUILD.bazel
+++ b/rs/canister_client/BUILD.bazel
@@ -2,6 +2,8 @@ load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test")
 
 # The package is deprecated, NET-1274.
 package(default_visibility = [
+    "//rs/boundary_node/anonymization/client:__pkg__",
+    "//rs/boundary_node/ic_boundary:__pkg__",
     "//rs/cup_explorer:__pkg__",
     "//rs/http_endpoints/public:__pkg__",
     "//rs/nns/init:__pkg__",
@@ -9,7 +11,6 @@ package(default_visibility = [
     "//rs/registry/admin:__pkg__",
     "//rs/registry/nns_data_provider:__pkg__",
     "//rs/replay:__pkg__",
-    "//rs/rosetta-api:__subpackages__",
     "//rs/rust_canisters/canister_test:__pkg__",
     "//rs/tests:__subpackages__",
     "//rs/workload_generator:__pkg__",
@@ -17,6 +18,7 @@ package(default_visibility = [
 
 DEPENDENCIES = [
     # Keep sorted.
+    "//rs/canister_client/read_state_response_parser",
     "//rs/canister_client/sender",
     "//rs/canonical_state",
     "//rs/certification",
diff --git a/rs/canister_client/Cargo.toml b/rs/canister_client/Cargo.toml
index dc12b41729c..c285522c6d0 100644
--- a/rs/canister_client/Cargo.toml
+++ b/rs/canister_client/Cargo.toml
@@ -20,6 +20,7 @@ ic-crypto-secp256k1 = { path = "../crypto/secp256k1" }
 ic-crypto-tree-hash = { path = "../crypto/tree_hash" }
 ic-management-canister-types = { path = "../types/management_canister_types" }
 ic-protobuf = { path = "../protobuf" }
+ic-read-state-response-parser = { path = "./read_state_response_parser" }
 ic-types = { path = "../types/types" }
 itertools = { workspace = true }
 prost = { workspace = true }
diff --git a/rs/canister_client/read_state_response_parser/BUILD.bazel b/rs/canister_client/read_state_response_parser/BUILD.bazel
new file mode 100644
index 00000000000..70b27051fc2
--- /dev/null
+++ b/rs/canister_client/read_state_response_parser/BUILD.bazel
@@ -0,0 +1,32 @@
+load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test")
+
+package(default_visibility = ["//visibility:public"])
+
+DEPENDENCIES = [
+    # Keep sorted.
+    "//rs/canonical_state",
+    "//rs/certification",
+    "//rs/crypto/tree_hash",
+    "//rs/tree_deserializer",
+    "//rs/types/types",
+    "@crate_index//:serde",
+    "@crate_index//:serde_cbor",
+]
+
+DEV_DEPENDENCIES = [
+    # Keep sorted.
+    "//rs/certification/test-utils",
+]
+
+rust_library(
+    name = "read_state_response_parser",
+    srcs = glob(["src/**/*.rs"]),
+    crate_name = "ic_read_state_response_parser",
+    deps = DEPENDENCIES,
+)
+
+rust_test(
+    name = "tests",
+    crate = ":read_state_response_parser",
+    deps = DEV_DEPENDENCIES,
+)
diff --git a/rs/canister_client/read_state_response_parser/Cargo.toml b/rs/canister_client/read_state_response_parser/Cargo.toml
new file mode 100644
index 00000000000..d44e4b514d2
--- /dev/null
+++ b/rs/canister_client/read_state_response_parser/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "ic-read-state-response-parser"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+description.workspace = true
+documentation.workspace = true
+
+[dependencies]
+ic-canonical-state = { path = "../../canonical_state" }
+ic-certification = { path = "../../certification" }
+ic-crypto-tree-hash = { path = "../../crypto/tree_hash" }
+ic-types = { path = "../../types/types" }
+serde = { workspace = true }
+serde_cbor = { workspace = true }
+tree-deserializer = { path = "../../tree_deserializer" }
+
+[dev-dependencies]
+ic-certification-test-utils = { path = "../../certification/test-utils" }
+
diff --git a/rs/canister_client/read_state_response_parser/src/lib.rs b/rs/canister_client/read_state_response_parser/src/lib.rs
new file mode 100644
index 00000000000..f12c41ce6b0
--- /dev/null
+++ b/rs/canister_client/read_state_response_parser/src/lib.rs
@@ -0,0 +1,297 @@
+use ic_canonical_state::encoding::types::SubnetMetrics;
+use ic_crypto_tree_hash::{LabeledTree, LookupStatus, MixedHashTree};
+use ic_types::{
+    crypto::threshold_sig::ThresholdSigPublicKey,
+    messages::{HttpReadStateResponse, MessageId},
+    CanisterId, SubnetId,
+};
+use serde::Deserialize;
+use serde_cbor::value::Value as CBOR;
+use std::collections::BTreeMap;
+use std::convert::TryFrom;
+
+// An auxiliary structure that mirrors the request statuses
+// encoded in a certificate, starting from the root of the tree.
+#[derive(Debug, Deserialize)]
+struct RequestStatuses {
+    request_status: Option<BTreeMap<MessageId, RequestStatus>>,
+}
+
+#[derive(Eq, PartialEq, Debug, Deserialize)]
+pub struct RequestStatus {
+    pub status: String,
+    pub reply: Option<Vec<u8>>,
+    pub reject_message: Option<String>,
+}
+
+impl RequestStatus {
+    fn unknown() -> Self {
+        RequestStatus {
+            status: "unknown".to_string(),
+            reply: None,
+            reject_message: None,
+        }
+    }
+}
+
+/// Given a CBOR response from a `read_state` and a `request_id` extracts
+/// the `RequestStatus` if available.
+pub fn parse_read_state_response(
+    request_id: &MessageId,
+    effective_canister_id: &CanisterId,
+    root_pk: Option<&ThresholdSigPublicKey>,
+    message: CBOR,
+) -> Result<RequestStatus, String> {
+    let response = serde_cbor::value::from_value::<HttpReadStateResponse>(message)
+        .map_err(|source| format!("decoding to HttpReadStateResponse failed: {}", source))?;
+
+    let certificate = match root_pk {
+        Some(pk) => {
+            ic_certification::verify_certificate(&response.certificate, effective_canister_id, pk)
+                .map_err(|source| format!("verifying certificate failed: {}", source))?
+        }
+        None => serde_cbor::from_slice(response.certificate.as_slice())
+            .map_err(|source| format!("decoding Certificate failed: {}", source))?,
+    };
+
+    match certificate
+        .tree
+        .lookup(&[&b"request_status"[..], request_id.as_ref()])
+    {
+        LookupStatus::Found(_) => (),
+        // TODO(MR-249): return an error in the Unknown case once the replica
+        // implements absence proofs.
+        LookupStatus::Absent | LookupStatus::Unknown => return Ok(RequestStatus::unknown()),
+    }
+
+    // Parse the tree.
+    let tree = LabeledTree::try_from(certificate.tree)
+        .map_err(|e| format!("parsing tree in certificate failed: {:?}", e))?;
+
+    let request_statuses =
+        RequestStatuses::deserialize(tree_deserializer::LabeledTreeDeserializer::new(&tree))
+            .map_err(|err| format!("deserializing request statuses failed: {:?}", err))?;
+
+    Ok(match request_statuses.request_status {
+        Some(mut request_status_map) => request_status_map
+            .remove(request_id)
+            .unwrap_or_else(RequestStatus::unknown),
+        None => RequestStatus::unknown(),
+    })
+}
+
+/// Given a CBOR response from a subnet `read_state` and a `subnet_id` extracts
+/// the `SubnetMetrics` if available.
+pub fn parse_subnet_read_state_response(
+    subnet_id: &SubnetId,
+    root_pk: Option<&ThresholdSigPublicKey>,
+    message: CBOR,
+) -> Result<SubnetMetrics, String> {
+    let response = serde_cbor::value::from_value::<HttpReadStateResponse>(message)
+        .map_err(|source| format!("decoding to HttpReadStateResponse failed: {}", source))?;
+
+    let certificate = match root_pk {
+        Some(pk) => ic_certification::verify_certificate_for_subnet_read_state(
+            &response.certificate,
+            subnet_id,
+            pk,
+        )
+        .map_err(|source| format!("verifying certificate failed: {}", source))?,
+        None => serde_cbor::from_slice(response.certificate.as_slice())
+            .map_err(|source| format!("decoding Certificate failed: {}", source))?,
+    };
+
+    let subnet_metrics_leaf =
+        match certificate
+            .tree
+            .lookup(&[&b"subnet"[..], subnet_id.get().as_ref(), &b"metrics"[..]])
+        {
+            LookupStatus::Found(subnet_metrics_leaf) => subnet_metrics_leaf.clone(),
+            LookupStatus::Absent | LookupStatus::Unknown => return Ok(SubnetMetrics::default()),
+        };
+
+    match subnet_metrics_leaf {
+        MixedHashTree::Leaf(bytes) => {
+            let subnet_metrics: SubnetMetrics = serde_cbor::from_slice(&bytes)
+                .map_err(|err| format!("deserializing subnet_metrics failed: {:?}", err))?;
+            Ok(subnet_metrics)
+        }
+        tree => Err(format!("Expected subnet metrics leaf but found {:?}", tree)),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use ic_certification_test_utils::CertificateBuilder;
+    use ic_certification_test_utils::CertificateData;
+    use ic_crypto_tree_hash::Digest;
+    use ic_crypto_tree_hash::Label;
+    use ic_types::messages::Blob;
+    use ic_types::CanisterId;
+    use serde::Serialize;
+
+    fn to_self_describing_cbor<T: Serialize>(e: &T) -> serde_cbor::Result<Vec<u8>> {
+        let mut serialized_bytes = Vec::new();
+        let mut serializer = serde_cbor::Serializer::new(&mut serialized_bytes);
+        serializer.self_describe()?;
+        e.serialize(&mut serializer)?;
+        Ok(serialized_bytes)
+    }
+
+    #[test]
+    fn test_parse_read_state_response_unknown() {
+        let labeled_tree = LabeledTree::try_from(MixedHashTree::Labeled(
+            "time".into(),
+            Box::new(MixedHashTree::Leaf(vec![1])),
+        ))
+        .unwrap();
+        let data = CertificateData::CustomTree(labeled_tree);
+        let (certificate, root_pk, _) = CertificateBuilder::new(data).build();
+
+        let certificate_cbor: Vec<u8> = to_self_describing_cbor(&certificate).unwrap();
+
+        let response = HttpReadStateResponse {
+            certificate: Blob(certificate_cbor),
+        };
+
+        let response_cbor: Vec<u8> = to_self_describing_cbor(&response).unwrap();
+
+        let response: CBOR = serde_cbor::from_slice(response_cbor.as_slice()).unwrap();
+
+        let request_id: MessageId = MessageId::from([0; 32]);
+        assert_eq!(
+            parse_read_state_response(&request_id, &CanisterId::from(1), Some(&root_pk), response),
+            Ok(RequestStatus::unknown())
+        );
+    }
+
+    #[test]
+    fn test_parse_read_state_response_replied() {
+        let tree = MixedHashTree::Fork(Box::new((
+            MixedHashTree::Labeled(
+                "request_status".into(),
+                Box::new(MixedHashTree::Labeled(
+                    vec![
+                        184, 255, 145, 192, 128, 156, 132, 76, 67, 213, 87, 237, 189, 136, 206,
+                        184, 254, 192, 233, 210, 142, 173, 27, 123, 112, 187, 82, 222, 130, 129,
+                        245, 41,
+                    ]
+                    .into(),
+                    Box::new(MixedHashTree::Fork(Box::new((
+                        MixedHashTree::Labeled(
+                            "reply".into(),
+                            Box::new(MixedHashTree::Leaf(vec![68, 73, 68, 76, 0, 0])),
+                        ),
+                        MixedHashTree::Labeled(
+                            "status".into(),
+                            Box::new(MixedHashTree::Leaf(b"replied".to_vec())),
+                        ),
+                    )))),
+                )),
+            ),
+            MixedHashTree::Labeled("time".into(), Box::new(MixedHashTree::Leaf(vec![1]))),
+        )));
+        let labeled_tree = LabeledTree::try_from(tree).unwrap();
+        let data = CertificateData::CustomTree(labeled_tree);
+        let (certificate, root_pk, _) = CertificateBuilder::new(data).build();
+
+        let certificate_cbor: Vec<u8> = to_self_describing_cbor(&certificate).unwrap();
+
+        let response = HttpReadStateResponse {
+            certificate: Blob(certificate_cbor),
+        };
+
+        let response_cbor: Vec<u8> = to_self_describing_cbor(&response).unwrap();
+
+        let response: CBOR = serde_cbor::from_slice(response_cbor.as_slice()).unwrap();
+
+        // Request ID that exists.
+        let request_id: MessageId = MessageId::from([
+            184, 255, 145, 192, 128, 156, 132, 76, 67, 213, 87, 237, 189, 136, 206, 184, 254, 192,
+            233, 210, 142, 173, 27, 123, 112, 187, 82, 222, 130, 129, 245, 41,
+        ]);
+
+        assert_eq!(
+            parse_read_state_response(
+                &request_id,
+                &CanisterId::from(1),
+                Some(&root_pk),
+                response.clone()
+            ),
+            Ok(RequestStatus {
+                status: "replied".to_string(),
+                reply: Some(vec![68, 73, 68, 76, 0, 0]),
+                reject_message: None
+            }),
+        );
+
+        // Request ID that doesn't exist.
+        let request_id: MessageId = MessageId::from([0; 32]);
+        assert_eq!(
+            parse_read_state_response(&request_id, &CanisterId::from(1), Some(&root_pk), response),
+            Ok(RequestStatus::unknown())
+        );
+    }
+
+    #[test]
+    fn test_parse_read_state_response_pruned() {
+        fn mklabeled(l: impl Into<Label>, t: MixedHashTree) -> MixedHashTree {
+            MixedHashTree::Labeled(l.into(), Box::new(t))
+        }
+
+        fn mkfork(l: MixedHashTree, r: MixedHashTree) -> MixedHashTree {
+            MixedHashTree::Fork(Box::new((l, r)))
+        }
+
+        let tree = mkfork(
+            mklabeled(
+                "request_status",
+                mkfork(
+                    mklabeled(
+                        vec![
+                            184, 255, 145, 192, 128, 156, 132, 76, 67, 213, 87, 237, 189, 136, 206,
+                            184, 254, 192, 233, 210, 142, 173, 27, 123, 112, 187, 82, 222, 130,
+                            129, 245, 40,
+                        ],
+                        MixedHashTree::Pruned(Digest([0; 32])),
+                    ),
+                    mklabeled(
+                        vec![
+                            184, 255, 145, 192, 128, 156, 132, 76, 67, 213, 87, 237, 189, 136, 206,
+                            184, 254, 192, 233, 210, 142, 173, 27, 123, 112, 187, 82, 222, 130,
+                            129, 245, 42,
+                        ],
+                        MixedHashTree::Pruned(Digest([0; 32])),
+                    ),
+                ),
+            ),
+            mklabeled("time", MixedHashTree::Leaf(vec![1])),
+        );
+
+        let labeled_tree = LabeledTree::try_from(tree).unwrap();
+        let data = CertificateData::CustomTree(labeled_tree);
+        let (certificate, root_pk, _) = CertificateBuilder::new(data).build();
+
+        let certificate_cbor: Vec<u8> = to_self_describing_cbor(&certificate).unwrap();
+
+        let response = HttpReadStateResponse {
+            certificate: Blob(certificate_cbor),
+        };
+
+        let response_cbor: Vec<u8> = to_self_describing_cbor(&response).unwrap();
+
+        let response: CBOR = serde_cbor::from_slice(response_cbor.as_slice()).unwrap();
+
+        // Request ID that is between two pruned labels.
+        let request_id: MessageId = MessageId::from([
+            184, 255, 145, 192, 128, 156, 132, 76, 67, 213, 87, 237, 189, 136, 206, 184, 254, 192,
+            233, 210, 142, 173, 27, 123, 112, 187, 82, 222, 130, 129, 245, 41,
+        ]);
+
+        assert_eq!(
+            parse_read_state_response(&request_id, &CanisterId::from(1), Some(&root_pk), response),
+            Ok(RequestStatus::unknown())
+        );
+    }
+}
diff --git a/rs/canister_client/src/agent.rs b/rs/canister_client/src/agent.rs
index b46e57f839a..09514bdcf08 100644
--- a/rs/canister_client/src/agent.rs
+++ b/rs/canister_client/src/agent.rs
@@ -1,9 +1,6 @@
 //! An agent to talk to the Internet Computer through the public endpoints.
 use crate::{
-    cbor::{
-        parse_query_response, parse_read_state_response, prepare_query, prepare_read_state,
-        prepare_update, RequestStatus,
-    },
+    cbor::{parse_query_response, prepare_query, prepare_read_state, prepare_update},
     http_client::{HttpClient, HttpClientConfig},
 };
 use backoff::backoff::Backoff;
@@ -11,6 +8,7 @@ use ic_canister_client_sender::Sender;
 use ic_crypto_tree_hash::Path;
 use ic_management_canister_types::{InstallCodeArgs, Method, Payload, IC_00};
 use ic_protobuf::types::v1 as pb;
+use ic_read_state_response_parser::{parse_read_state_response, RequestStatus};
 use ic_types::{
     consensus::catchup::CatchUpPackageParam,
     crypto::threshold_sig::ThresholdSigPublicKey,
diff --git a/rs/canister_client/src/cbor.rs b/rs/canister_client/src/cbor.rs
index 6d8f22bde29..e21b19332cf 100644
--- a/rs/canister_client/src/cbor.rs
+++ b/rs/canister_client/src/cbor.rs
@@ -1,132 +1,18 @@
 use ic_canister_client_sender::Sender;
-use ic_canonical_state::encoding::types::SubnetMetrics;
-use ic_crypto_tree_hash::{LabeledTree, LookupStatus, MixedHashTree, Path};
+use ic_crypto_tree_hash::Path;
+use ic_read_state_response_parser::RequestStatus;
 use ic_types::{
-    crypto::threshold_sig::ThresholdSigPublicKey,
     messages::{
         Blob, HttpCallContent, HttpCanisterUpdate, HttpQueryContent, HttpReadState,
-        HttpReadStateContent, HttpReadStateResponse, HttpRequestEnvelope, HttpUserQuery, MessageId,
-        SignedRequestBytes,
+        HttpReadStateContent, HttpRequestEnvelope, HttpUserQuery, MessageId, SignedRequestBytes,
     },
     time::expiry_time_from_now,
-    CanisterId, SubnetId, Time,
+    CanisterId, Time,
 };
-use serde::Deserialize;
 use serde_cbor::value::Value as CBOR;
-use std::collections::BTreeMap;
 use std::convert::TryFrom;
 use std::error::Error;
 
-// An auxiliary structure that mirrors the request statuses
-// encoded in a certificate, starting from the root of the tree.
-#[derive(Debug, Deserialize)]
-struct RequestStatuses {
-    request_status: Option<BTreeMap<MessageId, RequestStatus>>,
-}
-
-#[derive(Eq, PartialEq, Debug, Deserialize)]
-pub struct RequestStatus {
-    pub status: String,
-    pub reply: Option<Vec<u8>>,
-    pub reject_message: Option<String>,
-}
-
-impl RequestStatus {
-    fn unknown() -> Self {
-        RequestStatus {
-            status: "unknown".to_string(),
-            reply: None,
-            reject_message: None,
-        }
-    }
-}
-
-/// Given a CBOR response from a `read_state` and a `request_id` extracts
-/// the `RequestStatus` if available.
-pub fn parse_read_state_response(
-    request_id: &MessageId,
-    effective_canister_id: &CanisterId,
-    root_pk: Option<&ThresholdSigPublicKey>,
-    message: CBOR,
-) -> Result<RequestStatus, String> {
-    let response = serde_cbor::value::from_value::<HttpReadStateResponse>(message)
-        .map_err(|source| format!("decoding to HttpReadStateResponse failed: {}", source))?;
-
-    let certificate = match root_pk {
-        Some(pk) => {
-            ic_certification::verify_certificate(&response.certificate, effective_canister_id, pk)
-                .map_err(|source| format!("verifying certificate failed: {}", source))?
-        }
-        None => serde_cbor::from_slice(response.certificate.as_slice())
-            .map_err(|source| format!("decoding Certificate failed: {}", source))?,
-    };
-
-    match certificate
-        .tree
-        .lookup(&[&b"request_status"[..], request_id.as_ref()])
-    {
-        LookupStatus::Found(_) => (),
-        // TODO(MR-249): return an error in the Unknown case once the replica
-        // implements absence proofs.
-        LookupStatus::Absent | LookupStatus::Unknown => return Ok(RequestStatus::unknown()),
-    }
-
-    // Parse the tree.
-    let tree = LabeledTree::try_from(certificate.tree)
-        .map_err(|e| format!("parsing tree in certificate failed: {:?}", e))?;
-
-    let request_statuses =
-        RequestStatuses::deserialize(tree_deserializer::LabeledTreeDeserializer::new(&tree))
-            .map_err(|err| format!("deserializing request statuses failed: {:?}", err))?;
-
-    Ok(match request_statuses.request_status {
-        Some(mut request_status_map) => request_status_map
-            .remove(request_id)
-            .unwrap_or_else(RequestStatus::unknown),
-        None => RequestStatus::unknown(),
-    })
-}
-
-/// Given a CBOR response from a subnet `read_state` and a `subnet_id` extracts
-/// the `SubnetMetrics` if available.
-pub fn parse_subnet_read_state_response(
-    subnet_id: &SubnetId,
-    root_pk: Option<&ThresholdSigPublicKey>,
-    message: CBOR,
-) -> Result<SubnetMetrics, String> {
-    let response = serde_cbor::value::from_value::<HttpReadStateResponse>(message)
-        .map_err(|source| format!("decoding to HttpReadStateResponse failed: {}", source))?;
-
-    let certificate = match root_pk {
-        Some(pk) => ic_certification::verify_certificate_for_subnet_read_state(
-            &response.certificate,
-            subnet_id,
-            pk,
-        )
-        .map_err(|source| format!("verifying certificate failed: {}", source))?,
-        None => serde_cbor::from_slice(response.certificate.as_slice())
-            .map_err(|source| format!("decoding Certificate failed: {}", source))?,
-    };
-
-    let subnet_metrics_leaf =
-        match certificate
-            .tree
-            .lookup(&[&b"subnet"[..], subnet_id.get().as_ref(), &b"metrics"[..]])
-        {
-            LookupStatus::Found(subnet_metrics_leaf) => subnet_metrics_leaf.clone(),
-            LookupStatus::Absent | LookupStatus::Unknown => return Ok(SubnetMetrics::default()),
-        };
-
-    match subnet_metrics_leaf {
-        MixedHashTree::Leaf(bytes) => {
-            let subnet_metrics: SubnetMetrics = serde_cbor::from_slice(&bytes)
-                .map_err(|err| format!("deserializing subnet_metrics failed: {:?}", err))?;
-            Ok(subnet_metrics)
-        }
-        tree => Err(format!("Expected subnet metrics leaf but found {:?}", tree)),
-    }
-}
-
 /// Given a CBOR response from a `query`, extract the response.
 pub fn parse_query_response(message: &CBOR) -> Result<RequestStatus, String> {
     let content = match message {
@@ -334,21 +220,16 @@ fn sign_query(
 mod tests {
     use super::*;
     use ic_canister_client_sender::{ed25519_public_key_to_der, Ed25519KeyPair};
-    use ic_certification_test_utils::{CertificateBuilder, CertificateData};
     use ic_crypto_test_utils_root_of_trust::MockRootOfTrustProvider;
-    use ic_crypto_tree_hash::{Digest, Label, MixedHashTree};
     use ic_test_utilities::crypto::temp_crypto_component_with_fake_registry;
     use ic_test_utilities_types::ids::node_test_id;
-    use ic_types::messages::{
-        HttpCanisterUpdate, HttpReadStateResponse, HttpRequest, HttpUserQuery, Query,
-    };
+    use ic_types::messages::{HttpCanisterUpdate, HttpRequest, HttpUserQuery, Query};
     use ic_types::time::current_time;
     use ic_types::{PrincipalId, UserId};
     use ic_validator::HttpRequestVerifier;
     use ic_validator::HttpRequestVerifierImpl;
     use rand::SeedableRng;
     use rand_chacha::ChaChaRng;
-    use serde::Serialize;
     use std::convert::TryFrom;
     use std::sync::Arc;
     use std::time::Duration;
@@ -569,170 +450,6 @@ mod tests {
         ));
     }
 
-    fn to_self_describing_cbor<T: Serialize>(e: &T) -> serde_cbor::Result<Vec<u8>> {
-        let mut serialized_bytes = Vec::new();
-        let mut serializer = serde_cbor::Serializer::new(&mut serialized_bytes);
-        serializer.self_describe()?;
-        e.serialize(&mut serializer)?;
-        Ok(serialized_bytes)
-    }
-
-    #[test]
-    fn test_parse_read_state_response_unknown() {
-        let labeled_tree = LabeledTree::try_from(MixedHashTree::Labeled(
-            "time".into(),
-            Box::new(MixedHashTree::Leaf(vec![1])),
-        ))
-        .unwrap();
-        let data = CertificateData::CustomTree(labeled_tree);
-        let (certificate, root_pk, _) = CertificateBuilder::new(data).build();
-
-        let certificate_cbor: Vec<u8> = to_self_describing_cbor(&certificate).unwrap();
-
-        let response = HttpReadStateResponse {
-            certificate: Blob(certificate_cbor),
-        };
-
-        let response_cbor: Vec<u8> = to_self_describing_cbor(&response).unwrap();
-
-        let response: CBOR = serde_cbor::from_slice(response_cbor.as_slice()).unwrap();
-
-        let request_id: MessageId = MessageId::from([0; 32]);
-        assert_eq!(
-            parse_read_state_response(&request_id, &CanisterId::from(1), Some(&root_pk), response),
-            Ok(RequestStatus::unknown())
-        );
-    }
-
-    #[test]
-    fn test_parse_read_state_response_replied() {
-        let tree = MixedHashTree::Fork(Box::new((
-            MixedHashTree::Labeled(
-                "request_status".into(),
-                Box::new(MixedHashTree::Labeled(
-                    vec![
-                        184, 255, 145, 192, 128, 156, 132, 76, 67, 213, 87, 237, 189, 136, 206,
-                        184, 254, 192, 233, 210, 142, 173, 27, 123, 112, 187, 82, 222, 130, 129,
-                        245, 41,
-                    ]
-                    .into(),
-                    Box::new(MixedHashTree::Fork(Box::new((
-                        MixedHashTree::Labeled(
-                            "reply".into(),
-                            Box::new(MixedHashTree::Leaf(vec![68, 73, 68, 76, 0, 0])),
-                        ),
-                        MixedHashTree::Labeled(
-                            "status".into(),
-                            Box::new(MixedHashTree::Leaf(b"replied".to_vec())),
-                        ),
-                    )))),
-                )),
-            ),
-            MixedHashTree::Labeled("time".into(), Box::new(MixedHashTree::Leaf(vec![1]))),
-        )));
-        let labeled_tree = LabeledTree::try_from(tree).unwrap();
-        let data = CertificateData::CustomTree(labeled_tree);
-        let (certificate, root_pk, _) = CertificateBuilder::new(data).build();
-
-        let certificate_cbor: Vec<u8> = to_self_describing_cbor(&certificate).unwrap();
-
-        let response = HttpReadStateResponse {
-            certificate: Blob(certificate_cbor),
-        };
-
-        let response_cbor: Vec<u8> = to_self_describing_cbor(&response).unwrap();
-
-        let response: CBOR = serde_cbor::from_slice(response_cbor.as_slice()).unwrap();
-
-        // Request ID that exists.
-        let request_id: MessageId = MessageId::from([
-            184, 255, 145, 192, 128, 156, 132, 76, 67, 213, 87, 237, 189, 136, 206, 184, 254, 192,
-            233, 210, 142, 173, 27, 123, 112, 187, 82, 222, 130, 129, 245, 41,
-        ]);
-
-        assert_eq!(
-            parse_read_state_response(
-                &request_id,
-                &CanisterId::from(1),
-                Some(&root_pk),
-                response.clone()
-            ),
-            Ok(RequestStatus {
-                status: "replied".to_string(),
-                reply: Some(vec![68, 73, 68, 76, 0, 0]),
-                reject_message: None
-            }),
-        );
-
-        // Request ID that doesn't exist.
-        let request_id: MessageId = MessageId::from([0; 32]);
-        assert_eq!(
-            parse_read_state_response(&request_id, &CanisterId::from(1), Some(&root_pk), response),
-            Ok(RequestStatus::unknown())
-        );
-    }
-
-    #[test]
-    fn test_parse_read_state_response_pruned() {
-        fn mklabeled(l: impl Into<Label>, t: MixedHashTree) -> MixedHashTree {
-            MixedHashTree::Labeled(l.into(), Box::new(t))
-        }
-
-        fn mkfork(l: MixedHashTree, r: MixedHashTree) -> MixedHashTree {
-            MixedHashTree::Fork(Box::new((l, r)))
-        }
-
-        let tree = mkfork(
-            mklabeled(
-                "request_status",
-                mkfork(
-                    mklabeled(
-                        vec![
-                            184, 255, 145, 192, 128, 156, 132, 76, 67, 213, 87, 237, 189, 136, 206,
-                            184, 254, 192, 233, 210, 142, 173, 27, 123, 112, 187, 82, 222, 130,
-                            129, 245, 40,
-                        ],
-                        MixedHashTree::Pruned(Digest([0; 32])),
-                    ),
-                    mklabeled(
-                        vec![
-                            184, 255, 145, 192, 128, 156, 132, 76, 67, 213, 87, 237, 189, 136, 206,
-                            184, 254, 192, 233, 210, 142, 173, 27, 123, 112, 187, 82, 222, 130,
-                            129, 245, 42,
-                        ],
-                        MixedHashTree::Pruned(Digest([0; 32])),
-                    ),
-                ),
-            ),
-            mklabeled("time", MixedHashTree::Leaf(vec![1])),
-        );
-
-        let labeled_tree = LabeledTree::try_from(tree).unwrap();
-        let data = CertificateData::CustomTree(labeled_tree);
-        let (certificate, root_pk, _) = CertificateBuilder::new(data).build();
-
-        let certificate_cbor: Vec<u8> = to_self_describing_cbor(&certificate).unwrap();
-
-        let response = HttpReadStateResponse {
-            certificate: Blob(certificate_cbor),
-        };
-
-        let response_cbor: Vec<u8> = to_self_describing_cbor(&response).unwrap();
-
-        let response: CBOR = serde_cbor::from_slice(response_cbor.as_slice()).unwrap();
-
-        // Request ID that is between two pruned labels.
-        let request_id: MessageId = MessageId::from([
-            184, 255, 145, 192, 128, 156, 132, 76, 67, 213, 87, 237, 189, 136, 206, 184, 254, 192,
-            233, 210, 142, 173, 27, 123, 112, 187, 82, 222, 130, 129, 245, 41,
-        ]);
-
-        assert_eq!(
-            parse_read_state_response(&request_id, &CanisterId::from(1), Some(&root_pk), response),
-            Ok(RequestStatus::unknown())
-        );
-    }
-
     fn request_validator() -> HttpRequestVerifierImpl {
         HttpRequestVerifierImpl::new(Arc::new(temp_crypto_component_with_fake_registry(
             node_test_id(VALIDATOR_NODE_ID),
diff --git a/rs/canister_client/src/lib.rs b/rs/canister_client/src/lib.rs
index 0627cdeb07d..c95fe8fcd51 100644
--- a/rs/canister_client/src/lib.rs
+++ b/rs/canister_client/src/lib.rs
@@ -7,8 +7,6 @@ pub use agent::{query_path, read_state_path, update_path, Agent};
 /// Exported functions from the 'cbor' module contain lower level
 /// parsing and conversion utilities. Ideally users of this crate should
 /// mainly use the 'Agent'.
-pub use cbor::{
-    parse_read_state_response, parse_subnet_read_state_response, prepare_read_state, prepare_update,
-};
+pub use cbor::{prepare_read_state, prepare_update};
 pub use http_client::{HttpClient, HttpClientConfig};
 pub use ic_canister_client_sender::{Ed25519KeyPair, Sender};
diff --git a/rs/consensus/src/consensus/batch_delivery.rs b/rs/consensus/src/consensus/batch_delivery.rs
index 8448e8dfe7f..def870cdf2e 100644
--- a/rs/consensus/src/consensus/batch_delivery.rs
+++ b/rs/consensus/src/consensus/batch_delivery.rs
@@ -135,7 +135,8 @@ pub fn deliver_batches(
 
         let randomness = Randomness::from(crypto_hashable_to_seed(&tape));
 
-        let idkg_subnet_public_keys = match get_idkg_subnet_public_keys(&block, pool, log) {
+        // TODO(CON-1419): Add vetKD keys to this map as well
+        let chain_key_subnet_public_keys = match get_idkg_subnet_public_keys(&block, pool, log) {
             Ok(keys) => keys,
             Err(e) => {
                 // Do not deliver batch if we can't find a previous summary block,
@@ -227,7 +228,7 @@ pub fn deliver_batches(
             requires_full_state_hash,
             messages: batch_messages,
             randomness,
-            idkg_subnet_public_keys,
+            chain_key_subnet_public_keys,
             idkg_pre_signature_ids: get_pre_signature_ids_to_deliver(&block),
             registry_version: block.context.registry_version,
             time: block.context.time,
diff --git a/rs/consensus/src/idkg/signer.rs b/rs/consensus/src/idkg/signer.rs
index 2dbe5c4009b..c3b5cccad90 100644
--- a/rs/consensus/src/idkg/signer.rs
+++ b/rs/consensus/src/idkg/signer.rs
@@ -2070,6 +2070,7 @@ mod tests {
                     args: ThresholdArguments::Schnorr(SchnorrArguments {
                         key_id: fake_schnorr_key_id(schnorr_algorithm(algorithm)),
                         message: Arc::new(message.clone()),
+                        taproot_tree_root: None,
                     }),
                     pseudo_random_id: [1; 32],
                     derivation_path: vec![],
diff --git a/rs/consensus/src/idkg/test_utils.rs b/rs/consensus/src/idkg/test_utils.rs
index 24d6fe29af6..2bcf05e6e00 100644
--- a/rs/consensus/src/idkg/test_utils.rs
+++ b/rs/consensus/src/idkg/test_utils.rs
@@ -102,6 +102,7 @@ fn fake_signature_request_args(key_id: MasterPublicKeyId) -> ThresholdArguments
         MasterPublicKeyId::Schnorr(key_id) => ThresholdArguments::Schnorr(SchnorrArguments {
             key_id,
             message: Arc::new(vec![1; 48]),
+            taproot_tree_root: None,
         }),
         MasterPublicKeyId::VetKd(key_id) => ThresholdArguments::VetKd(VetKdArguments {
             key_id: key_id.clone(),
@@ -336,6 +337,7 @@ impl From<&ThresholdSchnorrSigInputs> for TestSigInputs {
                 .unwrap(),
                 key_unmasked_ref: UnmaskedTranscript::try_from((height, key)).unwrap(),
             },
+            taproot_tree_root: None,
         };
         TestSigInputs {
             idkg_transcripts,
@@ -1327,6 +1329,7 @@ pub(crate) fn create_schnorr_sig_inputs_with_args(
         Arc::new(vec![0; 128]),
         Randomness::from([0_u8; 32]),
         presig_transcript_ref,
+        None,
     );
 
     TestSigInputs {
diff --git a/rs/consensus/src/idkg/utils.rs b/rs/consensus/src/idkg/utils.rs
index 3fee39639e5..e734f1902c0 100644
--- a/rs/consensus/src/idkg/utils.rs
+++ b/rs/consensus/src/idkg/utils.rs
@@ -288,6 +288,7 @@ pub(super) fn build_signature_inputs(
                 args.message.clone(),
                 nonce,
                 pre_sig,
+                args.taproot_tree_root.clone(),
             ))
         }
         (PreSignatureRef::Ecdsa(_), _) => {
diff --git a/rs/consensus/tests/integration.rs b/rs/consensus/tests/integration.rs
index cb80f6c0a50..cb6c2e00887 100644
--- a/rs/consensus/tests/integration.rs
+++ b/rs/consensus/tests/integration.rs
@@ -331,7 +331,7 @@ fn run_n_rounds_and_check_pubkeys(
 
         let mut found_keys = 0;
         for key_id in test_threshold_key_ids() {
-            if batch.idkg_subnet_public_keys.contains_key(&key_id) {
+            if batch.chain_key_subnet_public_keys.contains_key(&key_id) {
                 found_keys += 1
             }
         }
diff --git a/rs/consensus/utils/src/lib.rs b/rs/consensus/utils/src/lib.rs
index ab1a2f53f14..a8a726131d7 100644
--- a/rs/consensus/utils/src/lib.rs
+++ b/rs/consensus/utils/src/lib.rs
@@ -616,6 +616,7 @@ mod tests {
                     ThresholdArguments::Schnorr(SchnorrArguments {
                         message: Arc::new(vec![1; 64]),
                         key_id: key_id.clone(),
+                        taproot_tree_root: None,
                     })
                 }
                 MasterPublicKeyId::VetKd(_) => panic!("not applicable to vetKD"),
diff --git a/rs/crypto/internal/logmon/BUILD.bazel b/rs/crypto/internal/logmon/BUILD.bazel
index 19934b7472a..f1b9e3aa85b 100644
--- a/rs/crypto/internal/logmon/BUILD.bazel
+++ b/rs/crypto/internal/logmon/BUILD.bazel
@@ -1,6 +1,8 @@
 load("@rules_rust//rust:defs.bzl", "rust_doc_test", "rust_library", "rust_test")
 
-package(default_visibility = ["//rs/crypto:__subpackages__"])
+package(default_visibility = [
+    "//rs/crypto:__subpackages__",
+])
 
 DEPENDENCIES = [
     # Keep sorted.
diff --git a/rs/determinism_test/src/lib.rs b/rs/determinism_test/src/lib.rs
index 14d2cb6b26e..5a7de569784 100644
--- a/rs/determinism_test/src/lib.rs
+++ b/rs/determinism_test/src/lib.rs
@@ -32,7 +32,7 @@ fn build_batch(message_routing: &dyn MessageRouting, msgs: Vec<SignedIngress>) -
             ..BatchMessages::default()
         },
         randomness: Randomness::from([0; 32]),
-        idkg_subnet_public_keys: BTreeMap::new(),
+        chain_key_subnet_public_keys: BTreeMap::new(),
         idkg_pre_signature_ids: BTreeMap::new(),
         registry_version: RegistryVersion::from(1),
         time: UNIX_EPOCH,
@@ -49,7 +49,7 @@ fn build_batch_with_full_state_hash(message_routing: &dyn MessageRouting) -> Bat
         requires_full_state_hash: true,
         messages: BatchMessages::default(),
         randomness: Randomness::from([0; 32]),
-        idkg_subnet_public_keys: BTreeMap::new(),
+        chain_key_subnet_public_keys: BTreeMap::new(),
         idkg_pre_signature_ids: BTreeMap::new(),
         registry_version: RegistryVersion::from(1),
         time: UNIX_EPOCH,
diff --git a/rs/drun/src/lib.rs b/rs/drun/src/lib.rs
index 55cd32fee14..d06fb8922cc 100644
--- a/rs/drun/src/lib.rs
+++ b/rs/drun/src/lib.rs
@@ -383,7 +383,7 @@ fn build_batch(message_routing: &dyn MessageRouting, msgs: Vec<SignedIngress>) -
             ..BatchMessages::default()
         },
         randomness: Randomness::from(get_random_seed()),
-        idkg_subnet_public_keys: BTreeMap::new(),
+        chain_key_subnet_public_keys: BTreeMap::new(),
         idkg_pre_signature_ids: BTreeMap::new(),
         registry_version: RegistryVersion::from(1),
         time: time::current_time(),
diff --git a/rs/ethereum/cketh/mainnet/minter_upgrade_2024_11_30.md b/rs/ethereum/cketh/mainnet/minter_upgrade_2024_11_30.md
new file mode 100644
index 00000000000..09a907a5fad
--- /dev/null
+++ b/rs/ethereum/cketh/mainnet/minter_upgrade_2024_11_30.md
@@ -0,0 +1,51 @@
+# Proposal to upgrade the ckETH minter canister
+
+Repository: `https://github.com/dfinity/ic.git`
+
+Git hash: `5ce01d0a871d5162d0b2ff0b585d71ef2e644ac9`
+
+New compressed Wasm hash: `8a5c77ddafee85bee18e3fa76c11922ed5b7bd11f81c2d66b578b0c1b00f5b23`
+
+Upgrade args hash: `0fee102bd16b053022b69f2c65fd5e2f41d150ce9c214ac8731cfaf496ebda4e`
+
+Target canister: `sv3dd-oaaaa-aaaar-qacoa-cai`
+
+Previous ckETH minter proposal: https://dashboard.internetcomputer.org/proposal/134264
+
+---
+
+## Motivation
+
+Fix an undesired breaking changed introduced by proposal [134264](https://dashboard.internetcomputer.org/proposal/134264) :
+
+1. The fields `eth_helper_contract_address` and `erc20_helper_contract_address` in `get_minter_info` were wrongly reused to point to the new helper smart contract [0x18901044688D3756C35Ed2b36D93e6a5B8e00E68](https://etherscan.io/address/0x18901044688D3756C35Ed2b36D93e6a5B8e00E68) that supports deposit with subaccounts and that was added as part of proposal [134264](https://dashboard.internetcomputer.org/proposal/134264).
+2. This broke clients that relied on that information to make deposit of ETH or ERC-20 because the new helper smart contract has a different ABI. This is visible by such a [transaction](https://etherscan.io/tx/0x0968b25814221719bf966cf4bbd2de8290ed2ab42c049d451d64e46812d1574e), where the transaction tried to call the method `deposit` (`0xb214faa5`) that does exist on the [deprecated ETH helper smart contract](https://etherscan.io/address/0x7574eB42cA208A4f6960ECCAfDF186D627dCC175) but doesn't on the new contract (it should have been `depositEth` (`0x17c819c4`)).
+3. The fix simply consists in reverting the changes regarding the values of the fields `eth_helper_contract_address` and `erc20_helper_contract_address` in `get_minter_info` (so that they point back to [0x7574eB42cA208A4f6960ECCAfDF186D627dCC175](https://etherscan.io/address/0x7574eB42cA208A4f6960ECCAfDF186D627dCC175) and [0x6abDA0438307733FC299e9C229FD3cc074bD8cC0](https://etherscan.io/address/0x6abDA0438307733FC299e9C229FD3cc074bD8cC0), respectively) and adding new fields to contain the state of the log scraping (address and last scraped block number) for the new helper smart contract.
+
+## Upgrade args
+
+```
+git fetch
+git checkout 5ce01d0a871d5162d0b2ff0b585d71ef2e644ac9
+cd rs/ethereum/cketh/minter
+didc encode '()' | xxd -r -p | sha256sum
+```
+
+## Release Notes
+
+```
+git log --format='%C(auto) %h %s' 2181ddf2a690ca0262d2d9d0511b093bfa350ece..5ce01d0a871d5162d0b2ff0b585d71ef2e644ac9 -- rs/ethereum/cketh/minter
+5ce01d0a8 fix(cketh): Undo breaking change in `get_minter_info` (#2907)
+68d1088d5 chore(XC-48): extract cketh minter minicbor encoder and decoders into a separate library (#2769)
+ ```
+
+## Wasm Verification
+
+Verify that the hash of the gzipped WASM matches the proposed hash.
+
+```
+git fetch
+git checkout 5ce01d0a871d5162d0b2ff0b585d71ef2e644ac9
+"./ci/container/build-ic.sh" "--canisters"
+sha256sum ./artifacts/canisters/ic-cketh-minter.wasm.gz
+```
diff --git a/rs/ethereum/cketh/minter/cketh_minter.did b/rs/ethereum/cketh/minter/cketh_minter.did
index 2f938ae190f..98ee76dea3b 100644
--- a/rs/ethereum/cketh/minter/cketh_minter.did
+++ b/rs/ethereum/cketh/minter/cketh_minter.did
@@ -172,6 +172,9 @@ type MinterInfo = record {
     // Address of the ERC20 helper smart contract
     erc20_helper_contract_address: opt text;
 
+    // Address of the ETH or ERC20 deposit with subaccount helper smart contract.
+    deposit_with_subaccount_helper_contract_address: opt text;
+
     // Information of supported ERC20 tokens.
     supported_ckerc20_tokens: opt vec CkErc20Token;
 
@@ -201,6 +204,9 @@ type MinterInfo = record {
     // Last scraped block number for logs of the ERC20 helper contract.
     last_erc20_scraped_block_number: opt nat;
 
+    // Last scraped block number for logs of the deposit with subaccount helper contract.
+    last_deposit_with_subaccount_scraped_block_number: opt nat;
+
     // Canister ID of the ckETH ledger.
     cketh_ledger_id: opt principal;
 
diff --git a/rs/ethereum/cketh/minter/src/endpoints.rs b/rs/ethereum/cketh/minter/src/endpoints.rs
index aafff92a3d2..5ebfbbfe98b 100644
--- a/rs/ethereum/cketh/minter/src/endpoints.rs
+++ b/rs/ethereum/cketh/minter/src/endpoints.rs
@@ -67,6 +67,7 @@ pub struct MinterInfo {
     pub smart_contract_address: Option<String>,
     pub eth_helper_contract_address: Option<String>,
     pub erc20_helper_contract_address: Option<String>,
+    pub deposit_with_subaccount_helper_contract_address: Option<String>,
     pub supported_ckerc20_tokens: Option<Vec<CkErc20Token>>,
     pub minimum_withdrawal_amount: Option<Nat>,
     pub ethereum_block_height: Option<CandidBlockTag>,
@@ -76,6 +77,7 @@ pub struct MinterInfo {
     pub erc20_balances: Option<Vec<Erc20Balance>>,
     pub last_eth_scraped_block_number: Option<Nat>,
     pub last_erc20_scraped_block_number: Option<Nat>,
+    pub last_deposit_with_subaccount_scraped_block_number: Option<Nat>,
     pub cketh_ledger_id: Option<Principal>,
     pub evm_rpc_id: Option<Principal>,
 }
diff --git a/rs/ethereum/cketh/minter/src/main.rs b/rs/ethereum/cketh/minter/src/main.rs
index 47664bf1218..32bb99986f9 100644
--- a/rs/ethereum/cketh/minter/src/main.rs
+++ b/rs/ethereum/cketh/minter/src/main.rs
@@ -227,6 +227,8 @@ async fn get_minter_info() -> MinterInfo {
             last_eth_scraped_block_number,
             erc20_helper_contract_address,
             last_erc20_scraped_block_number,
+            deposit_with_subaccount_helper_contract_address,
+            last_deposit_with_subaccount_scraped_block_number,
         } = s.log_scrapings.info();
 
         MinterInfo {
@@ -234,6 +236,7 @@ async fn get_minter_info() -> MinterInfo {
             smart_contract_address: eth_helper_contract_address.clone(),
             eth_helper_contract_address,
             erc20_helper_contract_address,
+            deposit_with_subaccount_helper_contract_address,
             supported_ckerc20_tokens,
             minimum_withdrawal_amount: Some(s.cketh_minimum_withdrawal_amount.into()),
             ethereum_block_height: Some(s.ethereum_block_height.into()),
@@ -249,6 +252,7 @@ async fn get_minter_info() -> MinterInfo {
             erc20_balances,
             last_eth_scraped_block_number,
             last_erc20_scraped_block_number,
+            last_deposit_with_subaccount_scraped_block_number,
             cketh_ledger_id: Some(s.cketh_ledger_id),
             evm_rpc_id: s.evm_rpc_id,
         }
diff --git a/rs/ethereum/cketh/minter/src/state/eth_logs_scraping/mod.rs b/rs/ethereum/cketh/minter/src/state/eth_logs_scraping/mod.rs
index 92737856e96..cfc017acfd7 100644
--- a/rs/ethereum/cketh/minter/src/state/eth_logs_scraping/mod.rs
+++ b/rs/ethereum/cketh/minter/src/state/eth_logs_scraping/mod.rs
@@ -69,28 +69,21 @@ impl LogScrapings {
             let last_scraped_block_number = Some(Nat::from(state.last_scraped_block_number()));
             (contract_address, last_scraped_block_number)
         };
-        let (
-            deposit_with_subaccount_contract_address,
-            deposit_with_subaccount_last_scraped_block_number,
-        ) = to_info(self.get(LogScrapingId::EthOrErc20DepositWithSubaccount));
-        if deposit_with_subaccount_contract_address.is_some() {
-            return LogScrapingInfo {
-                eth_helper_contract_address: deposit_with_subaccount_contract_address.clone(),
-                last_eth_scraped_block_number: deposit_with_subaccount_last_scraped_block_number
-                    .clone(),
-                erc20_helper_contract_address: deposit_with_subaccount_contract_address,
-                last_erc20_scraped_block_number: deposit_with_subaccount_last_scraped_block_number,
-            };
-        }
         let (eth_helper_contract_address, last_eth_scraped_block_number) =
             to_info(self.get(LogScrapingId::EthDepositWithoutSubaccount));
         let (erc20_helper_contract_address, last_erc20_scraped_block_number) =
             to_info(self.get(LogScrapingId::Erc20DepositWithoutSubaccount));
+        let (
+            deposit_with_subaccount_helper_contract_address,
+            last_deposit_with_subaccount_scraped_block_number,
+        ) = to_info(self.get(LogScrapingId::EthOrErc20DepositWithSubaccount));
         LogScrapingInfo {
             eth_helper_contract_address,
             last_eth_scraped_block_number,
             erc20_helper_contract_address,
             last_erc20_scraped_block_number,
+            deposit_with_subaccount_helper_contract_address,
+            last_deposit_with_subaccount_scraped_block_number,
         }
     }
 }
@@ -202,4 +195,6 @@ pub struct LogScrapingInfo {
     pub last_eth_scraped_block_number: Option<Nat>,
     pub erc20_helper_contract_address: Option<String>,
     pub last_erc20_scraped_block_number: Option<Nat>,
+    pub deposit_with_subaccount_helper_contract_address: Option<String>,
+    pub last_deposit_with_subaccount_scraped_block_number: Option<Nat>,
 }
diff --git a/rs/ethereum/cketh/minter/src/state/eth_logs_scraping/tests.rs b/rs/ethereum/cketh/minter/src/state/eth_logs_scraping/tests.rs
index 8fe4e235682..4eeec72e5b2 100644
--- a/rs/ethereum/cketh/minter/src/state/eth_logs_scraping/tests.rs
+++ b/rs/ethereum/cketh/minter/src/state/eth_logs_scraping/tests.rs
@@ -1,7 +1,7 @@
 use crate::state::eth_logs_scraping::{LogScrapingId, LogScrapingInfo, LogScrapings};
 
 #[test]
-fn should_use_info_from_deposit_with_subaccount_when_contract_address_present() {
+fn should_not_change_other_field_when_deposit_with_subaccount_present() {
     const LAST_SCRAPED_BLOCK_NUMBER: u32 = 21_235_426_u32;
     const ETH_HELPER_SMART_CONTRACT: &str = "0x7574eB42cA208A4f6960ECCAfDF186D627dCC175";
     const ERC20_HELPER_SMART_CONTRACT: &str = "0x6abDA0438307733FC299e9C229FD3cc074bD8cC0";
@@ -15,6 +15,9 @@ fn should_use_info_from_deposit_with_subaccount_when_contract_address_present()
         LogScrapingInfo {
             last_eth_scraped_block_number: Some(LAST_SCRAPED_BLOCK_NUMBER.into()),
             last_erc20_scraped_block_number: Some(LAST_SCRAPED_BLOCK_NUMBER.into()),
+            last_deposit_with_subaccount_scraped_block_number: Some(
+                LAST_SCRAPED_BLOCK_NUMBER.into()
+            ),
             ..Default::default()
         }
     );
@@ -32,13 +35,18 @@ fn should_use_info_from_deposit_with_subaccount_when_contract_address_present()
         )
         .unwrap();
 
+    let info_before = scrapings.info();
     assert_eq!(
-        scrapings.info(),
+        info_before,
         LogScrapingInfo {
             eth_helper_contract_address: Some(ETH_HELPER_SMART_CONTRACT.to_string()),
             last_eth_scraped_block_number: Some(LAST_SCRAPED_BLOCK_NUMBER.into()),
             erc20_helper_contract_address: Some(ERC20_HELPER_SMART_CONTRACT.to_string()),
             last_erc20_scraped_block_number: Some(LAST_SCRAPED_BLOCK_NUMBER.into()),
+            deposit_with_subaccount_helper_contract_address: None,
+            last_deposit_with_subaccount_scraped_block_number: Some(
+                LAST_SCRAPED_BLOCK_NUMBER.into()
+            ),
         }
     );
 
@@ -58,14 +66,13 @@ fn should_use_info_from_deposit_with_subaccount_when_contract_address_present()
     assert_eq!(
         scrapings.info(),
         LogScrapingInfo {
-            eth_helper_contract_address: Some(
+            deposit_with_subaccount_helper_contract_address: Some(
                 DEPOSIT_WITH_SUBACCOUNT_HELPER_SMART_CONTRACT.to_string()
             ),
-            last_eth_scraped_block_number: Some((LAST_SCRAPED_BLOCK_NUMBER + 1).into()),
-            erc20_helper_contract_address: Some(
-                DEPOSIT_WITH_SUBACCOUNT_HELPER_SMART_CONTRACT.to_string()
+            last_deposit_with_subaccount_scraped_block_number: Some(
+                (LAST_SCRAPED_BLOCK_NUMBER + 1).into()
             ),
-            last_erc20_scraped_block_number: Some((LAST_SCRAPED_BLOCK_NUMBER + 1).into()),
+            ..info_before
         }
     );
 }
diff --git a/rs/ethereum/cketh/minter/tests/ckerc20.rs b/rs/ethereum/cketh/minter/tests/ckerc20.rs
index 31fed9353ab..024359b5922 100644
--- a/rs/ethereum/cketh/minter/tests/ckerc20.rs
+++ b/rs/ethereum/cketh/minter/tests/ckerc20.rs
@@ -25,7 +25,8 @@ use ic_cketh_test_utils::{
     format_ethereum_address_to_eip_55, CkEthSetup, CKETH_MINIMUM_WITHDRAWAL_AMOUNT,
     DEFAULT_DEPOSIT_BLOCK_NUMBER, DEFAULT_DEPOSIT_FROM_ADDRESS, DEFAULT_DEPOSIT_LOG_INDEX,
     DEFAULT_DEPOSIT_TRANSACTION_HASH, DEFAULT_ERC20_DEPOSIT_LOG_INDEX,
-    DEFAULT_ERC20_DEPOSIT_TRANSACTION_HASH, DEFAULT_USER_SUBACCOUNT, EFFECTIVE_GAS_PRICE,
+    DEFAULT_ERC20_DEPOSIT_TRANSACTION_HASH, DEFAULT_USER_SUBACCOUNT,
+    DEPOSIT_WITH_SUBACCOUNT_HELPER_CONTRACT_ADDRESS, EFFECTIVE_GAS_PRICE,
     ERC20_HELPER_CONTRACT_ADDRESS, ETH_HELPER_CONTRACT_ADDRESS, GAS_USED,
     LAST_SCRAPED_BLOCK_NUMBER_AT_INSTALL, MINTER_ADDRESS,
 };
@@ -1681,6 +1682,7 @@ fn should_retrieve_minter_info() {
             erc20_helper_contract_address: Some(format_ethereum_address_to_eip_55(
                 ERC20_HELPER_CONTRACT_ADDRESS
             )),
+            deposit_with_subaccount_helper_contract_address: None,
             supported_ckerc20_tokens: Some(supported_ckerc20_tokens),
             minimum_withdrawal_amount: Some(Nat::from(CKETH_MINIMUM_WITHDRAWAL_AMOUNT)),
             ethereum_block_height: Some(Finalized),
@@ -1690,12 +1692,54 @@ fn should_retrieve_minter_info() {
             erc20_balances: Some(erc20_balances),
             last_eth_scraped_block_number: Some(LAST_SCRAPED_BLOCK_NUMBER_AT_INSTALL.into()),
             last_erc20_scraped_block_number: Some(LAST_SCRAPED_BLOCK_NUMBER_AT_INSTALL.into()),
+            last_deposit_with_subaccount_scraped_block_number: Some(
+                LAST_SCRAPED_BLOCK_NUMBER_AT_INSTALL.into()
+            ),
             cketh_ledger_id: Some(ckerc20.cketh_ledger_id()),
             evm_rpc_id: ckerc20.cketh.evm_rpc_id.map(Principal::from),
         }
     );
 }
 
+// If a contract needs to be changed, the contract ABI must be preserved,
+// otherwise this will be a breaking change for clients (e.g. front-ends).
+#[test]
+#[allow(deprecated)]
+fn should_not_change_address_of_other_contracts_when_adding_new_contract() {
+    let ckerc20 = CkErc20Setup::default();
+    let info_at_start = ckerc20.cketh.get_minter_info();
+    assert_eq!(
+        info_at_start,
+        MinterInfo {
+            smart_contract_address: Some(format_ethereum_address_to_eip_55(
+                ETH_HELPER_CONTRACT_ADDRESS
+            )),
+            eth_helper_contract_address: Some(format_ethereum_address_to_eip_55(
+                ETH_HELPER_CONTRACT_ADDRESS
+            )),
+            erc20_helper_contract_address: Some(format_ethereum_address_to_eip_55(
+                ERC20_HELPER_CONTRACT_ADDRESS
+            )),
+            ..info_at_start.clone()
+        }
+    );
+
+    let ckerc20 = ckerc20.add_support_for_subaccount();
+
+    assert_eq!(
+        ckerc20.get_minter_info(),
+        MinterInfo {
+            deposit_with_subaccount_helper_contract_address: Some(
+                format_ethereum_address_to_eip_55(DEPOSIT_WITH_SUBACCOUNT_HELPER_CONTRACT_ADDRESS)
+            ),
+            last_deposit_with_subaccount_scraped_block_number: Some(
+                LAST_SCRAPED_BLOCK_NUMBER_AT_INSTALL.into()
+            ),
+            ..info_at_start
+        }
+    )
+}
+
 #[test]
 fn should_scrape_from_last_scraped_after_upgrade() {
     let mut ckerc20 = CkErc20Setup::default().add_supported_erc20_tokens();
diff --git a/rs/ethereum/cketh/minter/tests/cketh.rs b/rs/ethereum/cketh/minter/tests/cketh.rs
index f21655343eb..3463d2436c4 100644
--- a/rs/ethereum/cketh/minter/tests/cketh.rs
+++ b/rs/ethereum/cketh/minter/tests/cketh.rs
@@ -1087,6 +1087,7 @@ fn should_retrieve_minter_info() {
                 ETH_HELPER_CONTRACT_ADDRESS
             )),
             erc20_helper_contract_address: None,
+            deposit_with_subaccount_helper_contract_address: None,
             supported_ckerc20_tokens: None,
             minimum_withdrawal_amount: Some(Nat::from(CKETH_MINIMUM_WITHDRAWAL_AMOUNT)),
             ethereum_block_height: Some(Finalized),
@@ -1096,6 +1097,9 @@ fn should_retrieve_minter_info() {
             erc20_balances: None,
             last_eth_scraped_block_number: Some(LAST_SCRAPED_BLOCK_NUMBER_AT_INSTALL.into()),
             last_erc20_scraped_block_number: Some(LAST_SCRAPED_BLOCK_NUMBER_AT_INSTALL.into()),
+            last_deposit_with_subaccount_scraped_block_number: Some(
+                LAST_SCRAPED_BLOCK_NUMBER_AT_INSTALL.into()
+            ),
             cketh_ledger_id: Some(cketh.ledger_id.into()),
             evm_rpc_id: cketh.evm_rpc_id.map(Principal::from),
         }
diff --git a/rs/execution_environment/src/execution_environment.rs b/rs/execution_environment/src/execution_environment.rs
index dd17b46bde8..a176b0fe920 100644
--- a/rs/execution_environment/src/execution_environment.rs
+++ b/rs/execution_environment/src/execution_environment.rs
@@ -1212,6 +1212,9 @@ impl ExecutionEnvironment {
                                     ThresholdArguments::Schnorr(SchnorrArguments {
                                         key_id: args.key_id,
                                         message: Arc::new(args.message),
+                                        taproot_tree_root: args
+                                            .taproot_tree_root
+                                            .map(|v| Arc::new(v.into_vec())),
                                     }),
                                     args.derivation_path.into_inner(),
                                     registry_settings
diff --git a/rs/execution_environment/src/execution_environment/tests.rs b/rs/execution_environment/src/execution_environment/tests.rs
index e19b7940981..a5ad26eda9d 100644
--- a/rs/execution_environment/src/execution_environment/tests.rs
+++ b/rs/execution_environment/src/execution_environment/tests.rs
@@ -168,6 +168,7 @@ fn sign_with_threshold_key_payload(method: Method, key_id: MasterPublicKeyId) ->
             message: vec![],
             derivation_path: DerivationPath::new(vec![]),
             key_id: into_inner_schnorr(key_id),
+            taproot_tree_root: None,
         }
         .encode(),
         Method::VetKdDeriveEncryptedKey => ic00::VetKdDeriveEncryptedKeyArgs {
diff --git a/rs/execution_environment/src/scheduler/test_utilities.rs b/rs/execution_environment/src/scheduler/test_utilities.rs
index ec58042fa01..f12927f380c 100644
--- a/rs/execution_environment/src/scheduler/test_utilities.rs
+++ b/rs/execution_environment/src/scheduler/test_utilities.rs
@@ -113,8 +113,8 @@ pub(crate) struct SchedulerTest {
     registry_settings: RegistryExecutionSettings,
     // Metrics Registry.
     metrics_registry: MetricsRegistry,
-    // iDKG subnet public keys.
-    idkg_subnet_public_keys: BTreeMap<MasterPublicKeyId, MasterPublicKey>,
+    // Chain key subnet public keys.
+    chain_key_subnet_public_keys: BTreeMap<MasterPublicKeyId, MasterPublicKey>,
     // Pre-signature IDs.
     idkg_pre_signature_ids: BTreeMap<MasterPublicKeyId, BTreeSet<PreSigId>>,
     // Version of the running replica, not the registry's Entry
@@ -518,7 +518,7 @@ impl SchedulerTest {
         let state = self.scheduler.execute_round(
             state,
             Randomness::from([0; 32]),
-            self.idkg_subnet_public_keys.clone(),
+            self.chain_key_subnet_public_keys.clone(),
             self.idkg_pre_signature_ids.clone(),
             &self.replica_version,
             self.round,
@@ -839,7 +839,7 @@ impl SchedulerTestBuilder {
                 },
             );
         }
-        let idkg_subnet_public_keys: BTreeMap<_, _> = self
+        let chain_key_subnet_public_keys: BTreeMap<_, _> = self
             .idkg_keys
             .into_iter()
             .map(|key_id| {
@@ -956,7 +956,7 @@ impl SchedulerTestBuilder {
             wasm_executor,
             registry_settings,
             metrics_registry: self.metrics_registry,
-            idkg_subnet_public_keys,
+            chain_key_subnet_public_keys,
             idkg_pre_signature_ids: BTreeMap::new(),
             replica_version: self.replica_version,
         }
diff --git a/rs/execution_environment/src/scheduler/tests.rs b/rs/execution_environment/src/scheduler/tests.rs
index a6bf12432a2..c8b8329d20f 100644
--- a/rs/execution_environment/src/scheduler/tests.rs
+++ b/rs/execution_environment/src/scheduler/tests.rs
@@ -3759,6 +3759,7 @@ fn threshold_signature_agreements_metric_is_updated() {
         message: vec![1; 128],
         derivation_path: DerivationPath::new(Vec::new()),
         key_id: schnorr_key_id,
+        taproot_tree_root: None,
     })
     .unwrap();
 
diff --git a/rs/execution_environment/src/scheduler/threshold_signatures.rs b/rs/execution_environment/src/scheduler/threshold_signatures.rs
index 7b819994277..71096adbe3d 100644
--- a/rs/execution_environment/src/scheduler/threshold_signatures.rs
+++ b/rs/execution_environment/src/scheduler/threshold_signatures.rs
@@ -139,6 +139,7 @@ mod tests {
             MasterPublicKeyId::Schnorr(key_id) => ThresholdArguments::Schnorr(SchnorrArguments {
                 key_id: key_id.clone(),
                 message: Arc::new(vec![1; 64]),
+                taproot_tree_root: None,
             }),
             MasterPublicKeyId::VetKd(_) => panic!("vetKD does not have pre-signatures"),
         };
diff --git a/rs/execution_environment/tests/threshold_signatures.rs b/rs/execution_environment/tests/threshold_signatures.rs
index 11e1379a4f3..a4089d487ef 100644
--- a/rs/execution_environment/tests/threshold_signatures.rs
+++ b/rs/execution_environment/tests/threshold_signatures.rs
@@ -82,6 +82,7 @@ fn sign_with_threshold_key_payload(method: Method, key_id: MasterPublicKeyId) ->
             message: vec![],
             derivation_path: DerivationPath::new(vec![]),
             key_id: into_inner_schnorr(key_id),
+            taproot_tree_root: None,
         }
         .encode(),
         _ => panic!("unexpected method"),
diff --git a/rs/http_endpoints/public/BUILD.bazel b/rs/http_endpoints/public/BUILD.bazel
index acd4fa8b5cf..07944d8e4f9 100644
--- a/rs/http_endpoints/public/BUILD.bazel
+++ b/rs/http_endpoints/public/BUILD.bazel
@@ -77,6 +77,7 @@ BUILD_DEPENDENCIES = []
 DEV_DEPENDENCIES = [
     # Keep sorted.
     "//rs/canister_client",
+    "//rs/canister_client/read_state_response_parser",
     "//rs/canister_client/sender",
     "//rs/canonical_state",
     "//rs/certification/test-utils",
diff --git a/rs/http_endpoints/public/Cargo.toml b/rs/http_endpoints/public/Cargo.toml
index 2475673d5b8..f53da9809cc 100644
--- a/rs/http_endpoints/public/Cargo.toml
+++ b/rs/http_endpoints/public/Cargo.toml
@@ -71,6 +71,7 @@ ic-interfaces-mocks = { path = "../../interfaces/mocks" }
 ic-interfaces-registry-mocks = { path = "../../interfaces/registry/mocks" }
 ic-interfaces-state-manager-mocks = { path = "../../interfaces/state_manager/mocks" }
 ic-protobuf = { path = "../../protobuf" }
+ic-read-state-response-parser = { path = "../../canister_client/read_state_response_parser" }
 ic-registry-keys = { path = "../../registry/keys" }
 ic-registry-routing-table = { path = "../../registry/routing_table" }
 ic-test-utilities = { path = "../../test_utilities" }
diff --git a/rs/http_endpoints/public/tests/test.rs b/rs/http_endpoints/public/tests/test.rs
index de923054ce0..0fbad27d47e 100644
--- a/rs/http_endpoints/public/tests/test.rs
+++ b/rs/http_endpoints/public/tests/test.rs
@@ -17,7 +17,7 @@ use http_body::Frame;
 use http_body_util::StreamBody;
 use hyper::{body::Incoming, Method, Request, StatusCode};
 use hyper_util::{client::legacy::Client, rt::TokioExecutor};
-use ic_canister_client::{parse_subnet_read_state_response, prepare_read_state};
+use ic_canister_client::prepare_read_state;
 use ic_canister_client_sender::Sender;
 use ic_canonical_state::encoding::types::{Cycles, SubnetMetrics};
 use ic_certification_test_utils::{
@@ -35,6 +35,7 @@ use ic_interfaces_state_manager_mocks::MockStateManager;
 use ic_protobuf::registry::crypto::v1::{
     AlgorithmId as AlgorithmIdProto, PublicKey as PublicKeyProto,
 };
+use ic_read_state_response_parser::parse_subnet_read_state_response;
 use ic_registry_keys::make_crypto_threshold_signing_pubkey_key;
 use ic_replicated_state::ReplicatedState;
 use ic_test_utilities_state::ReplicatedStateBuilder;
diff --git a/rs/ic_os/config/BUILD.bazel b/rs/ic_os/config/BUILD.bazel
index 5207c4ec240..ae3be2c6c82 100644
--- a/rs/ic_os/config/BUILD.bazel
+++ b/rs/ic_os/config/BUILD.bazel
@@ -5,11 +5,11 @@ package(default_visibility = ["//rs:ic-os-pkg"])
 DEPENDENCIES = [
     # Keep sorted.
     "//rs/ic_os/config_types",
-    "//rs/ic_os/deterministic_ips",
     "//rs/ic_os/utils",
     "//rs/types/types",
     "@crate_index//:anyhow",
     "@crate_index//:clap",
+    "@crate_index//:macaddr",
     "@crate_index//:regex",
     "@crate_index//:serde",
     "@crate_index//:serde_json",
diff --git a/rs/ic_os/config/Cargo.toml b/rs/ic_os/config/Cargo.toml
index 295954db267..51c15344537 100644
--- a/rs/ic_os/config/Cargo.toml
+++ b/rs/ic_os/config/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 anyhow = { workspace = true }
 ic-types = { path = "../../types/types" }
 clap = { workspace = true }
+macaddr = { workspace = true }
 utils = { path = "../utils" }
 url = { workspace = true }
 serde_json = { workspace = true }
@@ -14,8 +15,7 @@ serde = { workspace = true }
 serde_with = "1.6.2"
 regex = { workspace = true }
 config_types = { path = "../config_types" }
-deterministic_ips = { path = "../deterministic_ips" }
-network = { path = "../network" } # Only required by bin
+network = { path = "../network" }           # Only required by bin
 
 [dev-dependencies]
 once_cell = "1.8"
diff --git a/rs/ic_os/config/src/generate_testnet_config.rs b/rs/ic_os/config/src/generate_testnet_config.rs
index 6e67e012568..c569cce9995 100644
--- a/rs/ic_os/config/src/generate_testnet_config.rs
+++ b/rs/ic_os/config/src/generate_testnet_config.rs
@@ -1,5 +1,5 @@
 use anyhow::Result;
-use deterministic_ips::{Deployment, HwAddr};
+use macaddr::MacAddr6;
 use std::net::{Ipv4Addr, Ipv6Addr};
 use std::path::PathBuf;
 use url::Url;
@@ -23,8 +23,8 @@ pub struct GenerateTestnetConfigArgs {
 
     // ICOSSettings arguments
     pub node_reward_type: Option<String>,
-    pub mgmt_mac: Option<HwAddr>,
-    pub deployment_environment: Option<Deployment>,
+    pub mgmt_mac: Option<MacAddr6>,
+    pub deployment_environment: Option<DeploymentEnvironment>,
     pub elasticsearch_hosts: Option<String>,
     pub elasticsearch_tags: Option<String>,
     pub use_nns_public_key: Option<bool>,
@@ -169,7 +169,7 @@ fn create_guestos_config(config: GenerateTestnetConfigArgs) -> Result<GuestOSCon
         None => "00:00:00:00:00:00".parse()?,
     };
 
-    let deployment_environment = deployment_environment.unwrap_or(Deployment::Testnet);
+    let deployment_environment = deployment_environment.unwrap_or(DeploymentEnvironment::Testnet);
 
     let logging = Logging {
         elasticsearch_hosts: elasticsearch_hosts.unwrap_or_else(|| "".to_string()),
diff --git a/rs/ic_os/config/src/lib.rs b/rs/ic_os/config/src/lib.rs
index f3cebcc9cf0..dbd4fa9ee17 100644
--- a/rs/ic_os/config/src/lib.rs
+++ b/rs/ic_os/config/src/lib.rs
@@ -45,7 +45,6 @@ pub fn deserialize_config<T: for<'de> Deserialize<'de>, P: AsRef<Path>>(file_pat
 #[cfg(test)]
 mod tests {
     use config_types::*;
-    use deterministic_ips::Deployment;
 
     #[test]
     fn test_serialize_and_deserialize() {
@@ -73,7 +72,7 @@ mod tests {
         let icos_settings = ICOSSettings {
             node_reward_type: Some("type3.1".to_string()),
             mgmt_mac: "ec:2a:72:31:a2:0c".parse().unwrap(),
-            deployment_environment: Deployment::Mainnet,
+            deployment_environment: DeploymentEnvironment::Mainnet,
             logging,
             use_nns_public_key: true,
             nns_urls: vec!["http://localhost".parse().unwrap()],
@@ -159,7 +158,7 @@ mod tests {
         },
         "icos_settings": {
             "node_reward_type": "type3.1",
-            "mgmt_mac": "ec:2a:72:31:a2:0c",
+            "mgmt_mac": "EC:2A:72:31:A2:0C",
             "deployment_environment": "Mainnet",
             "logging": {
                 "elasticsearch_hosts": "elasticsearch-node-0.mercury.dfinity.systems:443 elasticsearch-node-1.mercury.dfinity.systems:443",
@@ -219,7 +218,7 @@ mod tests {
         },
         "icos_settings": {
             "node_reward_type": "type3.1",
-            "mgmt_mac": "ec:2a:72:31:a2:0c",
+            "mgmt_mac": "EC:2A:72:31:A2:0C",
             "deployment_environment": "Mainnet",
             "logging": {
                 "elasticsearch_hosts": "elasticsearch-node-0.mercury.dfinity.systems:443 elasticsearch-node-1.mercury.dfinity.systems:443",
@@ -267,7 +266,7 @@ mod tests {
         assert_eq!(config.config_version, "1.0.0");
         assert_eq!(
             config.icos_settings.mgmt_mac.to_string(),
-            "ec:2a:72:31:a2:0c"
+            "EC:2A:72:31:A2:0C"
         );
     }
 }
diff --git a/rs/ic_os/config/src/main.rs b/rs/ic_os/config/src/main.rs
index e6a7cba16cd..d17f7237115 100644
--- a/rs/ic_os/config/src/main.rs
+++ b/rs/ic_os/config/src/main.rs
@@ -3,7 +3,7 @@ use clap::{Args, Parser, Subcommand};
 use config::config_ini::{get_config_ini_settings, ConfigIniSettings};
 use config::deployment_json::get_deployment_settings;
 use config::serialize_and_write_config;
-use deterministic_ips::{Deployment, HwAddr};
+use macaddr::MacAddr6;
 use network::resolve_mgmt_mac;
 use regex::Regex;
 use std::fs::File;
@@ -91,9 +91,9 @@ pub struct GenerateTestnetConfigClapArgs {
     #[arg(long)]
     pub node_reward_type: Option<String>,
     #[arg(long)]
-    pub mgmt_mac: Option<HwAddr>,
+    pub mgmt_mac: Option<MacAddr6>,
     #[arg(long)]
-    pub deployment_environment: Option<Deployment>,
+    pub deployment_environment: Option<DeploymentEnvironment>,
     #[arg(long)]
     pub elasticsearch_hosts: Option<String>,
     #[arg(long)]
diff --git a/rs/ic_os/config_types/BUILD.bazel b/rs/ic_os/config_types/BUILD.bazel
index 2bc7f298cf7..3dbfd0798a3 100644
--- a/rs/ic_os/config_types/BUILD.bazel
+++ b/rs/ic_os/config_types/BUILD.bazel
@@ -4,12 +4,13 @@ package(default_visibility = ["//rs:ic-os-pkg"])
 
 DEPENDENCIES = [
     # Keep sorted.
-    "//rs/ic_os/deterministic_ips",
     "//rs/types/types",
     "@crate_index//:anyhow",
+    "@crate_index//:macaddr",
     "@crate_index//:serde",
     "@crate_index//:serde_json",
     "@crate_index//:serde_with",
+    "@crate_index//:thiserror",
     "@crate_index//:url",
 ]
 
@@ -27,6 +28,10 @@ rust_library(
     ),
     crate_name = "config_types",
     edition = "2021",
+    visibility = [
+        "//rs:ic-os-pkg",
+        "//rs:system-tests-pkg",
+    ],
     deps = DEPENDENCIES,
 )
 
diff --git a/rs/ic_os/config_types/Cargo.toml b/rs/ic_os/config_types/Cargo.toml
index 11f1e6a99b1..6ac3f406f60 100644
--- a/rs/ic_os/config_types/Cargo.toml
+++ b/rs/ic_os/config_types/Cargo.toml
@@ -6,11 +6,12 @@ edition = "2021"
 [dependencies]
 anyhow = { workspace = true }
 ic-types = { path = "../../types/types" }
+macaddr = { workspace = true }
 url = { workspace = true }
 serde_json = { workspace = true }
 serde = { workspace = true }
 serde_with = "1.6.2"
-deterministic_ips = { path = "../deterministic_ips" }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 once_cell = "1.8"
diff --git a/rs/ic_os/config_types/src/lib.rs b/rs/ic_os/config_types/src/lib.rs
index 8a12ed98069..d743517e69b 100644
--- a/rs/ic_os/config_types/src/lib.rs
+++ b/rs/ic_os/config_types/src/lib.rs
@@ -14,12 +14,14 @@
 //! - **Removing Fields**: To prevent backwards-compatibility deserialization errors, required fields must not be removed directly: In a first step, they have to be made optional and code that reads the value must be removed/handle missing values. In a second step, after the first step has rolled out to all OSes and there is no risk of a rollback, the field can be removed. Additionally, to avoid reintroducing a previously removed field, add your removed field to the RESERVED_FIELD_NAMES list.
 //!
 //! - **Renaming Fields**: Avoid renaming fields unless absolutely necessary. If you must rename a field, use `#[serde(rename = "old_name")]`.
-use deterministic_ips::{Deployment, HwAddr};
 use ic_types::malicious_behaviour::MaliciousBehaviour;
+use macaddr::MacAddr6;
 use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, DisplayFromStr};
 use std::collections::HashMap;
+use std::fmt;
 use std::net::{Ipv4Addr, Ipv6Addr};
+use std::str::FromStr;
 use url::Url;
 
 pub const CONFIG_VERSION: &str = "1.0.0";
@@ -71,10 +73,9 @@ pub struct ICOSSettings {
     #[serde_as(as = "DisplayFromStr")]
     /// In nested testing, mgmt_mac is set in deployment.json.template,
     /// else found dynamically in call to config tool CreateSetuposConfig
-    pub mgmt_mac: HwAddr,
+    pub mgmt_mac: MacAddr6,
     #[serde_as(as = "DisplayFromStr")]
-    /// "mainnet" or "testnet"
-    pub deployment_environment: Deployment,
+    pub deployment_environment: DeploymentEnvironment,
     pub logging: Logging,
     pub use_nns_public_key: bool,
     /// The URL (HTTP) of the NNS node(s).
@@ -148,6 +149,39 @@ pub struct BackupSpoolSettings {
     pub backup_purging_interval_seconds: Option<u64>,
 }
 
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+#[non_exhaustive]
+pub enum DeploymentEnvironment {
+    Mainnet,
+    Testnet,
+}
+
+impl fmt::Display for DeploymentEnvironment {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            DeploymentEnvironment::Mainnet => write!(f, "mainnet"),
+            DeploymentEnvironment::Testnet => write!(f, "testnet"),
+        }
+    }
+}
+
+#[derive(Debug, thiserror::Error)]
+pub enum DeploymentParseError {
+    #[error("invalid deployment variant")]
+    InvalidVariant,
+}
+
+impl FromStr for DeploymentEnvironment {
+    type Err = DeploymentParseError;
+    fn from_str(s: &str) -> Result<DeploymentEnvironment, DeploymentParseError> {
+        match s.to_lowercase().as_str() {
+            "mainnet" => Ok(DeploymentEnvironment::Mainnet),
+            "testnet" => Ok(DeploymentEnvironment::Testnet),
+            _ => Err(DeploymentParseError::InvalidVariant),
+        }
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct Logging {
     /// Space-separated lists of hosts to ship logs to.
@@ -211,7 +245,7 @@ mod tests {
             icos_settings: ICOSSettings {
                 node_reward_type: Some(String::new()),
                 mgmt_mac: "00:00:00:00:00:00".parse()?,
-                deployment_environment: Deployment::Testnet,
+                deployment_environment: DeploymentEnvironment::Testnet,
                 logging: Logging {
                     elasticsearch_hosts: String::new(),
                     elasticsearch_tags: None,
diff --git a/rs/ic_os/deterministic_ips/BUILD.bazel b/rs/ic_os/deterministic_ips/BUILD.bazel
index 4c6bc3ae66e..9e37148a29d 100644
--- a/rs/ic_os/deterministic_ips/BUILD.bazel
+++ b/rs/ic_os/deterministic_ips/BUILD.bazel
@@ -9,8 +9,10 @@ rust_binary(
     deps = [
         # Keep sorted.
         ":deterministic_ips",
+        "//rs/ic_os/config_types",
         "@crate_index//:anyhow",
         "@crate_index//:clap",
+        "@crate_index//:macaddr",
     ],
 )
 
@@ -29,6 +31,9 @@ rust_library(
     deps = [
         # Keep sorted.
         "//rs/crypto/sha2",
+        "//rs/ic_os/config_types",
+        "@crate_index//:anyhow",
+        "@crate_index//:macaddr",
         "@crate_index//:thiserror",
     ],
 )
diff --git a/rs/ic_os/deterministic_ips/Cargo.toml b/rs/ic_os/deterministic_ips/Cargo.toml
index eff69b42b5b..6b06072858e 100644
--- a/rs/ic_os/deterministic_ips/Cargo.toml
+++ b/rs/ic_os/deterministic_ips/Cargo.toml
@@ -7,7 +7,9 @@ edition = "2021"
 
 [dependencies]
 anyhow = { workspace = true }
+macaddr = { workspace = true }
 clap = { workspace = true }
+config_types = { path = "../config_types" }
 ic-crypto-sha2 = { path = "../../crypto/sha2" }
 thiserror = { workspace = true }
 
diff --git a/rs/ic_os/deterministic_ips/src/lib.rs b/rs/ic_os/deterministic_ips/src/lib.rs
index 4fb462c2953..e87361a4407 100644
--- a/rs/ic_os/deterministic_ips/src/lib.rs
+++ b/rs/ic_os/deterministic_ips/src/lib.rs
@@ -1,139 +1,63 @@
-use ic_crypto_sha2::Sha256;
-
-use std::fmt;
 use std::net::Ipv6Addr;
-use std::str::FromStr;
-
-#[derive(Debug, thiserror::Error)]
-pub enum AddressError {
-    #[error("index must be between 0x00 and 0x0f")]
-    InvalidIndex,
-    #[error("the resulting address is invalid")]
-    InvalidAddress,
-}
 
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
-pub struct HwAddr {
-    a: u8,
-    b: u8,
-    c: u8,
-    d: u8,
-    e: u8,
-    f: u8,
-}
+use anyhow::{anyhow, Result};
+use config_types::DeploymentEnvironment;
+use ic_crypto_sha2::Sha256;
+use macaddr::MacAddr6;
 
-impl HwAddr {
-    fn octets(&self) -> [u8; 6] {
-        [self.a, self.b, self.c, self.d, self.e, self.f]
-    }
-}
+pub mod node_type;
+use node_type::NodeType;
 
-impl AsRef<HwAddr> for HwAddr {
-    fn as_ref(&self) -> &HwAddr {
-        self
-    }
+pub trait MacAddr6Ext {
+    fn calculate_slaac(&self, prefix: &str) -> Result<Ipv6Addr>;
 }
 
-impl fmt::Display for HwAddr {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "{:02x}:{:02x}:{:02x}:{:02x}:{:02x}:{:02x}",
-            self.a, self.b, self.c, self.d, self.e, self.f
-        )
-    }
-}
+impl MacAddr6Ext for MacAddr6 {
+    /// Generates the SLAAC IPv6 address for the given prefix.
+    fn calculate_slaac(&self, prefix: &str) -> Result<Ipv6Addr> {
+        let mac_octets = self.into_array();
 
-#[derive(Debug, thiserror::Error)]
-pub enum HwAddrParseError {
-    #[error("invalid MAC address")]
-    InvalidAddress,
-    #[error("invalid MAC address length")]
-    InvalidLength,
-}
+        // Create the EUI-64 interface identifier
+        let mut interface_id = [0u8; 8];
 
-impl From<[u8; 6]> for HwAddr {
-    fn from(octets: [u8; 6]) -> HwAddr {
-        HwAddr {
-            a: octets[0],
-            b: octets[1],
-            c: octets[2],
-            d: octets[3],
-            e: octets[4],
-            f: octets[5],
-        }
-    }
-}
+        // Flip the Universal/Local bit in the first octet
+        interface_id[0] = mac_octets[0] ^ 0x02;
+        interface_id[1] = mac_octets[1];
+        interface_id[2] = mac_octets[2];
+        interface_id[3] = 0xff;
+        interface_id[4] = 0xfe;
+        interface_id[5] = mac_octets[3];
+        interface_id[6] = mac_octets[4];
+        interface_id[7] = mac_octets[5];
 
-impl FromStr for HwAddr {
-    type Err = HwAddrParseError;
-    fn from_str(s: &str) -> Result<HwAddr, HwAddrParseError> {
-        let octets = match s.len() {
-            17 => s
-                .split(':')
-                .map(|v| u8::from_str_radix(v, 16).map_err(|_| HwAddrParseError::InvalidAddress))
-                .collect::<Result<Vec<u8>, HwAddrParseError>>(),
-
-            12 => {
-                let chars: Vec<char> = s.chars().collect();
-                chars
-                    .chunks(2)
-                    .map(|v| {
-                        v.iter().fold("".to_string(), |mut acc, v| {
-                            acc.push(*v);
-                            acc
-                        })
-                    })
-                    .map(|v| {
-                        u8::from_str_radix(&v, 16).map_err(|_| HwAddrParseError::InvalidAddress)
-                    })
-                    .collect::<Result<Vec<u8>, HwAddrParseError>>()
-            }
-            _ => Err(HwAddrParseError::InvalidLength),
-        }?;
-
-        if octets.len() != 6 {
-            return Err(HwAddrParseError::InvalidAddress);
-        }
+        let prefix_octets = prefix_octets(prefix)?;
 
-        Ok([
-            octets[0], octets[1], octets[2], octets[3], octets[4], octets[5],
-        ]
-        .into())
-    }
-}
+        // Combine the prefix with the interface identifier
+        let mut addr_octets = [0; 16];
+        addr_octets[..8].copy_from_slice(&prefix_octets);
+        addr_octets[8..].copy_from_slice(&interface_id);
 
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
-#[non_exhaustive]
-pub enum Deployment {
-    Mainnet,
-    Testnet,
-}
-
-impl fmt::Display for Deployment {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Deployment::Mainnet => write!(f, "mainnet"),
-            Deployment::Testnet => write!(f, "testnet"),
-        }
+        // Construct the full IPv6 address
+        Ok(Ipv6Addr::from(addr_octets))
     }
 }
 
-#[derive(Debug, thiserror::Error)]
-pub enum DeploymentParseError {
-    #[error("invalid deployment variant")]
-    InvalidVariant,
-}
+// parse the octets by going through Ipv6Addr
+fn prefix_octets(prefix: &str) -> Result<[u8; 8]> {
+    // Prepare the prefix by appending '::' if necessary
+    let full_prefix = if prefix.contains("::") {
+        prefix.to_string()
+    } else {
+        format!("{}::", prefix)
+    };
 
-impl FromStr for Deployment {
-    type Err = DeploymentParseError;
-    fn from_str(s: &str) -> Result<Deployment, DeploymentParseError> {
-        match s.to_lowercase().as_str() {
-            "mainnet" => Ok(Deployment::Mainnet),
-            "testnet" => Ok(Deployment::Testnet),
-            _ => Err(DeploymentParseError::InvalidVariant),
-        }
-    }
+    // Parse the prefix into an Ipv6Addr
+    let prefix_addr = full_prefix
+        .parse::<Ipv6Addr>()
+        .map_err(|_| anyhow!("Invalid IPv6 prefix: {}", prefix))?;
+
+    // Extract the network prefix (first 64 bits)
+    Ok(prefix_addr.octets()[..8].try_into()?)
 }
 
 #[derive(Copy, Clone)]
@@ -142,19 +66,21 @@ pub enum IpVariant {
     V6,
 }
 
-pub fn calculate_deterministic_mac<T: AsRef<HwAddr>>(
-    mgmt_mac: T,
-    deployment: Deployment,
+pub fn calculate_deterministic_mac(
+    mgmt_mac: &MacAddr6,
+    deployment_environment: DeploymentEnvironment,
     ip_version: IpVariant,
-    index: u8,
-) -> Result<HwAddr, AddressError> {
-    if index > 0x0f {
-        return Err(AddressError::InvalidIndex);
-    }
+    node_type: NodeType,
+) -> MacAddr6 {
+    let index = node_type.to_index();
 
     // NOTE: In order to be backwards compatible with existing scripts, this
-    // **MUST** Have a newline.
-    let seed = format!("{}{}\n", mgmt_mac.as_ref(), deployment);
+    // **MUST** have a newline.
+    let seed = format!(
+        "{}{}\n",
+        mgmt_mac.to_string().to_lowercase(),
+        deployment_environment
+    );
 
     let hash = Sha256::hash(seed.as_bytes());
 
@@ -163,79 +89,74 @@ pub fn calculate_deterministic_mac<T: AsRef<HwAddr>>(
         IpVariant::V6 => 0x6a,
     };
 
-    Ok([version, index, hash[0], hash[1], hash[2], hash[3]].into())
-}
-
-impl HwAddr {
-    pub fn calculate_slaac(&self, prefix: &str) -> Result<Ipv6Addr, AddressError> {
-        let mut octets = self.octets().to_vec();
-
-        octets.insert(3, 0xff);
-        octets.insert(4, 0xfe);
-
-        octets[0] ^= 2;
-
-        let octets = octets
-            .chunks(2)
-            .map(|v| {
-                v.iter().fold("".to_string(), |mut acc, v| {
-                    acc.push_str(&format!("{:02x}", v));
-                    acc
-                })
-            })
-            .reduce(|mut acc, v| {
-                acc.push(':');
-                acc.push_str(&v);
-                acc
-            })
-            .unwrap(); // We know the length, so this unwrap is OK.
-
-        let combined = format!("{}:{}", prefix, octets);
-
-        combined.parse().map_err(|_| AddressError::InvalidAddress)
-    }
+    [version, index, hash[0], hash[1], hash[2], hash[3]].into()
 }
 
 #[cfg(test)]
 mod test {
     use super::*;
+    use std::net::Ipv6Addr;
 
     #[test]
     fn mac() {
-        let mgmt_mac: HwAddr = "70:B5:E8:E8:25:DE".parse().unwrap();
+        let mgmt_mac: MacAddr6 = "70:B5:E8:E8:25:DE".parse().unwrap();
+        let expected_mac: MacAddr6 = "4a:00:f8:87:a4:8a".parse().unwrap();
+        let mac = calculate_deterministic_mac(
+            &mgmt_mac,
+            DeploymentEnvironment::Testnet,
+            IpVariant::V4,
+            NodeType::HostOS,
+        );
+        assert_eq!(mac, expected_mac);
+    }
 
-        let expected_mac: HwAddr = "4a:00:f8:87:a4:8a".parse().unwrap();
+    #[test]
+    fn test_calculate_slaac() {
+        let mac = "6a01e5962d49".parse::<MacAddr6>().unwrap();
+        let prefix = "2a04:9dc0:0:108";
+
+        let expected_ip = "2a04:9dc0:0:108:6801:e5ff:fe96:2d49"
+            .parse::<Ipv6Addr>()
+            .unwrap();
 
-        let mac =
-            calculate_deterministic_mac(mgmt_mac, Deployment::Testnet, IpVariant::V4, 0).unwrap();
+        let slaac = mac.calculate_slaac(prefix).unwrap();
 
-        assert_eq!(mac, expected_mac);
+        assert_eq!(slaac, expected_ip);
     }
 
     #[test]
-    fn invalid_mac_length() {
-        let error: Result<HwAddr, _> = "11:22:33:44:55".parse();
-
-        assert!(matches!(
-            error,
-            Result::Err(HwAddrParseError::InvalidLength)
-        ));
+    fn mac_to_slaac() {
+        let mgmt_mac = "b0:7b:25:c8:f6:c0".parse::<MacAddr6>().unwrap();
+        let prefix = "2602:FFE4:801:17";
+        let expected_ip = "2602:FFE4:801:17:6801:ff:feec:bd51"
+            .parse::<Ipv6Addr>()
+            .unwrap();
+        let mac = calculate_deterministic_mac(
+            &mgmt_mac,
+            DeploymentEnvironment::Mainnet,
+            IpVariant::V6,
+            NodeType::GuestOS,
+        );
+        let slaac = mac.calculate_slaac(prefix).unwrap();
+        assert_eq!(slaac, expected_ip);
     }
 
     #[test]
-    fn invalid_mac_contents() {
-        let error: Result<HwAddr, _> = "::::::::::::".parse();
+    fn test_prefix_without_suffix() {
+        let mac = "6a:01:e5:96:2d:49".parse::<MacAddr6>().unwrap();
+        let prefix = "2001:db8";
+
+        let expected_ip = "2001:db8::6801:e5ff:fe96:2d49".parse::<Ipv6Addr>().unwrap();
 
-        assert!(matches!(
-            error,
-            Result::Err(HwAddrParseError::InvalidAddress)
-        ));
+        let slaac = mac.calculate_slaac(prefix).unwrap();
+
+        assert_eq!(slaac, expected_ip);
     }
 
     #[test]
-    fn slaac() {
-        let mac = "6a01e5962d49".parse::<HwAddr>().unwrap();
-        let prefix = "2a04:9dc0:0:108";
+    fn test_prefix_with_double_colon() {
+        let mac = "6a:01:e5:96:2d:49".parse::<MacAddr6>().unwrap();
+        let prefix = "2a04:9dc0:0:108::";
 
         let expected_ip = "2a04:9dc0:0:108:6801:e5ff:fe96:2d49"
             .parse::<Ipv6Addr>()
@@ -247,16 +168,40 @@ mod test {
     }
 
     #[test]
-    fn mac_to_slaac() {
-        let mgmt_mac = "b0:7b:25:c8:f6:c0".parse::<HwAddr>().unwrap();
-        let prefix = "2602:FFE4:801:17";
+    fn test_invalid_prefix() {
+        let mac = "6a:01:e5:96:2d:49".parse::<MacAddr6>().unwrap();
+        let invalid_prefixes = vec![
+            "invalid_prefix",
+            "gggg::",
+            "2a04:9dc0:0:108:zzzz",
+            "1234:::",
+        ];
+
+        for prefix in invalid_prefixes {
+            let result = mac.calculate_slaac(prefix);
+            assert!(result.is_err(), "Prefix '{}' should be invalid", prefix);
+        }
+    }
 
-        let expected_ip = "2602:FFE4:801:17:6801:ff:feec:bd51"
-            .parse::<Ipv6Addr>()
-            .unwrap();
+    #[test]
+    fn test_all_zero_mac() {
+        let mac = "00:00:00:00:00:00".parse::<MacAddr6>().unwrap();
+        let prefix = "2001:db8::";
+
+        let expected_ip = "2001:db8::0200:ff:fe00:0".parse::<Ipv6Addr>().unwrap();
+
+        let slaac = mac.calculate_slaac(prefix).unwrap();
+
+        assert_eq!(slaac, expected_ip);
+    }
+
+    #[test]
+    fn test_all_one_mac() {
+        let mac = "ff:ff:ff:ff:ff:ff".parse::<MacAddr6>().unwrap();
+        let prefix = "2001:db8::";
+
+        let expected_ip = "2001:db8::fdff:ffff:feff:ffff".parse::<Ipv6Addr>().unwrap();
 
-        let mac =
-            calculate_deterministic_mac(mgmt_mac, Deployment::Mainnet, IpVariant::V6, 1).unwrap();
         let slaac = mac.calculate_slaac(prefix).unwrap();
 
         assert_eq!(slaac, expected_ip);
diff --git a/rs/ic_os/deterministic_ips/src/main.rs b/rs/ic_os/deterministic_ips/src/main.rs
index a699ad90537..fb158db779b 100644
--- a/rs/ic_os/deterministic_ips/src/main.rs
+++ b/rs/ic_os/deterministic_ips/src/main.rs
@@ -1,53 +1,38 @@
-use clap::{
-    builder::{EnumValueParser, TypedValueParser},
-    Parser, ValueEnum,
-};
-use deterministic_ips::{calculate_deterministic_mac, Deployment, HwAddr, IpVariant};
+use clap::Parser;
+use config_types::DeploymentEnvironment;
+use deterministic_ips::node_type::NodeType;
+use deterministic_ips::{calculate_deterministic_mac, IpVariant, MacAddr6Ext};
+use macaddr::MacAddr6;
 use std::net::Ipv6Addr;
 
-/// Map `Deployment` from `DeploymentArg` to avoid a dependency on `clap` in
-/// the lib.
-#[derive(Copy, Clone, ValueEnum)]
-enum DeploymentArg {
-    Mainnet,
-    Testnet,
-}
-
-impl From<DeploymentArg> for Deployment {
-    fn from(item: DeploymentArg) -> Self {
-        match item {
-            DeploymentArg::Mainnet => Deployment::Mainnet,
-            DeploymentArg::Testnet => Deployment::Testnet,
-        }
-    }
-}
-
-#[derive(Parser)]
 /// A small tool to generate the deterministic IP addresses used by IC-OS.
+#[derive(Parser)]
 struct Args {
     #[arg(long)]
     /// MAC address of the onboard IPMI.
-    mac: HwAddr,
+    mac: MacAddr6,
+
     #[arg(long)]
     /// IPv6 prefix for this DC.
     prefix: String,
-    #[arg(long, default_value_t = Deployment::Mainnet)]
-    #[arg(value_parser = EnumValueParser::new().map(|v: DeploymentArg| Deployment::from(v)))]
+
+    #[arg(long, default_value_t = DeploymentEnvironment::Mainnet)]
     /// Deployment type for this node.
-    deployment: Deployment,
-    #[arg(long)]
-    /// Index to use for MAC generation. If not specified, display IPs for HostOS and GuestOS.
-    index: Option<u8>,
+    deployment_environment: DeploymentEnvironment,
+
+    #[arg(short, long)]
+    /// Node type used for MAC generation. If not specified, display IPs for GuestOS and HostOS.
+    node_type: Option<NodeType>,
 }
 
 fn calculate_ip(
-    mac: HwAddr,
+    mac: MacAddr6,
     prefix: &str,
-    deployment: Deployment,
-    index: u8,
+    deployment_environment: DeploymentEnvironment,
+    node_type: NodeType,
 ) -> anyhow::Result<Ipv6Addr> {
     // For now, this tool only outputs IPv6
-    let mac = calculate_deterministic_mac(mac, deployment, IpVariant::V6, index)?;
+    let mac = calculate_deterministic_mac(&mac, deployment_environment, IpVariant::V6, node_type);
     let ip = mac.calculate_slaac(prefix)?;
 
     Ok(ip)
@@ -57,19 +42,19 @@ fn main() -> anyhow::Result<()> {
     let Args {
         mac,
         prefix,
-        deployment,
-        index,
+        deployment_environment,
+        node_type,
     } = Args::parse();
 
     // When given, only calculate one index
-    if let Some(index) = index {
-        let ip = calculate_ip(mac, &prefix, deployment, index)?;
+    if let Some(node_type) = node_type {
+        let ip = calculate_ip(mac, &prefix, deployment_environment, node_type)?;
 
         println!("IP: {}", ip);
     } else {
         // Otherwise, calculate and display for Guest and Host
-        let guest_ip = calculate_ip(mac, &prefix, deployment, 1)?;
-        let host_ip = calculate_ip(mac, &prefix, deployment, 0)?;
+        let guest_ip = calculate_ip(mac, &prefix, deployment_environment, NodeType::GuestOS)?;
+        let host_ip = calculate_ip(mac, &prefix, deployment_environment, NodeType::HostOS)?;
 
         println!("GuestOS IP: {}", guest_ip);
         println!("HostOS IP:  {}", host_ip);
diff --git a/rs/ic_os/deterministic_ips/src/node_type.rs b/rs/ic_os/deterministic_ips/src/node_type.rs
new file mode 100644
index 00000000000..0cd47ff5a37
--- /dev/null
+++ b/rs/ic_os/deterministic_ips/src/node_type.rs
@@ -0,0 +1,48 @@
+use anyhow::{anyhow, Error};
+use std::fmt;
+use std::str::FromStr;
+
+#[non_exhaustive]
+#[derive(Debug, Clone, Copy)]
+pub enum NodeType {
+    SetupOS,
+    HostOS,
+    GuestOS,
+    BoundaryOS,
+}
+
+impl NodeType {
+    pub fn to_index(&self) -> u8 {
+        match self {
+            NodeType::SetupOS => 0x0f,
+            NodeType::HostOS => 0x00,
+            NodeType::GuestOS => 0x01,
+            NodeType::BoundaryOS => 0x02,
+        }
+    }
+}
+
+impl fmt::Display for NodeType {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            NodeType::SetupOS => write!(f, "SetupOS"),
+            NodeType::HostOS => write!(f, "HostOS"),
+            NodeType::GuestOS => write!(f, "GuestOS"),
+            NodeType::BoundaryOS => write!(f, "BoundaryOS"),
+        }
+    }
+}
+
+impl FromStr for NodeType {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<NodeType, Self::Err> {
+        match s.to_lowercase().as_str() {
+            "setupos" => Ok(NodeType::SetupOS),
+            "hostos" => Ok(NodeType::HostOS),
+            "guestos" => Ok(NodeType::GuestOS),
+            "boundary" => Ok(NodeType::BoundaryOS),
+            _ => Err(anyhow!("Invalid node type: {}", s)),
+        }
+    }
+}
diff --git a/rs/ic_os/dev_test_tools/launch-single-vm/src/main.rs b/rs/ic_os/dev_test_tools/launch-single-vm/src/main.rs
index 935c46dd174..3fc52f3f1fb 100644
--- a/rs/ic_os/dev_test_tools/launch-single-vm/src/main.rs
+++ b/rs/ic_os/dev_test_tools/launch-single-vm/src/main.rs
@@ -69,17 +69,9 @@ fn main() {
     let test_name = "test_single_vm";
 
     let metadata = GroupMetadata {
-        user: Some(if let Ok(user) = std::env::var("HOSTUSER") {
-            user
-        } else {
-            "unknown".to_string()
-        }),
-        job_schedule: Some(if let Ok(ci_job_name) = std::env::var("CI_JOB_NAME") {
-            ci_job_name.to_string()
-        } else {
-            "manual".to_string()
-        }),
-        test_name: Some(test_name.to_string()),
+        user: std::env::var("HOSTUSER").unwrap_or("unknown".to_string()),
+        job_schedule: std::env::var("CI_JOB_NAME").unwrap_or("manual".to_string()),
+        test_name: test_name.to_string(),
     };
 
     let timestamp = std::time::SystemTime::now()
diff --git a/rs/ic_os/network/BUILD.bazel b/rs/ic_os/network/BUILD.bazel
index 155cd7b10b3..f5728b0620b 100644
--- a/rs/ic_os/network/BUILD.bazel
+++ b/rs/ic_os/network/BUILD.bazel
@@ -8,6 +8,7 @@ DEPENDENCIES = [
     "//rs/ic_os/deterministic_ips",
     "//rs/ic_os/utils",
     "@crate_index//:anyhow",
+    "@crate_index//:macaddr",
     "@crate_index//:ping",
     "@crate_index//:rayon",
     "@crate_index//:regex",
diff --git a/rs/ic_os/network/Cargo.toml b/rs/ic_os/network/Cargo.toml
index ce0cf072741..89da7366084 100644
--- a/rs/ic_os/network/Cargo.toml
+++ b/rs/ic_os/network/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 anyhow = { workspace = true }
 config_types = { path = "../config_types" }
 deterministic_ips = { path = "../deterministic_ips" }
+macaddr = { workspace = true }
 ping = { version = "^0.5.0" }
 rayon = { workspace = true }
 regex = { workspace = true }
diff --git a/rs/ic_os/network/src/lib.rs b/rs/ic_os/network/src/lib.rs
index 11a7154b33c..28a89d14a98 100644
--- a/rs/ic_os/network/src/lib.rs
+++ b/rs/ic_os/network/src/lib.rs
@@ -5,8 +5,9 @@ use anyhow::{Context, Result};
 use regex::Regex;
 
 use crate::systemd::generate_systemd_config_files;
-use deterministic_ips::HwAddr;
+use deterministic_ips::MacAddr6Ext;
 use info::NetworkInfo;
+use macaddr::MacAddr6;
 
 pub mod info;
 pub mod interfaces;
@@ -16,7 +17,7 @@ pub mod systemd;
 /// Requires superuser permissions to run `ipmitool` and write to the systemd directory
 pub fn generate_network_config(
     network_info: &NetworkInfo,
-    generated_mac: &HwAddr,
+    generated_mac: &MacAddr6,
     output_directory: &Path,
 ) -> Result<()> {
     eprintln!("Generating ipv6 address");
@@ -31,7 +32,7 @@ pub fn generate_network_config(
     )
 }
 
-pub fn resolve_mgmt_mac(config_mac: Option<String>) -> Result<HwAddr> {
+pub fn resolve_mgmt_mac(config_mac: Option<String>) -> Result<MacAddr6> {
     if let Some(config_mac) = config_mac {
         // Take MAC address override from config
         let mgmt_mac = config_mac.parse()?;
@@ -57,7 +58,7 @@ pub fn resolve_mgmt_mac(config_mac: Option<String>) -> Result<HwAddr> {
     }
 }
 
-fn parse_mac_address_from_ipmitool_output(output: &str) -> Result<HwAddr> {
+fn parse_mac_address_from_ipmitool_output(output: &str) -> Result<MacAddr6> {
     let mac_line = output
         .lines()
         .find(|line| line.trim().starts_with("MAC Address"))
diff --git a/rs/ic_os/network/src/systemd.rs b/rs/ic_os/network/src/systemd.rs
index 12375b9f7bd..05f050a722a 100644
--- a/rs/ic_os/network/src/systemd.rs
+++ b/rs/ic_os/network/src/systemd.rs
@@ -7,7 +7,7 @@ use anyhow::{Context, Result};
 
 use crate::info::NetworkInfo;
 use crate::interfaces::{get_interfaces, has_ipv6_connectivity, Interface};
-use deterministic_ips::HwAddr;
+use macaddr::MacAddr6;
 
 pub static DEFAULT_SYSTEMD_NETWORK_DIR: &str = "/run/systemd/network";
 
@@ -77,7 +77,7 @@ pub fn restart_systemd_networkd() {
 fn generate_and_write_systemd_files(
     output_directory: &Path,
     interface: &Interface,
-    generated_mac: Option<&HwAddr>,
+    generated_mac: Option<&MacAddr6>,
     ipv6_address: &str,
     ipv6_gateway: &str,
 ) -> Result<()> {
@@ -116,7 +116,7 @@ fn generate_and_write_systemd_files(
 pub fn generate_systemd_config_files(
     output_directory: &Path,
     network_info: &NetworkInfo,
-    generated_mac: Option<&HwAddr>,
+    generated_mac: Option<&MacAddr6>,
     ipv6_address: &Ipv6Addr,
 ) -> Result<()> {
     let mut interfaces = get_interfaces()?;
diff --git a/rs/ic_os/os_tools/hostos_tool/BUILD.bazel b/rs/ic_os/os_tools/hostos_tool/BUILD.bazel
index 5ae14a2851d..a53d5fa57f8 100644
--- a/rs/ic_os/os_tools/hostos_tool/BUILD.bazel
+++ b/rs/ic_os/os_tools/hostos_tool/BUILD.bazel
@@ -5,6 +5,7 @@ package(default_visibility = ["//rs:ic-os-pkg"])
 DEPENDENCIES = [
     # Keep sorted.
     "//rs/ic_os/config:config_lib",
+    "//rs/ic_os/config_types",
     "//rs/ic_os/deterministic_ips",
     "//rs/ic_os/network",
     "//rs/ic_os/utils",
diff --git a/rs/ic_os/os_tools/hostos_tool/Cargo.toml b/rs/ic_os/os_tools/hostos_tool/Cargo.toml
index f7036cb773e..42e7dd27e6d 100644
--- a/rs/ic_os/os_tools/hostos_tool/Cargo.toml
+++ b/rs/ic_os/os_tools/hostos_tool/Cargo.toml
@@ -11,6 +11,7 @@ path = "src/main.rs"
 anyhow = { workspace = true }
 clap = { workspace = true }
 config = { path = "../../config" }
+config_types = { path = "../../config_types" }
 network = { path = "../../network" }
 deterministic_ips = { path = "../../deterministic_ips" }
 utils = { path = "../../utils" }
diff --git a/rs/ic_os/os_tools/hostos_tool/src/main.rs b/rs/ic_os/os_tools/hostos_tool/src/main.rs
index 3de3af2aed9..3721c035b06 100644
--- a/rs/ic_os/os_tools/hostos_tool/src/main.rs
+++ b/rs/ic_os/os_tools/hostos_tool/src/main.rs
@@ -6,7 +6,8 @@ use clap::{Parser, Subcommand};
 use config::config_ini::config_map_from_path;
 use config::deployment_json::get_deployment_settings;
 use config::{DEFAULT_HOSTOS_CONFIG_INI_FILE_PATH, DEFAULT_HOSTOS_DEPLOYMENT_JSON_PATH};
-use deterministic_ips::{calculate_deterministic_mac, IpVariant};
+use deterministic_ips::node_type::NodeType;
+use deterministic_ips::{calculate_deterministic_mac, IpVariant, MacAddr6Ext};
 use network::info::NetworkInfo;
 use network::systemd::DEFAULT_SYSTEMD_NETWORK_DIR;
 use network::{generate_network_config, resolve_mgmt_mac};
@@ -21,14 +22,12 @@ pub enum Commands {
         output_directory: String,
     },
     GenerateIpv6Address {
-        // 0x0 corresponds to HostOS
-        #[arg(short, long, default_value = "0")]
-        node_type: u8,
+        #[arg(short, long, default_value_t = NodeType::HostOS)]
+        node_type: NodeType,
     },
     GenerateMacAddress {
-        // 0x0 corresponds to HostOS
-        #[arg(short, long, default_value = "0")]
-        node_type: u8,
+        #[arg(short, long, default_value_t = NodeType::HostOS)]
+        node_type: NodeType,
     },
     FetchMacAddress {},
 }
@@ -74,12 +73,13 @@ pub fn main() -> Result<()> {
             eprintln!("Deployment config: {:?}", deployment_settings);
 
             let mgmt_mac = resolve_mgmt_mac(deployment_settings.deployment.mgmt_mac)?;
+            let deployment_environment = deployment_settings.deployment.name.parse()?;
             let generated_mac = calculate_deterministic_mac(
-                mgmt_mac,
-                deployment_settings.deployment.name.parse()?,
+                &mgmt_mac,
+                deployment_environment,
                 IpVariant::V6,
-                0x0, /* 0x0 corresponds to HostOS */
-            )?;
+                NodeType::HostOS,
+            );
 
             generate_network_config(&network_info, &generated_mac, Path::new(&output_directory))
         }
@@ -101,12 +101,13 @@ pub fn main() -> Result<()> {
             eprintln!("Deployment config: {:?}", deployment_settings);
 
             let mgmt_mac = resolve_mgmt_mac(deployment_settings.deployment.mgmt_mac)?;
+            let deployment_environment = deployment_settings.deployment.name.parse()?;
             let generated_mac = calculate_deterministic_mac(
-                mgmt_mac,
-                deployment_settings.deployment.name.parse()?,
+                &mgmt_mac,
+                deployment_environment,
                 IpVariant::V6,
                 node_type,
-            )?;
+            );
             let ipv6_address = generated_mac.calculate_slaac(&network_info.ipv6_prefix)?;
             println!("{}", to_cidr(ipv6_address, network_info.ipv6_subnet));
             Ok(())
@@ -129,12 +130,13 @@ pub fn main() -> Result<()> {
             eprintln!("Deployment config: {:?}", deployment_settings);
 
             let mgmt_mac = resolve_mgmt_mac(deployment_settings.deployment.mgmt_mac)?;
+            let deployment_environment = deployment_settings.deployment.name.parse()?;
             let generated_mac = calculate_deterministic_mac(
-                mgmt_mac,
-                deployment_settings.deployment.name.parse()?,
+                &mgmt_mac,
+                deployment_environment,
                 IpVariant::V6,
                 node_type,
-            )?;
+            );
             println!("{}", generated_mac);
             Ok(())
         }
diff --git a/rs/ic_os/os_tools/setupos_tool/BUILD.bazel b/rs/ic_os/os_tools/setupos_tool/BUILD.bazel
index b5b76dacfca..d992c4f1bd1 100644
--- a/rs/ic_os/os_tools/setupos_tool/BUILD.bazel
+++ b/rs/ic_os/os_tools/setupos_tool/BUILD.bazel
@@ -5,6 +5,7 @@ package(default_visibility = ["//rs:ic-os-pkg"])
 DEPENDENCIES = [
     # Keep sorted.
     "//rs/ic_os/config:config_lib",
+    "//rs/ic_os/config_types",
     "//rs/ic_os/deterministic_ips",
     "//rs/ic_os/network",
     "//rs/ic_os/utils",
diff --git a/rs/ic_os/os_tools/setupos_tool/Cargo.toml b/rs/ic_os/os_tools/setupos_tool/Cargo.toml
index 5f63132abde..31faa749eef 100644
--- a/rs/ic_os/os_tools/setupos_tool/Cargo.toml
+++ b/rs/ic_os/os_tools/setupos_tool/Cargo.toml
@@ -11,6 +11,7 @@ path = "src/main.rs"
 anyhow = { workspace = true }
 clap = { workspace = true }
 config = { path = "../../config" }
+config_types = { path = "../../config_types" }
 network = { path = "../../network" }
 deterministic_ips = { path = "../../deterministic_ips" }
 utils = { path = "../../utils" }
diff --git a/rs/ic_os/os_tools/setupos_tool/src/main.rs b/rs/ic_os/os_tools/setupos_tool/src/main.rs
index be51c38a4ea..06eb78cbd9a 100644
--- a/rs/ic_os/os_tools/setupos_tool/src/main.rs
+++ b/rs/ic_os/os_tools/setupos_tool/src/main.rs
@@ -6,7 +6,8 @@ use clap::{Parser, Subcommand};
 use config::config_ini::config_map_from_path;
 use config::deployment_json::get_deployment_settings;
 use config::{DEFAULT_SETUPOS_CONFIG_INI_FILE_PATH, DEFAULT_SETUPOS_DEPLOYMENT_JSON_PATH};
-use deterministic_ips::{calculate_deterministic_mac, IpVariant};
+use deterministic_ips::node_type::NodeType;
+use deterministic_ips::{calculate_deterministic_mac, IpVariant, MacAddr6Ext};
 use network::info::NetworkInfo;
 use network::systemd::DEFAULT_SYSTEMD_NETWORK_DIR;
 use network::{generate_network_config, resolve_mgmt_mac};
@@ -21,9 +22,8 @@ pub enum Commands {
         output_directory: String,
     },
     GenerateIpv6Address {
-        // 0xf corresponds to SetupOS
-        #[arg(short, long, default_value = "0xf")]
-        node_type: u8,
+        #[arg(short, long, default_value_t = NodeType::SetupOS)]
+        node_type: NodeType,
     },
 }
 
@@ -67,12 +67,13 @@ pub fn main() -> Result<()> {
             eprintln!("Deployment config: {:?}", deployment_settings);
 
             let mgmt_mac = resolve_mgmt_mac(deployment_settings.deployment.mgmt_mac)?;
+            let deployment_environment = deployment_settings.deployment.name.parse()?;
             let generated_mac = calculate_deterministic_mac(
-                mgmt_mac,
-                deployment_settings.deployment.name.parse()?,
+                &mgmt_mac,
+                deployment_environment,
                 IpVariant::V6,
-                0xf, /* 0xf corresponds to SetupOS */
-            )?;
+                NodeType::SetupOS,
+            );
             eprintln!("Using generated mac (unformatted) {}", generated_mac);
 
             generate_network_config(&network_info, &generated_mac, Path::new(&output_directory))
@@ -95,12 +96,13 @@ pub fn main() -> Result<()> {
             eprintln!("Deployment config: {:?}", deployment_settings);
 
             let mgmt_mac = resolve_mgmt_mac(deployment_settings.deployment.mgmt_mac)?;
+            let deployment_environment = deployment_settings.deployment.name.parse()?;
             let generated_mac = calculate_deterministic_mac(
-                mgmt_mac,
-                deployment_settings.deployment.name.parse()?,
+                &mgmt_mac,
+                deployment_environment,
                 IpVariant::V6,
                 node_type,
-            )?;
+            );
             let ipv6_address = generated_mac.calculate_slaac(&network_info.ipv6_prefix)?;
             println!("{}", to_cidr(ipv6_address, network_info.ipv6_subnet));
             Ok(())
diff --git a/rs/interfaces/src/execution_environment.rs b/rs/interfaces/src/execution_environment.rs
index 5e7297f5fae..a89b81ae2e9 100644
--- a/rs/interfaces/src/execution_environment.rs
+++ b/rs/interfaces/src/execution_environment.rs
@@ -1254,7 +1254,7 @@ pub trait Scheduler: Send {
         &self,
         state: Self::State,
         randomness: Randomness,
-        idkg_subnet_public_keys: BTreeMap<MasterPublicKeyId, MasterPublicKey>,
+        chain_key_subnet_public_keys: BTreeMap<MasterPublicKeyId, MasterPublicKey>,
         idkg_pre_signature_ids: BTreeMap<MasterPublicKeyId, BTreeSet<PreSigId>>,
         replica_version: &ReplicaVersion,
         current_round: ExecutionRound,
diff --git a/rs/ledger_suite/tests/sm-tests/src/in_memory_ledger.rs b/rs/ledger_suite/tests/sm-tests/src/in_memory_ledger.rs
index 0c7ad18b811..cd9ecaa4126 100644
--- a/rs/ledger_suite/tests/sm-tests/src/in_memory_ledger.rs
+++ b/rs/ledger_suite/tests/sm-tests/src/in_memory_ledger.rs
@@ -13,6 +13,7 @@ use icp_ledger::AccountIdentifier;
 use icrc_ledger_types::icrc1::account::Account;
 use std::collections::HashMap;
 use std::hash::Hash;
+use std::time::SystemTime;
 
 #[cfg(test)]
 mod tests;
@@ -699,6 +700,14 @@ where
                 actual_balance
             );
         }
+        let mut expiration_in_future_count = 0;
+        let mut expiration_in_past_count = 0;
+        let mut no_expiration_count = 0;
+        let timestamp = env
+            .time()
+            .duration_since(SystemTime::UNIX_EPOCH)
+            .unwrap()
+            .as_nanos() as u64;
         for (approval, allowance) in self.allowances.iter() {
             let (from, spender): (AccountId, AccountId) = approval.clone().into();
             assert!(
@@ -708,6 +717,18 @@ where
                 &spender
             );
             let actual_allowance = AccountId::get_allowance(env, ledger_id, from, spender);
+            match actual_allowance.expires_at {
+                None => {
+                    no_expiration_count += 1;
+                }
+                Some(expires_at) => {
+                    if expires_at > timestamp {
+                        expiration_in_future_count += 1;
+                    } else {
+                        expiration_in_past_count += 1;
+                    }
+                }
+            }
             assert_eq!(
                 allowance.amount,
                 Tokens::try_from(actual_allowance.allowance.clone()).unwrap(),
@@ -718,7 +739,22 @@ where
                 allowance,
                 actual_allowance
             );
+            assert_eq!(
+                allowance.expires_at.map(|t| t.as_nanos_since_unix_epoch()),
+                actual_allowance.expires_at,
+                "Mismatch in allowance expiration for approval from {:?} spender {:?}: {:?} ({:?} vs {:?}) at {:?}",
+                &from,
+                &spender,
+                approval,
+                allowance,
+                actual_allowance,
+                env.time()
+            );
         }
+        println!(
+            "allowances with no expiration: {}, expiration in future: {}, expiration in past: {}",
+            no_expiration_count, expiration_in_future_count, expiration_in_past_count
+        );
     }
 }
 
diff --git a/rs/messaging/src/message_routing/tests.rs b/rs/messaging/src/message_routing/tests.rs
index 862a07f2303..dbb09e70de4 100644
--- a/rs/messaging/src/message_routing/tests.rs
+++ b/rs/messaging/src/message_routing/tests.rs
@@ -1038,7 +1038,7 @@ fn try_read_registry_succeeds_with_fully_specified_registry_records() {
             requires_full_state_hash: false,
             messages: BatchMessages::default(),
             randomness: Randomness::new([123; 32]),
-            idkg_subnet_public_keys: BTreeMap::default(),
+            chain_key_subnet_public_keys: BTreeMap::default(),
             idkg_pre_signature_ids: BTreeMap::new(),
             registry_version: fixture.registry.get_latest_version(),
             time: Time::from_nanos_since_unix_epoch(0),
@@ -1838,7 +1838,7 @@ fn process_batch_updates_subnet_metrics() {
             requires_full_state_hash: false,
             messages: BatchMessages::default(),
             randomness: Randomness::new([123; 32]),
-            idkg_subnet_public_keys: BTreeMap::default(),
+            chain_key_subnet_public_keys: BTreeMap::default(),
             idkg_pre_signature_ids: BTreeMap::new(),
             registry_version: fixture.registry.get_latest_version(),
             time: Time::from_nanos_since_unix_epoch(0),
diff --git a/rs/messaging/src/state_machine.rs b/rs/messaging/src/state_machine.rs
index 952c90e4f80..1a0533276fc 100644
--- a/rs/messaging/src/state_machine.rs
+++ b/rs/messaging/src/state_machine.rs
@@ -168,7 +168,7 @@ impl StateMachine for StateMachineImpl {
         let state_after_execution = self.scheduler.execute_round(
             state_with_messages,
             batch.randomness,
-            batch.idkg_subnet_public_keys,
+            batch.chain_key_subnet_public_keys,
             batch.idkg_pre_signature_ids,
             &batch.replica_version,
             ExecutionRound::from(batch.batch_number.get()),
diff --git a/rs/messaging/src/state_machine/tests.rs b/rs/messaging/src/state_machine/tests.rs
index 9140afb34be..235633b11c0 100644
--- a/rs/messaging/src/state_machine/tests.rs
+++ b/rs/messaging/src/state_machine/tests.rs
@@ -34,7 +34,7 @@ mock! {
             &self,
             state: ic_replicated_state::ReplicatedState,
             randomness: ic_types::Randomness,
-            idkg_subnet_public_keys: BTreeMap<MasterPublicKeyId, MasterPublicKey>,
+            chain_key_subnet_public_keys: BTreeMap<MasterPublicKeyId, MasterPublicKey>,
             idkg_pre_signature_ids: BTreeMap<MasterPublicKeyId, BTreeSet<PreSigId>>,
             replica_version: &ReplicaVersion,
             current_round: ExecutionRound,
@@ -91,7 +91,7 @@ fn test_fixture(provided_batch: &Batch) -> StateMachineTestFixture {
         .with(
             always(),
             eq(provided_batch.randomness),
-            eq(provided_batch.idkg_subnet_public_keys.clone()),
+            eq(provided_batch.chain_key_subnet_public_keys.clone()),
             eq(provided_batch.idkg_pre_signature_ids.clone()),
             eq(provided_batch.replica_version.clone()),
             eq(round),
diff --git a/rs/messaging/tests/queue_tests.rs b/rs/messaging/tests/queue_tests.rs
index 756130c24a7..a800f92b97f 100644
--- a/rs/messaging/tests/queue_tests.rs
+++ b/rs/messaging/tests/queue_tests.rs
@@ -17,7 +17,7 @@ use ic_types::{
 use maplit::btreemap;
 use std::collections::BTreeSet;
 use std::sync::Arc;
-use xnet_test::Metrics;
+use xnet_test::{Metrics, StartArgs};
 
 const MAX_TICKS: u64 = 100;
 
@@ -96,14 +96,14 @@ impl SubnetPairProxy {
         payload_size_bytes: u64,
     ) -> Result<Vec<u8>, candid::Error> {
         let network_topology = vec![
-            vec![self.local_canister_id.get().to_vec()],
-            vec![self.remote_canister_id.get().to_vec()],
+            vec![self.local_canister_id.get().into()],
+            vec![self.remote_canister_id.get().into()],
         ];
-        Encode!(
-            &network_topology,
-            &canister_to_subnet_rate,
-            &payload_size_bytes
-        )
+        Encode!(&StartArgs {
+            network_topology,
+            canister_to_subnet_rate,
+            payload_size_bytes,
+        })
     }
 
     /// Calls the 'start' method on the local canister.
@@ -339,7 +339,7 @@ fn call_stop_on_xnet_canister(
     env: &StateMachine,
     canister_id: CanisterId,
 ) -> Result<(), UserError> {
-    let wasm = env.execute_ingress(canister_id, "stop", Vec::new())?;
+    let wasm = env.execute_ingress(canister_id, "stop", Encode!().unwrap())?;
     assert_eq!(
         "stopped".to_string(),
         Decode!(&wasm.bytes(), String).unwrap()
@@ -457,7 +457,9 @@ fn test_response_in_output_queue_causes_backpressure() {
     // reporting call errors, indicating back pressure.
     do_until_or_panic(MAX_TICKS, |_| {
         execute_round_with_timeout(&subnets.local_env);
-        let reply = subnets.query_local_canister("metrics", Vec::new()).unwrap();
+        let reply = subnets
+            .query_local_canister("metrics", Encode!().unwrap())
+            .unwrap();
         Ok(Decode!(&reply.bytes(), Metrics).unwrap().call_errors > 0)
     })
     .unwrap();
@@ -500,7 +502,9 @@ fn test_reservations_do_not_inhibit_xnet_induction_of_requests() {
         .unwrap();
     do_until_or_panic(MAX_TICKS, |_| {
         subnets.local_env.tick();
-        let reply = subnets.query_local_canister("metrics", Vec::new()).unwrap();
+        let reply = subnets
+            .query_local_canister("metrics", Encode!().unwrap())
+            .unwrap();
         Ok(Decode!(&reply.bytes(), Metrics).unwrap().call_errors > 0)
     })
     .unwrap();
@@ -511,7 +515,7 @@ fn test_reservations_do_not_inhibit_xnet_induction_of_requests() {
     do_until_or_panic(MAX_TICKS, |_| {
         subnets.remote_env.tick();
         let reply = subnets
-            .query_remote_canister("metrics", Vec::new())
+            .query_remote_canister("metrics", Encode!().unwrap())
             .unwrap();
         Ok(Decode!(&reply.bytes(), Metrics).unwrap().call_errors > 0)
     })
@@ -520,13 +524,13 @@ fn test_reservations_do_not_inhibit_xnet_induction_of_requests() {
     // Try inducting all the requests successfully sent by the remote canister into
     // the local canister.
     let reply = subnets
-        .query_remote_canister("metrics", Vec::new())
+        .query_remote_canister("metrics", Encode!().unwrap())
         .unwrap();
     let metrics = Decode!(&reply.bytes(), Metrics).unwrap();
     induct_from_head_of_stream(
         &subnets.remote_env,
         &subnets.local_env,
-        Some(metrics.requests_sent),
+        Some(metrics.requests_sent()),
     )
     .unwrap();
 
@@ -539,7 +543,10 @@ fn test_reservations_do_not_inhibit_xnet_induction_of_requests() {
         "type".to_string() => "request".to_string()
     });
 
-    assert_eq!(metrics.requests_sent, *requests_inducted.unwrap() as usize);
+    assert_eq!(
+        metrics.requests_sent(),
+        *requests_inducted.unwrap() as usize
+    );
 }
 
 /// Snapshot of a message in a stream or a queue that includes only the message variant and the callback id.
diff --git a/rs/nervous_system/long_message/BUILD.bazel b/rs/nervous_system/long_message/BUILD.bazel
new file mode 100644
index 00000000000..5b8d003a080
--- /dev/null
+++ b/rs/nervous_system/long_message/BUILD.bazel
@@ -0,0 +1,75 @@
+load("@rules_rust//rust:defs.bzl", "rust_library")
+load("//bazel:canisters.bzl", "rust_canister")
+load("//bazel:defs.bzl", "rust_ic_test_suite")
+
+package(default_visibility = ["//rs/nervous_system:default_visibility"])
+
+DEPENDENCIES = [
+    "@crate_index//:ic-cdk",
+    "@crate_index//:candid",
+    "@crate_index//:serde",
+    # Keep sorted.
+] + select({
+    "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+    "//conditions:default": [
+        # Keep sorted.
+        "//rs/nervous_system/temporary",
+    ],
+})
+
+DEV_DEPENDENCIES = DEPENDENCIES + [
+    # Keep sorted.
+    "//rs/registry/subnet_type",
+    "//rs/types/types",
+    "@crate_index//:ic-cdk-timers",
+] + select({
+    "@rules_rust//rust/platform:wasm32-unknown-unknown": [],
+    "//conditions:default": [
+        # Keep sorted.
+        "//rs/config",
+        "//rs/nns/test_utils",
+        "//rs/rust_canisters/canister_test",
+        "//rs/state_machine_tests",
+    ],
+})
+
+LIB_SRCS = glob(
+    ["src/**"],
+    exclude = ["src/**/*tests.rs"],
+)
+
+DEV_DATA = [
+    ":long-message-canister",
+]
+
+DEV_ENV = {
+    "LONG_MESSAGE_CANISTER_WASM_PATH": "$(rootpath :long-message-canister)",
+}
+
+rust_library(
+    name = "long_message",
+    srcs = LIB_SRCS,
+    crate_name = "ic_nervous_system_long_message",
+    version = "0.0.1",
+    deps = DEPENDENCIES,
+)
+
+rust_ic_test_suite(
+    name = "long_message_test",
+    srcs = glob(
+        ["tests/**/*.rs"],
+        exclude = ["tests/test_canisters/*.rs"],
+    ),
+    data = DEV_DATA,
+    env = DEV_ENV,
+    deps = DEV_DEPENDENCIES,
+)
+
+rust_canister(
+    name = "long-message-canister",
+    testonly = True,
+    srcs = ["tests/test_canisters/long_message_canister.rs"],
+    proc_macro_deps = [],
+    service_file = ":tests/test_canisters/empty.did",
+    deps = DEV_DEPENDENCIES + [":long_message"],
+)
diff --git a/rs/nervous_system/long_message/Cargo.toml b/rs/nervous_system/long_message/Cargo.toml
new file mode 100644
index 00000000000..35f9ba449e8
--- /dev/null
+++ b/rs/nervous_system/long_message/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "ic-nervous-system-long-message"
+version = "0.0.1"
+edition = "2021"
+
+[[bin]]
+name = "long-message-canister"
+path = "tests/test_canisters/long_message_canister.rs"
+
+[dependencies]
+ic-cdk = { workspace = true }
+ic-cdk-timers = { workspace = true }
+candid = { workspace = true }
+serde = { workspace = true }
+
+[dev-dependencies]
+ic-types = { path = "../../types/types" }
+ic-cdk-timers = { workspace = true }
+ic-registry-subnet-type = { path = "../../registry/subnet_type" }
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+ic-nervous-system-temporary = { path = "../../nervous_system/temporary" }
+ic-state-machine-tests = { path = "../../state_machine_tests" }
+ic-nns-test-utils = { path = "../../nns/test_utils" }
+canister-test = { path = "../../rust_canisters/canister_test" }
+dfn_candid = { path = "../../rust_canisters/dfn_candid" }
+ic-config = { path = "../../config" }
diff --git a/rs/nervous_system/long_message/src/lib.rs b/rs/nervous_system/long_message/src/lib.rs
new file mode 100644
index 00000000000..01a20974fbb
--- /dev/null
+++ b/rs/nervous_system/long_message/src/lib.rs
@@ -0,0 +1,100 @@
+#[cfg(target_arch = "wasm32")]
+use ic_cdk::api::{call_context_instruction_counter, instruction_counter};
+use ic_cdk::query;
+
+#[cfg(not(target_arch = "wasm32"))]
+use ic_nervous_system_temporary::Temporary;
+#[cfg(not(target_arch = "wasm32"))]
+use std::cell::{Cell, RefCell};
+
+#[query(hidden = true)]
+fn __long_message_noop() {
+    // This function is used to break the message into smaller parts
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+thread_local! {
+    static TEST_THRESHOLD_CALL_COUNTER: RefCell<u64> = const { RefCell::new(0) };
+    static TEST_CALL_CONTEXT_OVER_LIMIT: Cell<bool> = const { Cell::new(false) };
+}
+
+#[allow(dead_code)]
+#[cfg(not(target_arch = "wasm32"))]
+pub fn in_test_temporarily_set_call_context_over_threshold() -> Temporary {
+    Temporary::new(&TEST_CALL_CONTEXT_OVER_LIMIT, true)
+}
+
+/// Returns true if call context is over the threshold provided.
+/// In non-wasm32 environments, this can be set to true with
+/// `in_test_temporarily_set_call_context_over_threshold`.
+#[cfg(not(target_arch = "wasm32"))]
+fn is_call_context_over_threshold(_call_context_threshold: u64) -> bool {
+    TEST_CALL_CONTEXT_OVER_LIMIT.with(|c| c.get())
+}
+
+/// Returns true if call context is over the threshold provided.
+/// In wasm32 environments, we check the call_context_instruction_counter to see if we are over the threshold.
+/// Note, this threshold is not for each individual message, but for all the messages executed
+/// in this call context.  
+#[cfg(target_arch = "wasm32")]
+fn is_call_context_over_threshold(call_context_threshold: u64) -> bool {
+    let total_instructions_used = call_context_instruction_counter();
+    total_instructions_used > call_context_threshold
+}
+
+/// In non-wasm environments, no call can be made, so this function does nothing in test environments.
+#[cfg(not(target_arch = "wasm32"))]
+async fn make_noop_call() {}
+
+/// Makes a call to a no-op function defined in this library.
+#[cfg(target_arch = "wasm32")]
+async fn make_noop_call() {
+    () = ic_cdk::call(ic_cdk::id(), "__long_message_noop", ())
+        .await
+        .unwrap();
+}
+
+/// In non-wasm environments, this alternates returning true or false every other time it's called.
+#[cfg(not(target_arch = "wasm32"))]
+pub fn is_message_over_threshold(_message_threshold: u64) -> bool {
+    TEST_THRESHOLD_CALL_COUNTER.with(|c| {
+        *c.borrow_mut() += 1;
+        *c.borrow() % 2 == 0
+    })
+}
+
+/// Returns true if the message is over the specified instruction threshold
+#[cfg(target_arch = "wasm32")]
+pub fn is_message_over_threshold(instructions_threshold: u64) -> bool {
+    let instructions_used = instruction_counter();
+    // ic_cdk::println!("Instruction counter: {}", instructions_used);
+    instructions_used >= instructions_threshold
+}
+
+/// Breaks the message into smaller parts if the number of instructions used
+/// exceeds the given threshold.
+/// The upper bound is used to determine the maximum number of instructions
+/// that can be used in a single call context, split across any number of messages.
+///
+/// Note: Caller is responsible for validity of references across message bounds.  This could be
+/// dangerous in places where global state is being referenced.
+///
+/// # Panics if the number of instructions used exceeds the given panic threshold.
+pub async fn noop_self_call_if_over_instructions(
+    message_threshold: u64,
+    panic_threshold: Option<u64>,
+) {
+    // first we check the upper bound to see if we should panic.
+    if let Some(upper_bound) = panic_threshold {
+        if is_call_context_over_threshold(upper_bound) {
+            panic!(
+                "Canister call exceeded the limit of {} instructions in the call context.",
+                upper_bound
+            );
+        }
+    }
+
+    if is_message_over_threshold(message_threshold) {
+        make_noop_call().await;
+    }
+}
diff --git a/rs/nervous_system/long_message/tests/test_canisters/empty.did b/rs/nervous_system/long_message/tests/test_canisters/empty.did
new file mode 100644
index 00000000000..6ce836454a9
--- /dev/null
+++ b/rs/nervous_system/long_message/tests/test_canisters/empty.did
@@ -0,0 +1 @@
+service : {}
\ No newline at end of file
diff --git a/rs/nervous_system/long_message/tests/test_canisters/long_message_canister.rs b/rs/nervous_system/long_message/tests/test_canisters/long_message_canister.rs
new file mode 100644
index 00000000000..9e061500559
--- /dev/null
+++ b/rs/nervous_system/long_message/tests/test_canisters/long_message_canister.rs
@@ -0,0 +1,52 @@
+use candid::CandidType;
+use ic_cdk::{init, update};
+use ic_nervous_system_long_message::noop_self_call_if_over_instructions;
+use serde::Deserialize;
+
+#[init]
+fn canister_init() {}
+
+#[derive(CandidType, Deserialize)]
+struct BreakMessageParams {
+    pub use_break: bool,
+    pub message_threshold: u64,
+    pub upper_bound: Option<u64>,
+}
+
+fn fib(n: u64) -> u64 {
+    if n <= 1 {
+        n
+    } else {
+        fib(n - 1) + fib(n - 2)
+    }
+}
+
+#[update]
+async fn test_next_message_if_over_instructions(params: BreakMessageParams) {
+    // Just processing a message costs 30k instructions
+    // each fib(17) costs about 80k instructions
+    // so if we do that 10x, it's about 830k instructions.
+    // The test setup for this canister allows for 500k instructions per message.
+
+    let BreakMessageParams {
+        use_break,
+        message_threshold,
+        upper_bound,
+    } = params;
+
+    // Doing anything costs about 30k instructions.
+    for _x in 0..10 {
+        // println!("Invocation number {}", x);
+        // println!(
+        //     "Instruction_counter: {}",
+        //     ic_cdk::api::instruction_counter()
+        // );
+        // Fib(17) was benchmarked at about 80k instructions
+        fib(17);
+        if use_break {
+            noop_self_call_if_over_instructions(message_threshold, upper_bound).await;
+        }
+    }
+}
+
+fn main() {}
diff --git a/rs/nervous_system/long_message/tests/test_message_breaks.rs b/rs/nervous_system/long_message/tests/test_message_breaks.rs
new file mode 100644
index 00000000000..7b586c1db92
--- /dev/null
+++ b/rs/nervous_system/long_message/tests/test_message_breaks.rs
@@ -0,0 +1,127 @@
+use candid::CandidType;
+use canister_test::Project;
+use ic_config::subnet_config::SubnetConfig;
+use ic_nns_test_utils::state_test_helpers::{create_canister, update_with_sender};
+use ic_registry_subnet_type::SubnetType;
+use ic_state_machine_tests::{StateMachine, StateMachineBuilder, StateMachineConfig};
+use ic_types::{NumInstructions, PrincipalId};
+use serde::Deserialize;
+
+#[derive(CandidType, Deserialize)]
+struct BreakMessageParams {
+    pub use_break: bool,
+    pub message_threshold: u64,
+    pub upper_bound: Option<u64>,
+}
+
+fn state_machine_for_test(instructions_limit: u64) -> StateMachine {
+    let mut hypervisor_config = ic_config::execution_environment::Config::default();
+    let mut subnet_config = SubnetConfig::new(SubnetType::System);
+
+    let instruction_limit = NumInstructions::new(instructions_limit);
+    if instruction_limit > subnet_config.scheduler_config.max_instructions_per_round {
+        subnet_config.scheduler_config.max_instructions_per_round = instruction_limit;
+    }
+    subnet_config.scheduler_config.max_instructions_per_message = instruction_limit;
+    subnet_config
+        .scheduler_config
+        .max_instructions_per_message_without_dts = instruction_limit;
+    hypervisor_config.max_query_call_graph_instructions = instruction_limit;
+
+    StateMachineBuilder::new()
+        .with_config(Some(StateMachineConfig::new(
+            subnet_config,
+            hypervisor_config,
+        )))
+        .build()
+}
+
+#[test]
+fn test_next_message_if_over_instructions() {
+    let instructions_limit = 500_000;
+    let state_machine = state_machine_for_test(instructions_limit);
+
+    let long_message_wasm = Project::cargo_bin_maybe_from_env("long-message-canister", &[]);
+
+    let canister_id = create_canister(&state_machine, long_message_wasm, Some(vec![]), None);
+
+    let err: String = update_with_sender::<BreakMessageParams, ()>(
+        &state_machine,
+        canister_id,
+        "test_next_message_if_over_instructions",
+        BreakMessageParams {
+            use_break: false,
+            message_threshold: instructions_limit * 4 / 5,
+            upper_bound: None,
+        },
+        PrincipalId::new_anonymous(),
+    )
+    .unwrap_err();
+    assert!(err.contains(
+        format!(
+            "Canister exceeded the limit of {} instructions",
+            instructions_limit
+        )
+        .as_str()
+    ));
+
+    update_with_sender::<BreakMessageParams, ()>(
+        &state_machine,
+        canister_id,
+        "test_next_message_if_over_instructions",
+        BreakMessageParams {
+            use_break: true,
+            message_threshold: instructions_limit * 4 / 5,
+            upper_bound: None,
+        },
+        PrincipalId::new_anonymous(),
+    )
+    .unwrap();
+}
+
+#[test]
+fn test_upper_bound() {
+    let instructions_limit = 1_000_000;
+    let state_machine = state_machine_for_test(instructions_limit);
+
+    let long_message_wasm = Project::cargo_bin_maybe_from_env("long-message-canister", &[]);
+
+    let canister_id = create_canister(&state_machine, long_message_wasm, Some(vec![]), None);
+
+    let err: String = update_with_sender::<BreakMessageParams, ()>(
+        &state_machine,
+        canister_id,
+        "test_next_message_if_over_instructions",
+        BreakMessageParams {
+            use_break: true,
+            message_threshold: 400_000,
+            upper_bound: Some(700_000),
+        },
+        PrincipalId::new_anonymous(),
+    )
+    .unwrap_err();
+    assert!(
+        err.contains(
+            format!(
+                "Canister call exceeded the limit of {} instructions in the call context.",
+                700_000
+            )
+            .as_str()
+        ),
+        "Error was: {:?}",
+        err
+    );
+
+    update_with_sender::<BreakMessageParams, ()>(
+        &state_machine,
+        canister_id,
+        "test_next_message_if_over_instructions",
+        BreakMessageParams {
+            use_break: true,
+            message_threshold: instructions_limit * 4 / 5,
+            upper_bound: None,
+        },
+        PrincipalId::new_anonymous(),
+    )
+    .unwrap();
+}
diff --git a/rs/nervous_system/string/src/lib.rs b/rs/nervous_system/string/src/lib.rs
index 1c005288891..48357722afe 100644
--- a/rs/nervous_system/string/src/lib.rs
+++ b/rs/nervous_system/string/src/lib.rs
@@ -1,25 +1,40 @@
 use std::fmt::Debug;
 
-/// Returns a possibly modified version of s that fits within the specified bounds.
+/// Returns a possibly modified version of `s` that fits within the specified bounds (in terms of
+/// the number of UTF-8 characters).
 ///
-/// More precisely, middle characters are removed such that the return value is at most max_len.
+/// More precisely, middle characters are removed such that the return value has at most `max_len`
+/// characters. Some examples:
+/// ```
+/// println!("{}", clamp_string_len("abcdef", 5));  // a...f
+/// println!("{}", clamp_string_len("abcde", 5));   // abcde
+/// println!("{}", clamp_string_len("abcd", 5));    // abcd
+/// ```
 ///
 /// This is analogous clamp method on numeric types in that this makes the value bounded.
 pub fn clamp_string_len(s: &str, max_len: usize) -> String {
-    if s.len() <= max_len {
-        return s.to_string();
+    // Collect into a vector so that we can safely index the input.
+    let chars: Vec<_> = s.chars().collect();
+    if max_len <= 3 {
+        return chars.into_iter().take(max_len).collect();
     }
 
-    if max_len <= 3 {
-        return s[0..max_len].to_string();
+    if chars.len() <= max_len {
+        return s.to_string();
     }
 
-    let content_len = max_len - 3;
+    let ellipsis = "...";
+    let content_len = max_len - ellipsis.len();
     let tail_len = content_len / 2;
     let head_len = content_len - tail_len;
+    let tail_begin = chars.len() - tail_len;
 
-    let tail_begin = s.len() - tail_len;
-    format!("{}...{}", &s[0..head_len], &s[tail_begin..s.len()])
+    format!(
+        "{}{}{}",
+        chars[..head_len].iter().collect::<String>(),
+        ellipsis,
+        chars[tail_begin..].iter().collect::<String>(),
+    )
 }
 
 pub fn clamp_debug_len(object: &impl Debug, max_len: usize) -> String {
diff --git a/rs/nervous_system/string/src/tests.rs b/rs/nervous_system/string/src/tests.rs
index dc82f51c436..2f1340879e3 100644
--- a/rs/nervous_system/string/src/tests.rs
+++ b/rs/nervous_system/string/src/tests.rs
@@ -12,11 +12,43 @@ fn test_clamp_string_len() {
     assert_eq!(&clamp_string_len("123456789", 7), "12...89");
     assert_eq!(&clamp_string_len("123456789", 8), "123...89");
     assert_eq!(&clamp_string_len("123456789", 9), "123456789");
-
     assert_eq!(&clamp_string_len("123456789", 10), "123456789");
     assert_eq!(&clamp_string_len("123456789", 11), "123456789");
 }
 
+#[test]
+fn test_clamp_string_corner_cases() {
+    for (s, max_len, expected) in [
+        ("abcdef", usize::MAX, "abcdef"),
+        ("abcdef", 10, "abcdef"),
+        ("abcdef", 5, "a...f"),
+        ("abcde", 5, "abcde"),
+        ("abcd", 5, "abcd"),
+        ("abcde", 4, "a..."),
+        ("abcd", 4, "abcd"),
+        ("abcd", 3, "abc"),
+        ("abcd", 2, "ab"),
+        ("abcd", 1, "a"),
+        ("abcd", 0, ""),
+        ("", 5, ""),
+        ("", 0, ""),
+        ("\u{200D}\u{200D}\u{200D}", 2, "\u{200d}\u{200d}"),
+        ("🙂🗜🌟🚀", 4, "🙂🗜🌟🚀"),
+        ("🙂🗜🌟🚀", 3, "🙂🗜🌟"),
+        ("🙂🗜🌟🚀", 2, "🙂🗜"),
+        ("🙂🗜🌟🚀", 1, "🙂"),
+        ("你好, 世界", 5, "你...界"),
+    ] {
+        assert_eq!(
+            clamp_string_len(s, max_len),
+            expected.to_string(),
+            "clamp_string_len({}, {}) returned an unexpected value.",
+            s,
+            max_len,
+        );
+    }
+}
+
 #[test]
 fn test_clamp_debug_len() {
     #[allow(unused)] // Because Rust does not count Debug as a real user of the `i` field.
diff --git a/rs/nns/governance/canbench/canbench_results.yml b/rs/nns/governance/canbench/canbench_results.yml
index fef34b3fb7c..c63d6d25ede 100644
--- a/rs/nns/governance/canbench/canbench_results.yml
+++ b/rs/nns/governance/canbench/canbench_results.yml
@@ -55,31 +55,31 @@ benches:
     scopes: {}
   compute_ballots_for_new_proposal_with_stable_neurons:
     total:
-      instructions: 1808724
+      instructions: 1790000
       heap_increase: 0
       stable_memory_increase: 0
     scopes: {}
   list_neurons_ready_to_unstake_maturity_heap:
     total:
-      instructions: 470604
+      instructions: 471240
       heap_increase: 0
       stable_memory_increase: 0
     scopes: {}
   list_neurons_ready_to_unstake_maturity_stable:
     total:
-      instructions: 730635390
+      instructions: 36291394
       heap_increase: 0
       stable_memory_increase: 0
     scopes: {}
   list_ready_to_spawn_neuron_ids_heap:
     total:
-      instructions: 461375
+      instructions: 459353
       heap_increase: 0
       stable_memory_increase: 0
     scopes: {}
   list_ready_to_spawn_neuron_ids_stable:
     total:
-      instructions: 730625425
+      instructions: 36280095
       heap_increase: 0
       stable_memory_increase: 0
     scopes: {}
@@ -91,7 +91,7 @@ benches:
     scopes: {}
   neuron_metrics_calculation_stable:
     total:
-      instructions: 1842928
+      instructions: 1890000
       heap_increase: 0
       stable_memory_increase: 0
     scopes: {}
diff --git a/rs/nns/governance/canister/canister.rs b/rs/nns/governance/canister/canister.rs
index a37ab0c70f7..4e4d88a1e98 100644
--- a/rs/nns/governance/canister/canister.rs
+++ b/rs/nns/governance/canister/canister.rs
@@ -3,8 +3,8 @@ use candid::{candid_method, Decode, Encode};
 use ic_base_types::{CanisterId, PrincipalId};
 use ic_canisters_http_types::{HttpRequest, HttpResponse, HttpResponseBuilder};
 use ic_cdk::{
-    api::call::arg_data_raw, caller as ic_cdk_caller, heartbeat, post_upgrade, pre_upgrade,
-    println, query, spawn, update,
+    api::{call::arg_data_raw, call_context_instruction_counter},
+    caller as ic_cdk_caller, heartbeat, post_upgrade, pre_upgrade, println, query, spawn, update,
 };
 use ic_management_canister_types::IC_00;
 use ic_nervous_system_canisters::cmc::CMCCanister;
@@ -22,6 +22,7 @@ use ic_nns_constants::LEDGER_CANISTER_ID;
 use ic_nns_governance::{
     decoder_config, encode_metrics,
     governance::{Environment, Governance, HeapGrowthPotential, RngError, TimeWarp as GovTimeWarp},
+    is_prune_following_enabled,
     neuron_data_validation::NeuronDataValidationSummary,
     pb::v1::{self as gov_pb, Governance as InternalGovernanceProto},
     storage::{grow_upgrades_memory_to, validate_stable_storage, with_upgrades_memory},
@@ -57,6 +58,8 @@ use rand::{RngCore, SeedableRng};
 use rand_chacha::ChaCha20Rng;
 use std::{
     boxed::Box,
+    cell::RefCell,
+    ops::Bound,
     str::FromStr,
     time::{Duration, SystemTime},
 };
@@ -161,15 +164,36 @@ fn set_governance(gov: Governance) {
 fn schedule_timers() {
     schedule_seeding(Duration::from_nanos(0));
     schedule_adjust_neurons_storage(Duration::from_nanos(0), NeuronIdProto { id: 0 });
+    schedule_prune_following(Duration::from_secs(0));
 }
 
 // Seeding interval seeks to find a balance between the need for rng secrecy, and
 // avoiding the overhead of frequent reseeding.
 const SEEDING_INTERVAL: Duration = Duration::from_secs(3600);
 const RETRY_SEEDING_INTERVAL: Duration = Duration::from_secs(30);
+const PRUNE_FOLLOWING_INTERVAL: Duration = Duration::from_secs(10);
 
-fn schedule_seeding(duration: Duration) {
-    ic_cdk_timers::set_timer(duration, || {
+// Once this amount of instructions is used by the
+// Governance::prune_some_following, it stops, saves where it is, schedules more
+// pruning later, and returns.
+//
+// Why this value seems to make sense:
+//
+// I think we can conservatively estimate that it takes 2 megainstructions to
+// pull a neuron from stable memory. If we assume 200 kiloneurons are in stable
+// memory, then 400 gigainstructions are needed to read all neurons in stable
+// memory. 400e9 instructions / 25e6 instructions per batch = 16e3 batches. If
+// we process 1 batch / s (see PRUNE_FOLLOWING_INTERVAL), then it would take
+// less than 4.5 hours to complete a full pass.
+//
+// This comes to 5.4 full passes per day. If each full pass uses 400
+// gigainstructions, then we use 2.16 terainstructions per day doing
+// prune_some_following. If we assume 1 terainstruction costs 1 XDR,
+// prune_some_following uses a couple of bucks worth of instructions each day.
+const MAX_PRUNE_SOME_FOLLOWING_INSTRUCTIONS: u64 = 50_000_000;
+
+fn schedule_seeding(delay: Duration) {
+    ic_cdk_timers::set_timer(delay, || {
         spawn(async {
             let result: Result<([u8; 32],), (i32, String)> =
                 CdkRuntime::call_with_cleanup(IC_00, "raw_rand", ()).await;
@@ -193,6 +217,34 @@ fn schedule_seeding(duration: Duration) {
     });
 }
 
+thread_local! {
+    // The last neuron whose following was pruned (possibly, trivially, i.e. did
+    // not try to remove anything, because it refreshed recently enough).
+    static PRUNE_FOLLOWING_CHECKPOINT: RefCell<Bound<NeuronIdProto>> =
+        const { RefCell::new(Bound::Unbounded) };
+}
+
+fn schedule_prune_following(delay: Duration) {
+    if !is_prune_following_enabled() {
+        return;
+    }
+
+    ic_cdk_timers::set_timer(delay, || {
+        let original_checkpoint = PRUNE_FOLLOWING_CHECKPOINT.with(|p| *p.borrow());
+
+        let carry_on =
+            || call_context_instruction_counter() < MAX_PRUNE_SOME_FOLLOWING_INSTRUCTIONS;
+        let new_checkpoint = governance_mut().prune_some_following(original_checkpoint, carry_on);
+
+        PRUNE_FOLLOWING_CHECKPOINT.with(|p| {
+            let mut borrow = p.borrow_mut();
+            *borrow = new_checkpoint;
+        });
+
+        schedule_prune_following(PRUNE_FOLLOWING_INTERVAL);
+    });
+}
+
 // The interval before adjusting neuron storage for the next batch of neurons starting from last
 // neuron id scanned in the last batch.
 const ADJUST_NEURON_STORAGE_BATCH_INTERVAL: Duration = Duration::from_secs(5);
diff --git a/rs/nns/governance/src/governance.rs b/rs/nns/governance/src/governance.rs
index 7f4f32a0959..fb8fed7e84d 100644
--- a/rs/nns/governance/src/governance.rs
+++ b/rs/nns/governance/src/governance.rs
@@ -13,7 +13,9 @@ use crate::{
     migrations::maybe_run_migrations,
     neuron::{DissolveStateAndAge, Neuron, NeuronBuilder},
     neuron_data_validation::{NeuronDataValidationSummary, NeuronDataValidator},
-    neuron_store::{metrics::NeuronSubsetMetrics, NeuronMetrics, NeuronStore},
+    neuron_store::{
+        metrics::NeuronSubsetMetrics, prune_some_following, NeuronMetrics, NeuronStore,
+    },
     neurons_fund::{
         NeuronsFund, NeuronsFundNeuronPortion, NeuronsFundSnapshot,
         PolynomialNeuronsFundParticipation, SwapParticipationLimits,
@@ -138,8 +140,8 @@ pub mod tla;
 
 #[cfg(feature = "tla")]
 pub use tla::{
-    claim_neuron_desc, split_neuron_desc, tla_update_method, InstrumentationState, ToTla,
-    TLA_INSTRUMENTATION_STATE, TLA_TRACES_LKEY, TLA_TRACES_MUTEX,
+    tla_update_method, InstrumentationState, ToTla, CLAIM_NEURON_DESC, MERGE_NEURONS_DESC,
+    SPLIT_NEURON_DESC, TLA_INSTRUMENTATION_STATE, TLA_TRACES_LKEY, TLA_TRACES_MUTEX,
 };
 
 // 70 KB (for executing NNS functions that are not canister upgrades)
@@ -2670,7 +2672,7 @@ impl Governance {
     ///   stake.
     /// - The amount to split minus the transfer fee is more than the minimum
     ///   stake.
-    #[cfg_attr(feature = "tla", tla_update_method(split_neuron_desc()))]
+    #[cfg_attr(feature = "tla", tla_update_method(SPLIT_NEURON_DESC.clone()))]
     pub async fn split_neuron(
         &mut self,
         id: &NeuronId,
@@ -2926,6 +2928,7 @@ impl Governance {
     ///   it will be merged into the stake of the target neuron; if it is less
     ///   than the transaction fee, the maturity of the source neuron will
     ///   still be merged into the maturity of the target neuron.
+    #[cfg_attr(feature = "tla", tla_update_method(MERGE_NEURONS_DESC.clone()))]
     pub async fn merge_neurons(
         &mut self,
         id: &NeuronId,
@@ -2965,6 +2968,14 @@ impl Governance {
 
         // Step 4: burn neuron fees if needed.
         if let Some(source_burn_fees) = effect.source_burn_fees() {
+            tla_log_locals! {
+                source_neuron_id: effect.source_neuron_id().id,
+                target_neuron_id: effect.target_neuron_id().id,
+                fees_amount: effect.source_burn_fees().map_or(0, |f| f.amount_e8s),
+                amount_to_target: effect.stake_transfer().map_or(0, |t| t.amount_to_target_e8s)
+            }
+            tla_log_label!("MergeNeurons_Burn");
+
             source_burn_fees
                 .burn_neuron_fees_with_ledger(&*self.ledger, &mut self.neuron_store, now)
                 .await?;
@@ -2972,6 +2983,14 @@ impl Governance {
 
         // Step 5: transfer the stake if needed.
         if let Some(stake_transfer) = effect.stake_transfer() {
+            tla_log_locals! {
+                source_neuron_id: effect.source_neuron_id().id,
+                target_neuron_id: effect.target_neuron_id().id,
+                fees_amount: effect.source_burn_fees().map_or(0, |f| f.amount_e8s),
+                amount_to_target: effect.stake_transfer().map_or(0, |t| t.amount_to_target_e8s)
+            }
+            tla_log_label!("MergeNeurons_Stake");
+
             stake_transfer
                 .transfer_neuron_stake_with_ledger(&*self.ledger, &mut self.neuron_store, now)
                 .await?;
@@ -5998,6 +6017,14 @@ impl Governance {
         Ok(())
     }
 
+    pub fn prune_some_following(
+        &mut self,
+        begin: std::ops::Bound<NeuronId>,
+        carry_on: impl FnMut() -> bool,
+    ) -> std::ops::Bound<NeuronId> {
+        prune_some_following(&mut self.neuron_store, begin, carry_on)
+    }
+
     /// Creates a new neuron or refreshes the stake of an existing
     /// neuron from a ledger account.
     ///
@@ -6138,7 +6165,7 @@ impl Governance {
     /// the neuron and lock it before we make the call, we know that any
     /// concurrent call to mutate the same neuron will need to wait for this
     /// one to finish before proceeding.
-    #[cfg_attr(feature = "tla", tla_update_method(claim_neuron_desc()))]
+    #[cfg_attr(feature = "tla", tla_update_method(CLAIM_NEURON_DESC.clone()))]
     async fn claim_neuron(
         &mut self,
         subaccount: Subaccount,
diff --git a/rs/nns/governance/src/governance/ledger_helper.rs b/rs/nns/governance/src/governance/ledger_helper.rs
index 91eb87bd464..3c63c47e8ca 100644
--- a/rs/nns/governance/src/governance/ledger_helper.rs
+++ b/rs/nns/governance/src/governance/ledger_helper.rs
@@ -8,6 +8,11 @@ use crate::{
 use ic_nervous_system_common::ledger::IcpLedger;
 use ic_nns_common::pb::v1::NeuronId;
 
+#[cfg(feature = "tla")]
+use super::tla::TLA_INSTRUMENTATION_STATE;
+#[cfg(feature = "tla")]
+use tla_instrumentation_proc_macros::tla_function;
+
 /// An object that represents the burning of neuron fees.
 #[derive(Clone, PartialEq, Debug)]
 pub struct BurnNeuronFeesOperation {
@@ -19,6 +24,7 @@ impl BurnNeuronFeesOperation {
     /// Burns the neuron fees by calling ledger and changing the neuron. Recoverable errors are
     /// returned while unrecoverable errors cause a panic. A neuron lock should be held before
     /// calling this.
+    #[cfg_attr(feature = "tla", tla_function)]
     pub async fn burn_neuron_fees_with_ledger(
         self,
         ledger: &dyn IcpLedger,
@@ -80,6 +86,7 @@ pub struct NeuronStakeTransferOperation {
 impl NeuronStakeTransferOperation {
     /// Transfers the stake from one neuron to another by calling ledger and changing the neurons.
     /// Recoverable errors are returned while unrecoverable errors cause a panic.
+    #[cfg_attr(feature = "tla", tla_function)]
     pub async fn transfer_neuron_stake_with_ledger(
         self,
         ledger: &dyn IcpLedger,
diff --git a/rs/nns/governance/src/governance/tests/mod.rs b/rs/nns/governance/src/governance/tests/mod.rs
index c6091e8ccf1..5e7f9a70aed 100644
--- a/rs/nns/governance/src/governance/tests/mod.rs
+++ b/rs/nns/governance/src/governance/tests/mod.rs
@@ -1134,244 +1134,6 @@ mod neuron_archiving_tests {
     } // end proptest
 }
 
-mod cast_vote_and_cascade_follow {
-    use crate::{
-        governance::{Governance, MIN_DISSOLVE_DELAY_FOR_VOTE_ELIGIBILITY_SECONDS},
-        neuron::{DissolveStateAndAge, Neuron, NeuronBuilder},
-        pb::v1::{neuron::Followees, Ballot, ProposalData, Topic, Vote},
-        test_utils::{MockEnvironment, StubCMC, StubIcpLedger},
-    };
-    use futures::FutureExt;
-    use ic_base_types::PrincipalId;
-    use ic_nns_common::pb::v1::{NeuronId, ProposalId};
-    use icp_ledger::Subaccount;
-    use maplit::{btreemap, hashmap};
-    use std::collections::{BTreeMap, HashMap};
-
-    fn make_ballot(voting_power: u64, vote: Vote) -> Ballot {
-        Ballot {
-            voting_power,
-            vote: vote as i32,
-        }
-    }
-
-    fn make_test_neuron_with_followees(
-        id: u64,
-        topic: Topic,
-        followees: Vec<u64>,
-        aging_since_timestamp_seconds: u64,
-    ) -> Neuron {
-        NeuronBuilder::new(
-            NeuronId { id },
-            Subaccount::try_from(&[0u8; 32] as &[u8]).unwrap(),
-            PrincipalId::new_user_test_id(1),
-            DissolveStateAndAge::NotDissolving {
-                dissolve_delay_seconds: MIN_DISSOLVE_DELAY_FOR_VOTE_ELIGIBILITY_SECONDS,
-                aging_since_timestamp_seconds,
-            },
-            123_456_789,
-        )
-        .with_followees(hashmap! {
-            topic as i32 => Followees {
-                followees: followees.into_iter().map(|id| NeuronId { id }).collect()
-            }
-        })
-        .build()
-    }
-
-    #[test]
-    fn test_cast_vote_and_cascade_doesnt_cascade_neuron_management() {
-        let now = 1000;
-        let topic = Topic::NeuronManagement;
-
-        let make_neuron = |id: u64, followees: Vec<u64>| {
-            make_test_neuron_with_followees(id, topic, followees, now)
-        };
-
-        let add_neuron_with_ballot = |neuron_map: &mut BTreeMap<u64, Neuron>,
-                                      ballots: &mut HashMap<u64, Ballot>,
-                                      id: u64,
-                                      followees: Vec<u64>,
-                                      vote: Vote| {
-            let neuron = make_neuron(id, followees);
-            let deciding_voting_power = neuron.deciding_voting_power(now);
-            neuron_map.insert(id, neuron);
-            ballots.insert(id, make_ballot(deciding_voting_power, vote));
-        };
-
-        let add_neuron_without_ballot =
-            |neuron_map: &mut BTreeMap<u64, Neuron>, id: u64, followees: Vec<u64>| {
-                let neuron = make_neuron(id, followees);
-                neuron_map.insert(id, neuron);
-            };
-
-        let mut heap_neurons = BTreeMap::new();
-        let mut ballots = HashMap::new();
-        for id in 1..=5 {
-            // Each neuron follows all neurons with a lower id
-            let followees = (1..id).collect();
-
-            add_neuron_with_ballot(
-                &mut heap_neurons,
-                &mut ballots,
-                id,
-                followees,
-                Vote::Unspecified,
-            );
-        }
-        // Add another neuron that follows both a neuron with a ballot and without a ballot
-        add_neuron_with_ballot(
-            &mut heap_neurons,
-            &mut ballots,
-            6,
-            vec![1, 7],
-            Vote::Unspecified,
-        );
-
-        // Add a neuron without a ballot for neuron 6 to follow.
-        add_neuron_without_ballot(&mut heap_neurons, 7, vec![1]);
-
-        let governance_proto = crate::pb::v1::Governance {
-            neurons: heap_neurons
-                .into_iter()
-                .map(|(id, neuron)| (id, neuron.into_proto(now)))
-                .collect(),
-            proposals: btreemap! {
-                1 => ProposalData {
-                    id: Some(ProposalId {id: 1}),
-                    ballots,
-                    ..Default::default()
-                }
-            },
-            ..Default::default()
-        };
-        let mut governance = Governance::new(
-            governance_proto,
-            Box::new(MockEnvironment::new(Default::default(), 0)),
-            Box::new(StubIcpLedger {}),
-            Box::new(StubCMC {}),
-        );
-
-        governance
-            .cast_vote_and_cascade_follow(
-                ProposalId { id: 1 },
-                NeuronId { id: 1 },
-                Vote::Yes,
-                topic,
-            )
-            .now_or_never()
-            .unwrap();
-
-        let deciding_voting_power = |neuron_id| {
-            governance
-                .neuron_store
-                .with_neuron(&neuron_id, |n| n.deciding_voting_power(now))
-                .unwrap()
-        };
-        assert_eq!(
-            governance.heap_data.proposals.get(&1).unwrap().ballots,
-            hashmap! {
-                1 => make_ballot(deciding_voting_power(NeuronId { id: 1}), Vote::Yes),
-                2 => make_ballot(deciding_voting_power(NeuronId { id: 2}), Vote::Unspecified),
-                3 => make_ballot(deciding_voting_power(NeuronId { id: 3}), Vote::Unspecified),
-                4 => make_ballot(deciding_voting_power(NeuronId { id: 4}), Vote::Unspecified),
-                5 => make_ballot(deciding_voting_power(NeuronId { id: 5}), Vote::Unspecified),
-                6 => make_ballot(deciding_voting_power(NeuronId { id: 6}), Vote::Unspecified),
-            }
-        );
-    }
-
-    #[test]
-    fn test_cast_vote_and_cascade_works() {
-        let now = 1000;
-        let topic = Topic::NetworkCanisterManagement;
-
-        let make_neuron = |id: u64, followees: Vec<u64>| {
-            make_test_neuron_with_followees(id, topic, followees, now)
-        };
-
-        let add_neuron_with_ballot = |neuron_map: &mut BTreeMap<u64, Neuron>,
-                                      ballots: &mut HashMap<u64, Ballot>,
-                                      id: u64,
-                                      followees: Vec<u64>,
-                                      vote: Vote| {
-            let neuron = make_neuron(id, followees);
-            let deciding_voting_power = neuron.deciding_voting_power(now);
-            neuron_map.insert(id, neuron);
-            ballots.insert(id, make_ballot(deciding_voting_power, vote));
-        };
-
-        let add_neuron_without_ballot =
-            |neuron_map: &mut BTreeMap<u64, Neuron>, id: u64, followees: Vec<u64>| {
-                let neuron = make_neuron(id, followees);
-                neuron_map.insert(id, neuron);
-            };
-
-        let mut neurons = BTreeMap::new();
-        let mut ballots = HashMap::new();
-        for id in 1..=5 {
-            // Each neuron follows all neurons with a lower id
-            let followees = (1..id).collect();
-
-            add_neuron_with_ballot(&mut neurons, &mut ballots, id, followees, Vote::Unspecified);
-        }
-        // Add another neuron that follows both a neuron with a ballot and without a ballot
-        add_neuron_with_ballot(&mut neurons, &mut ballots, 6, vec![1, 7], Vote::Unspecified);
-
-        // Add a neuron without a ballot for neuron 6 to follow.
-        add_neuron_without_ballot(&mut neurons, 7, vec![1]);
-
-        let governance_proto = crate::pb::v1::Governance {
-            neurons: neurons
-                .into_iter()
-                .map(|(id, neuron)| (id, neuron.into_proto(now)))
-                .collect(),
-            proposals: btreemap! {
-                1 => ProposalData {
-                    id: Some(ProposalId {id: 1}),
-                    ballots,
-                    ..Default::default()
-                }
-            },
-            ..Default::default()
-        };
-        let mut governance = Governance::new(
-            governance_proto,
-            Box::new(MockEnvironment::new(Default::default(), 0)),
-            Box::new(StubIcpLedger {}),
-            Box::new(StubCMC {}),
-        );
-
-        governance
-            .cast_vote_and_cascade_follow(
-                ProposalId { id: 1 },
-                NeuronId { id: 1 },
-                Vote::Yes,
-                topic,
-            )
-            .now_or_never()
-            .unwrap();
-
-        let deciding_voting_power = |neuron_id| {
-            governance
-                .neuron_store
-                .with_neuron(&neuron_id, |n| n.deciding_voting_power(now))
-                .unwrap()
-        };
-        assert_eq!(
-            governance.heap_data.proposals.get(&1).unwrap().ballots,
-            hashmap! {
-                1 => make_ballot(deciding_voting_power(NeuronId { id: 1 }), Vote::Yes),
-                2 => make_ballot(deciding_voting_power(NeuronId { id: 2 }), Vote::Yes),
-                3 => make_ballot(deciding_voting_power(NeuronId { id: 3 }), Vote::Yes),
-                4 => make_ballot(deciding_voting_power(NeuronId { id: 4 }), Vote::Yes),
-                5 => make_ballot(deciding_voting_power(NeuronId { id: 5 }), Vote::Yes),
-                6 => make_ballot(deciding_voting_power(NeuronId { id: 6 }), Vote::Unspecified),
-            }
-        );
-    }
-}
-
 #[test]
 fn test_pre_and_post_upgrade_first_time() {
     let neuron1 = NeuronProto {
diff --git a/rs/nns/governance/src/governance/tla/claim_neuron.rs b/rs/nns/governance/src/governance/tla/claim_neuron.rs
index df3616d10f1..6d120715ae8 100644
--- a/rs/nns/governance/src/governance/tla/claim_neuron.rs
+++ b/rs/nns/governance/src/governance/tla/claim_neuron.rs
@@ -1,27 +1,30 @@
+use lazy_static::lazy_static;
 use tla_instrumentation::{Label, TlaConstantAssignment, ToTla, Update, VarAssignment};
 
 use super::common::default_account;
 use super::{extract_common_constants, post_process_trace};
 
-pub fn claim_neuron_desc() -> Update {
-    const PID: &str = "Claim_Neuron";
-    let default_locals = VarAssignment::new()
-        .add("account", default_account())
-        .add("neuron_id", 0_u64.to_tla_value());
+lazy_static! {
+    pub static ref CLAIM_NEURON_DESC: Update = {
+        const PID: &str = "Claim_Neuron";
+        let default_locals = VarAssignment::new()
+            .add("account", default_account())
+            .add("neuron_id", 0_u64.to_tla_value());
 
-    Update {
-        default_start_locals: default_locals.clone(),
-        default_end_locals: default_locals,
-        start_label: Label::new("ClaimNeuron1"),
-        end_label: Label::new("Done"),
-        process_id: PID.to_string(),
-        canister_name: "governance".to_string(),
-        post_process: |trace| {
-            let constants = TlaConstantAssignment {
-                constants: extract_common_constants(PID, trace).into_iter().collect(),
-            };
-            post_process_trace(trace);
-            constants
-        },
-    }
+        Update {
+            default_start_locals: default_locals.clone(),
+            default_end_locals: default_locals,
+            start_label: Label::new("ClaimNeuron1"),
+            end_label: Label::new("Done"),
+            process_id: PID.to_string(),
+            canister_name: "governance".to_string(),
+            post_process: |trace| {
+                let constants = TlaConstantAssignment {
+                    constants: extract_common_constants(PID, trace).into_iter().collect(),
+                };
+                post_process_trace(trace);
+                constants
+            },
+        }
+    };
 }
diff --git a/rs/nns/governance/src/governance/tla/merge_neurons.rs b/rs/nns/governance/src/governance/tla/merge_neurons.rs
new file mode 100644
index 00000000000..b150ef5a524
--- /dev/null
+++ b/rs/nns/governance/src/governance/tla/merge_neurons.rs
@@ -0,0 +1,34 @@
+use super::{account_to_tla, extract_common_constants, post_process_trace};
+use crate::governance::governance_minting_account;
+use lazy_static::lazy_static;
+use tla_instrumentation::{Label, TlaConstantAssignment, ToTla, Update, VarAssignment};
+
+const PID: &str = "Merge_Neurons";
+lazy_static! {
+    pub static ref MERGE_NEURONS_DESC: Update = {
+        let default_locals = VarAssignment::new()
+            .add("source_neuron_id", 0_u64.to_tla_value())
+            .add("target_neuron_id", 0_u64.to_tla_value())
+            .add("fees_amount", 0_u64.to_tla_value())
+            .add("amount_to_target", 0_u64.to_tla_value());
+        Update {
+            default_start_locals: default_locals.clone(),
+            default_end_locals: default_locals,
+            start_label: Label::new("MergeNeurons_Start"),
+            end_label: Label::new("Done"),
+            process_id: PID.to_string(),
+            canister_name: "governance".to_string(),
+            post_process: |trace| {
+                let mut constants = TlaConstantAssignment {
+                    constants: extract_common_constants(PID, trace).into_iter().collect(),
+                };
+                post_process_trace(trace);
+                constants.constants.insert(
+                    "Minting_Account_Id".to_string(),
+                    account_to_tla(governance_minting_account()),
+                );
+                constants
+            },
+        }
+    };
+}
diff --git a/rs/nns/governance/src/governance/tla/mod.rs b/rs/nns/governance/src/governance/tla/mod.rs
index 32702e36edf..89ea93fbe64 100644
--- a/rs/nns/governance/src/governance/tla/mod.rs
+++ b/rs/nns/governance/src/governance/tla/mod.rs
@@ -1,9 +1,7 @@
-use itertools::Itertools;
-use std::{
-    collections::{BTreeMap, BTreeSet},
-    ops::Deref,
-    thread,
-};
+use std::collections::{BTreeMap, BTreeSet, HashSet};
+use std::hash::Hash;
+use std::sync::mpsc;
+use std::thread;
 
 use super::Governance;
 use crate::storage::{with_stable_neuron_indexes, with_stable_neuron_store};
@@ -26,15 +24,18 @@ pub use common::{account_to_tla, opt_subaccount_to_tla, subaccount_to_tla};
 use common::{function_domain_union, governance_account_id};
 pub use store::{TLA_INSTRUMENTATION_STATE, TLA_TRACES_LKEY, TLA_TRACES_MUTEX};
 
-mod split_neuron;
-pub use split_neuron::split_neuron_desc;
 mod claim_neuron;
-pub use claim_neuron::claim_neuron_desc;
+mod merge_neurons;
+mod split_neuron;
+
+pub use claim_neuron::CLAIM_NEURON_DESC;
+pub use merge_neurons::MERGE_NEURONS_DESC;
+pub use split_neuron::SPLIT_NEURON_DESC;
 
 fn neuron_global(gov: &Governance) -> TlaValue {
     let neuron_map: BTreeMap<u64, TlaValue> = with_stable_neuron_store(|store| {
         gov.neuron_store.with_active_neurons_iter(|iter| {
-            iter.map(|n| n.deref().clone())
+            iter.map(|n| (*n).clone())
                 .chain(store.range_neurons(std::ops::RangeFull))
                 .map(|neuron| {
                     (
@@ -207,6 +208,15 @@ fn get_tla_module_path(module: &str) -> PathBuf {
         })
 }
 
+fn dedup_by_key<E, K, F>(vec: &mut Vec<E>, mut key_selector: F)
+where
+    F: FnMut(&E) -> K,
+    K: Eq + Hash,
+{
+    let mut seen_keys = HashSet::new();
+    vec.retain(|element| seen_keys.insert(key_selector(element)));
+}
+
 /// Checks a trace against the model.
 ///
 /// It's assumed that the corresponding model is called `<PID>_Apalache.tla`, where PID is the
@@ -214,22 +224,34 @@ fn get_tla_module_path(module: &str) -> PathBuf {
 pub fn check_traces() {
     // Large states make Apalache time and memory consumption explode. We'll look at
     // improving that later, for now we introduce a hard limit on the state size, and
-    // skip checking states larger than the limit
+    // skip checking states larger than the limit. The limit is a somewhat arbitrary
+    // number based on what we observed in the tests. We saw that states with 1000+ atoms take
+    // a long time to process, whereas most manual tests yield states of size 100 or so.
     const STATE_SIZE_LIMIT: u64 = 500;
+    // Proptests generate lots of traces (and thus state pairs) that make the Apalache testing very long.
+    // Again, limit this to some arbitrary number where checking is still reasonably fast.
+    // Note that this is effectively a per-test limit due to how `check_traces` is normally used.
+    const STATE_PAIR_COUNT_LIMIT: usize = 30;
     fn is_under_limit(p: &ResolvedStatePair) -> bool {
         p.start.size() < STATE_SIZE_LIMIT && p.end.size() < STATE_SIZE_LIMIT
     }
 
     fn print_stats(traces: &Vec<UpdateTrace>) {
+        let mut total_pairs = 0;
         println!("Checking {} traces with TLA/Apalache", traces.len());
         for t in traces {
             let total_len = t.state_pairs.len();
+            total_pairs += total_len;
             let under_limit_len = t.state_pairs.iter().filter(|p| is_under_limit(p)).count();
             println!(
-                "TLA/Apalache checks: keeping {}/{} states for update {}",
+                "TLA/Apalache checks: keeping {}/{} state pairs for update {}",
                 under_limit_len, total_len, t.update.process_id
             );
         }
+        println!(
+            "Total of {} state pairs to be checked with Apalache; will retain {}",
+            total_pairs, STATE_PAIR_COUNT_LIMIT
+        )
     }
 
     let traces = {
@@ -238,6 +260,26 @@ pub fn check_traces() {
         std::mem::take(&mut (*t))
     };
 
+    print_stats(&traces);
+
+    let mut all_pairs = traces
+        .into_iter()
+        .flat_map(|t| {
+            t.state_pairs
+                .into_iter()
+                .filter(is_under_limit)
+                .map(move |p| (t.update.clone(), t.constants.clone(), p))
+        })
+        .collect();
+
+    // A quick check that we don't have any duplicate state pairs. We assume the constants should
+    // be the same anyways and look at just the process ID and the state sthemselves.
+    dedup_by_key(&mut all_pairs, |(u, _c, p)| {
+        (u.process_id.clone(), p.start.clone(), p.end.clone())
+    });
+
+    all_pairs.truncate(STATE_PAIR_COUNT_LIMIT);
+
     set_java_path();
 
     let apalache = std::env::var("TLA_APALACHE_BIN")
@@ -248,42 +290,40 @@ pub fn check_traces() {
         panic!("bad apalache bin from 'TLA_APALACHE_BIN': '{:?}'", apalache);
     }
 
-    print_stats(&traces);
-
-    let chunk_size = 20;
-    let all_pairs = traces.into_iter().flat_map(|t| {
-        t.state_pairs
-            .into_iter()
-            .filter(is_under_limit)
-            .map(move |p| (t.update.clone(), t.constants.clone(), p))
-    });
-    let chunks = all_pairs.chunks(chunk_size);
-    for chunk in &chunks {
-        let mut handles = vec![];
-        for (update, constants, pair) in chunk {
-            let apalache = apalache.clone();
-            let constants = constants.clone();
-            let pair = pair.clone();
-            // NOTE: We adopt the convention to reuse the 'process_id" as the tla module name
-            let tla_module = format!("{}_Apalache.tla", update.process_id);
-            let tla_module = get_tla_module_path(&tla_module);
-
-            let handle = thread::spawn(move || {
-                check_tla_code_link(
-                    &apalache,
-                    PredicateDescription {
-                        tla_module,
-                        transition_predicate: "Next".to_string(),
-                        predicate_parameters: Vec::new(),
-                    },
-                    pair,
-                    constants,
-                )
-            });
-            handles.push(handle);
+    // A poor man's parallel_map; process up to MAX_THREADS state pairs in parallel. Use mpsc channels
+    // to signal threads becoming available.
+    const MAX_THREADS: usize = 20;
+    let mut running_threads = 0;
+    let (thread_freed_tx, thread_freed_rx) = mpsc::channel::<()>();
+    for (i, (update, constants, pair)) in all_pairs.iter().enumerate() {
+        println!("Checking state pair #{}", i + 1);
+        if running_threads >= MAX_THREADS {
+            thread_freed_rx
+                .recv()
+                .expect("Error while waiting for the thread completion signal");
+            running_threads -= 1;
         }
-        for handle in handles {
-            handle.join().unwrap().unwrap_or_else(|e| {
+
+        let thread_freed_rx = thread_freed_tx.clone();
+        let apalache = apalache.clone();
+        let constants = constants.clone();
+        let pair = pair.clone();
+        // NOTE: We adopt the convention to reuse the 'process_id" as the tla module name
+        let tla_module = format!("{}_Apalache.tla", update.process_id);
+        let tla_module = get_tla_module_path(&tla_module);
+
+        running_threads += 1;
+        let _handle = thread::spawn(move || {
+            let _ = check_tla_code_link(
+                &apalache,
+                PredicateDescription {
+                    tla_module,
+                    transition_predicate: "Next".to_string(),
+                    predicate_parameters: Vec::new(),
+                },
+                pair,
+                constants,
+            ).map_err(|e| {
                 println!("Possible divergence from the TLA model detected when interacting with the ledger!");
                 println!("If you did not expect to change the interaction between governance and the ledger, reconsider whether your change is safe. You can find additional data on the step that triggered the error below.");
                 println!("If you are confident that your change is correct, please contact the #formal-models Slack channel and describe the problem.");
@@ -293,6 +333,16 @@ pub fn check_traces() {
                 println!("Apalache returned:\n{:#?}", e.apalache_error);
                 panic!("Apalache check failed")
             });
-        }
+            thread_freed_rx
+                .send(())
+                .expect("Couldn't send the thread completion signal");
+        });
+    }
+
+    while running_threads > 0 {
+        thread_freed_rx
+            .recv()
+            .expect("Error while waiting for the thread completion signal");
+        running_threads -= 1;
     }
 }
diff --git a/rs/nns/governance/src/governance/tla/split_neuron.rs b/rs/nns/governance/src/governance/tla/split_neuron.rs
index 80c1327d07b..f4555a0c1d5 100644
--- a/rs/nns/governance/src/governance/tla/split_neuron.rs
+++ b/rs/nns/governance/src/governance/tla/split_neuron.rs
@@ -1,3 +1,4 @@
+use lazy_static::lazy_static;
 use tla_instrumentation::{
     Label, ResolvedStatePair, TlaConstantAssignment, ToTla, Update, VarAssignment,
 };
@@ -5,27 +6,29 @@ use tla_instrumentation::{
 use super::common::{default_account, governance_account_id};
 use super::{extract_common_constants, post_process_trace};
 
-pub fn split_neuron_desc() -> Update {
-    const PID: &str = "Split_Neuron";
-    let default_locals = VarAssignment::new()
-        .add("sn_amount", 0_u64.to_tla_value())
-        .add("sn_parent_neuron_id", 0_u64.to_tla_value())
-        .add("sn_child_neuron_id", 0_u64.to_tla_value())
-        .add("sn_child_account_id", default_account());
+const PID: &str = "Split_Neuron";
+lazy_static! {
+    pub static ref SPLIT_NEURON_DESC: Update = {
+        let default_locals = VarAssignment::new()
+            .add("sn_amount", 0_u64.to_tla_value())
+            .add("sn_parent_neuron_id", 0_u64.to_tla_value())
+            .add("sn_child_neuron_id", 0_u64.to_tla_value())
+            .add("sn_child_account_id", default_account());
 
-    Update {
-        default_start_locals: default_locals.clone(),
-        default_end_locals: default_locals,
-        start_label: Label::new("SplitNeuron1"),
-        end_label: Label::new("Done"),
-        process_id: PID.to_string(),
-        canister_name: "governance".to_string(),
-        post_process: |trace| {
-            let constants = extract_split_neuron_constants(PID, trace);
-            post_process_trace(trace);
-            constants
-        },
-    }
+        Update {
+            default_start_locals: default_locals.clone(),
+            default_end_locals: default_locals,
+            start_label: Label::new("SplitNeuron1"),
+            end_label: Label::new("Done"),
+            process_id: PID.to_string(),
+            canister_name: "governance".to_string(),
+            post_process: |trace| {
+                let constants = extract_split_neuron_constants(PID, trace);
+                post_process_trace(trace);
+                constants
+            },
+        }
+    };
 }
 
 fn extract_split_neuron_constants(pid: &str, trace: &[ResolvedStatePair]) -> TlaConstantAssignment {
diff --git a/rs/nns/governance/src/governance/tla_macros.rs b/rs/nns/governance/src/governance/tla_macros.rs
index 7b3de21c65e..b0e6b552523 100644
--- a/rs/nns/governance/src/governance/tla_macros.rs
+++ b/rs/nns/governance/src/governance/tla_macros.rs
@@ -28,3 +28,11 @@ macro_rules! tla_get_globals {
         tla::get_tla_globals($self)
     };
 }
+
+#[macro_export]
+macro_rules! tla_log_label {
+    ($label:expr) => {
+        #[cfg(feature = "tla")]
+        tla_instrumentation::tla_log_label!($label);
+    };
+}
diff --git a/rs/nns/governance/src/lib.rs b/rs/nns/governance/src/lib.rs
index 6b37796f21d..1a66105f820 100644
--- a/rs/nns/governance/src/lib.rs
+++ b/rs/nns/governance/src/lib.rs
@@ -194,8 +194,11 @@ pub const DEFAULT_VOTING_POWER_REFRESHED_TIMESTAMP_SECONDS: u64 = 1725148800;
 // leave this here indefinitely, but it will just be clutter after a modest
 // amount of time.
 thread_local! {
+
     static IS_VOTING_POWER_ADJUSTMENT_ENABLED: Cell<bool> = const { Cell::new(cfg!(feature = "test")) };
 
+    static IS_PRUNE_FOLLOWING_ENABLED: Cell<bool> = const { Cell::new(cfg!(feature = "test")) };
+
     // TODO(NNS1-3247): To release the feature, set this to true. Do not simply
     // delete. That way, if we need to recall the feature, we can do that via a
     // 1-line change (by replacing true with `cfg!(feature = "test")`). After
@@ -226,6 +229,22 @@ pub fn temporarily_disable_voting_power_adjustment() -> Temporary {
     Temporary::new(&IS_VOTING_POWER_ADJUSTMENT_ENABLED, false)
 }
 
+pub fn is_prune_following_enabled() -> bool {
+    IS_PRUNE_FOLLOWING_ENABLED.with(|ok| ok.get())
+}
+
+/// Only integration tests should use this.
+#[cfg(any(test, feature = "canbench-rs", feature = "test"))]
+pub fn temporarily_enable_prune_following() -> Temporary {
+    Temporary::new(&IS_PRUNE_FOLLOWING_ENABLED, true)
+}
+
+/// Only integration tests should use this.
+#[cfg(any(test, feature = "canbench-rs", feature = "test"))]
+pub fn temporarily_disable_prune_following() -> Temporary {
+    Temporary::new(&IS_PRUNE_FOLLOWING_ENABLED, false)
+}
+
 pub fn is_private_neuron_enforcement_enabled() -> bool {
     IS_PRIVATE_NEURON_ENFORCEMENT_ENABLED.with(|ok| ok.get())
 }
diff --git a/rs/nns/governance/src/neuron/types.rs b/rs/nns/governance/src/neuron/types.rs
index 17f1ee88920..2dd7d39aaf9 100644
--- a/rs/nns/governance/src/neuron/types.rs
+++ b/rs/nns/governance/src/neuron/types.rs
@@ -559,6 +559,35 @@ impl Neuron {
             .is_some_and(|spawn_at_timestamp_seconds| now_seconds >= spawn_at_timestamp_seconds)
     }
 
+    /// Returns the number of followee neuron IDs that were removed.
+    ///
+    /// If the neuron refreshed recently, no followee neuron IDs are removed
+    /// (and returns 0).
+    pub(crate) fn prune_following(&mut self, now_seconds: u64) -> u64 {
+        let is_fresh =
+            self.voting_power_refreshed_timestamp_seconds >= now_seconds - 7 * ONE_MONTH_SECONDS;
+        if is_fresh {
+            return 0;
+        }
+
+        let mut result = 0_usize;
+        for (topic, followees) in &self.followees {
+            if *topic == Topic::NeuronManagement as i32 {
+                continue;
+            }
+            result = result.saturating_add(followees.followees.len());
+        }
+
+        // Clear all following except ManageNeuron.
+        self.followees
+            .retain(|topic, _| *topic == Topic::NeuronManagement as i32);
+
+        // If this panics, that means we somehow have around 2^64 (or more)
+        // followees, which is not only disallowed, but just way more than we
+        // would ever be able to hold in memory.
+        u64::try_from(result).unwrap()
+    }
+
     pub(crate) fn ready_to_unstake_maturity(&self, now_seconds: u64) -> bool {
         self.state(now_seconds) == NeuronState::Dissolved
             && self.staked_maturity_e8s_equivalent.unwrap_or(0) > 0
diff --git a/rs/nns/governance/src/neuron_store.rs b/rs/nns/governance/src/neuron_store.rs
index 3818fdfb790..39ec0c52662 100644
--- a/rs/nns/governance/src/neuron_store.rs
+++ b/rs/nns/governance/src/neuron_store.rs
@@ -31,7 +31,7 @@ use std::{
     borrow::Cow,
     collections::{BTreeMap, HashMap, HashSet},
     fmt::{Debug, Display, Formatter},
-    ops::{Deref, RangeBounds},
+    ops::{Bound, Deref, RangeBounds},
 };
 
 pub mod metrics;
@@ -197,6 +197,11 @@ dyn_clone::clone_trait_object!(PracticalClock);
 
 impl PracticalClock for IcClock {}
 
+// TODO impl PracticalClock for MockClock {}
+// This does not work, because MockClock does not implement Clone. Not sure how
+// to do that. Might be impossible, because MockClock is generated by
+// mockall/automock.
+
 /// This structure represents a whole Neuron's Fund neuron.
 #[derive(Clone, Eq, PartialEq, Debug)]
 pub struct NeuronsFundNeuron {
@@ -840,6 +845,40 @@ impl NeuronStore {
         }
     }
 
+    /// Returns the smallest neuron ID that is in range and in self.
+    ///
+    /// If there is no such neuron ID, returns None.
+    ///
+    /// This is useful for background/offline "grooming" ALL neurons, regardless
+    /// of their storage location.
+    ///
+    /// For a simple yet realistic example, see prune_some_following.
+    fn first_neuron_id(&self, bound: Bound<NeuronId>) -> Option<NeuronId> {
+        let range = (bound, Bound::Unbounded);
+
+        let mut possible_results = vec![];
+
+        possible_results.push(
+            self.heap_neurons_range(range)
+                .next()
+                .map(|neuron| neuron.id()),
+        );
+
+        possible_results.push(with_stable_neuron_store(|stable_store| {
+            stable_store
+                .range_neurons_sections(range, NeuronSections::NONE)
+                .next()
+                .map(|neuron| neuron.id())
+        }));
+
+        possible_results
+            .into_iter()
+            // Throw away None, by treating them like empty collection, and
+            // unwrap Some (by treating them as 1 element collection).
+            .flatten()
+            .min_by_key(|neuron_id| neuron_id.id)
+    }
+
     // TODO remove this after we no longer need to validate neurons in heap.
     /// Returns Neurons in heap starting with the first one whose ID is >= begin.
     ///
@@ -905,8 +944,14 @@ impl NeuronStore {
 
     /// List all neuron ids whose neurons have staked maturity greater than 0.
     pub fn list_neurons_ready_to_unstake_maturity(&self, now_seconds: u64) -> Vec<NeuronId> {
-        let filter = |neuron: &Neuron| neuron.ready_to_unstake_maturity(now_seconds);
-        self.filter_map_active_neurons(filter, |neuron| neuron.id())
+        self.with_active_neurons_iter_sections(
+            |iter| {
+                iter.filter(|neuron| neuron.ready_to_unstake_maturity(now_seconds))
+                    .map(|neuron| neuron.id())
+                    .collect()
+            },
+            NeuronSections::NONE,
+        )
     }
 
     /// List all neuron ids of known neurons
@@ -916,7 +961,14 @@ impl NeuronStore {
 
     /// List all neurons that are spawning
     pub fn list_ready_to_spawn_neuron_ids(&self, now_seconds: u64) -> Vec<NeuronId> {
-        self.filter_map_active_neurons(|neuron| neuron.ready_to_spawn(now_seconds), |n| n.id())
+        self.with_active_neurons_iter_sections(
+            |iter| {
+                iter.filter(|neuron| neuron.ready_to_spawn(now_seconds))
+                    .map(|neuron| neuron.id())
+                    .collect()
+            },
+            NeuronSections::NONE,
+        )
     }
 
     pub fn create_ballots_for_standard_proposal(
@@ -1253,6 +1305,65 @@ impl NeuronStore {
     }
 }
 
+/// Does what the name says.
+///
+/// If a neuron's voting power has not been refreshed in a "long" time (see the
+/// voting_power_refreshed_timestamp_seconds field), then, their following needs
+/// to be deleted.
+///
+/// This scans some neurons, starting with start. This stops scanning when
+/// carry_on returns false. carry_on is called after processing each neuron.
+/// Therefore, this processes at least one neuron (if there is one).
+///
+/// Returns where the scan should pick up from next time. I.e. the return value
+/// should be passed via start next time.
+#[allow(unused)] // This line will be removed soon...
+pub fn prune_some_following(
+    neuron_store: &mut NeuronStore,
+    mut next: Bound<NeuronId>,
+    mut carry_on: impl FnMut() -> bool,
+) -> Bound<NeuronId> {
+    let now_seconds = neuron_store.now();
+
+    loop {
+        // Which neuron do we operate on next?
+        let current_neuron_id = neuron_store.first_neuron_id(next);
+
+        // If we reached the end, return.
+        let current_neuron_id = match current_neuron_id {
+            Some(ok) => ok,
+            None => {
+                // Tell caller to loop back to the beginning of neurons. That
+                // way, we keep scanning indefinitely.
+                return Bound::Unbounded;
+            }
+        };
+
+        // Get ready for the next iteration.
+        next = Bound::Excluded(current_neuron_id);
+
+        let result = neuron_store.with_neuron_mut(&current_neuron_id, |neuron| {
+            // This is where the "real work" takes place. Everything else is to
+            // keep the scan going.
+            neuron.prune_following(now_seconds);
+        });
+
+        // Log if somehow with_neuron_mut returns Err. This should not be
+        // possible, since first_neuron_id must have returned Some in order for
+        // this line to be reached.
+        if let Err(err) = result {
+            println!(
+                "{}ERROR: Unable to find neuron {} while pruning following.",
+                LOG_PREFIX, current_neuron_id.id,
+            );
+        }
+
+        if !carry_on() {
+            return next;
+        }
+    }
+}
+
 /// Number of entries for each neuron indexes (in stable storage)
 pub struct NeuronIndexesLens {
     pub subaccount: usize,
diff --git a/rs/nns/governance/src/neuron_store/neuron_store_tests.rs b/rs/nns/governance/src/neuron_store/neuron_store_tests.rs
index ca7884d5c2c..35be92b5fe0 100644
--- a/rs/nns/governance/src/neuron_store/neuron_store_tests.rs
+++ b/rs/nns/governance/src/neuron_store/neuron_store_tests.rs
@@ -5,14 +5,16 @@ use crate::{
     storage::with_stable_neuron_indexes,
     temporarily_disable_active_neurons_in_stable_memory,
 };
-use ic_nervous_system_common::ONE_DAY_SECONDS;
+use ic_nervous_system_common::{ONE_DAY_SECONDS, ONE_MONTH_SECONDS};
 use ic_nns_constants::GOVERNANCE_CANISTER_ID;
 use maplit::{btreemap, hashmap, hashset};
 use num_traits::bounds::LowerBounded;
 use pretty_assertions::assert_eq;
 use std::cell::Cell;
 
-static CREATED_TIMESTAMP_SECONDS: u64 = 123_456_789;
+// Value is 6 months ahead of when this code was written. For realism, and to
+// make sure this is "long" after we release periodic confirmation.
+static CREATED_TIMESTAMP_SECONDS: u64 = 1730834058 + 6 * ONE_MONTH_SECONDS;
 
 fn simple_neuron_builder(id: u64) -> NeuronBuilder {
     // Make sure different neurons have different accounts.
@@ -638,6 +640,112 @@ fn test_get_neuron_ids_readable_by_caller() {
     );
 }
 
+#[test]
+fn test_prune_some_following() {
+    // Step 1: Prepare the world.
+
+    let followees = hashmap! {
+        Topic::Governance as i32 => Followees {
+            followees: vec![NeuronId { id: 99 }],
+        },
+        Topic::NeuronManagement as i32 => Followees {
+            followees: vec![NeuronId { id: 101 }],
+        },
+    };
+
+    let mut fresh_neuron = simple_neuron_builder(1)
+        .with_followees(followees.clone())
+        .build();
+    fresh_neuron.refresh_voting_power(CREATED_TIMESTAMP_SECONDS - 7 * ONE_MONTH_SECONDS + 1);
+
+    // Similar to fresh_neuron, except voting power was refrshed a "long" time
+    // ago.
+    let mut stale_neuron = simple_neuron_builder(3)
+        .with_followees(followees.clone())
+        .build();
+    stale_neuron.refresh_voting_power(CREATED_TIMESTAMP_SECONDS - 7 * ONE_MONTH_SECONDS - 1);
+
+    let mut neuron_store = NeuronStore::new(btreemap! {
+        fresh_neuron.id().id => fresh_neuron.clone(),
+        stale_neuron.id().id => stale_neuron.clone(),
+    });
+
+    // Control the perception of time by neuron_store.
+    #[derive(Debug, Clone)]
+    struct DummyClock {}
+    impl Clock for DummyClock {
+        fn now(&self) -> u64 {
+            CREATED_TIMESTAMP_SECONDS
+        }
+
+        fn set_time_warp(&mut self, _: TimeWarp) {
+            unimplemented!();
+        }
+    }
+    impl PracticalClock for DummyClock {}
+    let clock = DummyClock {};
+    neuron_store.clock = Box::new(clock);
+
+    // Step 2: Call code under test.
+
+    // Stop after the second neuron is processed.
+    let mut neuron_count = 0;
+    let carry_on = || {
+        neuron_count += 1;
+        neuron_count < 2
+    };
+
+    assert_eq!(
+        prune_some_following(&mut neuron_store, Bound::Unbounded, carry_on),
+        Bound::Excluded(stale_neuron.id()),
+    );
+    assert_eq!(neuron_count, 2);
+
+    let mut call_count = 0;
+    let carry_on = || {
+        call_count += 1;
+        true
+    };
+    assert_eq!(
+        prune_some_following(
+            &mut neuron_store,
+            Bound::Excluded(stale_neuron.id()),
+            carry_on,
+        ),
+        Bound::Unbounded,
+    );
+    // Because after teh stale neuron, there are no more neurons. In that case
+    // prune_some_following tells us to loop back around.
+    assert_eq!(call_count, 0);
+
+    // Step 3: Inspect results.
+
+    // Assert that fresh neuron did not change.
+    neuron_store
+        .with_neuron(&fresh_neuron.id(), |fresh_neuron| {
+            assert_eq!(fresh_neuron.followees, followees);
+        })
+        .unwrap();
+
+    // Assert that the stale neuron did in fact change.
+    neuron_store
+        .with_neuron(&stale_neuron.id(), |stale_neuron| {
+            assert_eq!(
+                stale_neuron.followees,
+                hashmap! {
+                    // Governance got wiped out.
+
+                    Topic::NeuronManagement as i32 => Followees {
+                        followees: vec![NeuronId { id: 101 }],
+                    },
+                },
+            );
+        })
+        .unwrap();
+
+    assert_eq!(neuron_store.len(), 2);
+}
+
 #[test]
 fn test_get_non_empty_neuron_ids_readable_by_caller() {
     // Prepare the neurons.
diff --git a/rs/nns/governance/src/voting.rs b/rs/nns/governance/src/voting.rs
index d9576d8e5ba..a00579c3a49 100644
--- a/rs/nns/governance/src/voting.rs
+++ b/rs/nns/governance/src/voting.rs
@@ -226,18 +226,27 @@ fn retain_neurons_with_castable_ballots(
 mod test {
 
     use crate::{
-        governance::MIN_DISSOLVE_DELAY_FOR_VOTE_ELIGIBILITY_SECONDS,
+        governance::{Governance, MIN_DISSOLVE_DELAY_FOR_VOTE_ELIGIBILITY_SECONDS},
         neuron::{DissolveStateAndAge, Neuron, NeuronBuilder},
         neuron_store::NeuronStore,
-        pb::v1::{neuron::Followees, Ballot, Topic, Vote},
+        pb::v1::{neuron::Followees, Ballot, ProposalData, Topic, Vote},
+        test_utils::{MockEnvironment, StubCMC, StubIcpLedger},
         voting::ProposalVotingStateMachine,
     };
+    use futures::FutureExt;
     use ic_base_types::PrincipalId;
     use ic_nns_common::pb::v1::{NeuronId, ProposalId};
     use icp_ledger::Subaccount;
     use maplit::{btreemap, hashmap};
     use std::collections::{BTreeMap, BTreeSet, HashMap};
 
+    fn make_ballot(voting_power: u64, vote: Vote) -> Ballot {
+        Ballot {
+            voting_power,
+            vote: vote as i32,
+        }
+    }
+
     fn make_neuron(
         id: u64,
         cached_neuron_stake_e8s: u64,
@@ -267,6 +276,210 @@ mod test {
         .build()
     }
 
+    #[test]
+    fn test_cast_vote_and_cascade_doesnt_cascade_neuron_management() {
+        let now = 1000;
+        let topic = Topic::NeuronManagement;
+
+        let make_neuron = |id: u64, followees: Vec<u64>| {
+            make_neuron(
+                id,
+                100,
+                hashmap! {topic.into() => Followees {
+                    followees: followees.into_iter().map(|id| NeuronId { id }).collect(),
+                }},
+            )
+        };
+
+        let add_neuron_with_ballot = |neuron_map: &mut BTreeMap<u64, Neuron>,
+                                      ballots: &mut HashMap<u64, Ballot>,
+                                      id: u64,
+                                      followees: Vec<u64>,
+                                      vote: Vote| {
+            let neuron = make_neuron(id, followees);
+            let deciding_voting_power = neuron.deciding_voting_power(now);
+            neuron_map.insert(id, neuron);
+            ballots.insert(id, make_ballot(deciding_voting_power, vote));
+        };
+
+        let add_neuron_without_ballot =
+            |neuron_map: &mut BTreeMap<u64, Neuron>, id: u64, followees: Vec<u64>| {
+                let neuron = make_neuron(id, followees);
+                neuron_map.insert(id, neuron);
+            };
+
+        let mut heap_neurons = BTreeMap::new();
+        let mut ballots = HashMap::new();
+        for id in 1..=5 {
+            // Each neuron follows all neurons with a lower id
+            let followees = (1..id).collect();
+
+            add_neuron_with_ballot(
+                &mut heap_neurons,
+                &mut ballots,
+                id,
+                followees,
+                Vote::Unspecified,
+            );
+        }
+        // Add another neuron that follows both a neuron with a ballot and without a ballot
+        add_neuron_with_ballot(
+            &mut heap_neurons,
+            &mut ballots,
+            6,
+            vec![1, 7],
+            Vote::Unspecified,
+        );
+
+        // Add a neuron without a ballot for neuron 6 to follow.
+        add_neuron_without_ballot(&mut heap_neurons, 7, vec![1]);
+
+        let governance_proto = crate::pb::v1::Governance {
+            neurons: heap_neurons
+                .into_iter()
+                .map(|(id, neuron)| (id, neuron.into_proto(now)))
+                .collect(),
+            proposals: btreemap! {
+                1 => ProposalData {
+                    id: Some(ProposalId {id: 1}),
+                    ballots,
+                    ..Default::default()
+                }
+            },
+            ..Default::default()
+        };
+        let mut governance = Governance::new(
+            governance_proto,
+            Box::new(MockEnvironment::new(Default::default(), 0)),
+            Box::new(StubIcpLedger {}),
+            Box::new(StubCMC {}),
+        );
+
+        governance
+            .cast_vote_and_cascade_follow(
+                ProposalId { id: 1 },
+                NeuronId { id: 1 },
+                Vote::Yes,
+                topic,
+            )
+            .now_or_never()
+            .unwrap();
+
+        let deciding_voting_power = |neuron_id| {
+            governance
+                .neuron_store
+                .with_neuron(&neuron_id, |n| n.deciding_voting_power(now))
+                .unwrap()
+        };
+        assert_eq!(
+            governance.heap_data.proposals.get(&1).unwrap().ballots,
+            hashmap! {
+                1 => make_ballot(deciding_voting_power(NeuronId { id: 1}), Vote::Yes),
+                2 => make_ballot(deciding_voting_power(NeuronId { id: 2}), Vote::Unspecified),
+                3 => make_ballot(deciding_voting_power(NeuronId { id: 3}), Vote::Unspecified),
+                4 => make_ballot(deciding_voting_power(NeuronId { id: 4}), Vote::Unspecified),
+                5 => make_ballot(deciding_voting_power(NeuronId { id: 5}), Vote::Unspecified),
+                6 => make_ballot(deciding_voting_power(NeuronId { id: 6}), Vote::Unspecified),
+            }
+        );
+    }
+
+    #[test]
+    fn test_cast_vote_and_cascade_works() {
+        let now = 1000;
+        let topic = Topic::NetworkCanisterManagement;
+
+        let make_neuron = |id: u64, followees: Vec<u64>| {
+            make_neuron(
+                id,
+                100,
+                hashmap! {topic.into() => Followees {
+                    followees: followees.into_iter().map(|id| NeuronId { id }).collect(),
+                }},
+            )
+        };
+
+        let add_neuron_with_ballot = |neuron_map: &mut BTreeMap<u64, Neuron>,
+                                      ballots: &mut HashMap<u64, Ballot>,
+                                      id: u64,
+                                      followees: Vec<u64>,
+                                      vote: Vote| {
+            let neuron = make_neuron(id, followees);
+            let deciding_voting_power = neuron.deciding_voting_power(now);
+            neuron_map.insert(id, neuron);
+            ballots.insert(id, make_ballot(deciding_voting_power, vote));
+        };
+
+        let add_neuron_without_ballot =
+            |neuron_map: &mut BTreeMap<u64, Neuron>, id: u64, followees: Vec<u64>| {
+                let neuron = make_neuron(id, followees);
+                neuron_map.insert(id, neuron);
+            };
+
+        let mut neurons = BTreeMap::new();
+        let mut ballots = HashMap::new();
+        for id in 1..=5 {
+            // Each neuron follows all neurons with a lower id
+            let followees = (1..id).collect();
+
+            add_neuron_with_ballot(&mut neurons, &mut ballots, id, followees, Vote::Unspecified);
+        }
+        // Add another neuron that follows both a neuron with a ballot and without a ballot
+        add_neuron_with_ballot(&mut neurons, &mut ballots, 6, vec![1, 7], Vote::Unspecified);
+
+        // Add a neuron without a ballot for neuron 6 to follow.
+        add_neuron_without_ballot(&mut neurons, 7, vec![1]);
+
+        let governance_proto = crate::pb::v1::Governance {
+            neurons: neurons
+                .into_iter()
+                .map(|(id, neuron)| (id, neuron.into_proto(now)))
+                .collect(),
+            proposals: btreemap! {
+                1 => ProposalData {
+                    id: Some(ProposalId {id: 1}),
+                    ballots,
+                    ..Default::default()
+                }
+            },
+            ..Default::default()
+        };
+        let mut governance = Governance::new(
+            governance_proto,
+            Box::new(MockEnvironment::new(Default::default(), 0)),
+            Box::new(StubIcpLedger {}),
+            Box::new(StubCMC {}),
+        );
+
+        governance
+            .cast_vote_and_cascade_follow(
+                ProposalId { id: 1 },
+                NeuronId { id: 1 },
+                Vote::Yes,
+                topic,
+            )
+            .now_or_never()
+            .unwrap();
+
+        let deciding_voting_power = |neuron_id| {
+            governance
+                .neuron_store
+                .with_neuron(&neuron_id, |n| n.deciding_voting_power(now))
+                .unwrap()
+        };
+        assert_eq!(
+            governance.heap_data.proposals.get(&1).unwrap().ballots,
+            hashmap! {
+                1 => make_ballot(deciding_voting_power(NeuronId { id: 1 }), Vote::Yes),
+                2 => make_ballot(deciding_voting_power(NeuronId { id: 2 }), Vote::Yes),
+                3 => make_ballot(deciding_voting_power(NeuronId { id: 3 }), Vote::Yes),
+                4 => make_ballot(deciding_voting_power(NeuronId { id: 4 }), Vote::Yes),
+                5 => make_ballot(deciding_voting_power(NeuronId { id: 5 }), Vote::Yes),
+                6 => make_ballot(deciding_voting_power(NeuronId { id: 6 }), Vote::Unspecified),
+            }
+        );
+    }
+
     fn add_neuron_with_ballot(
         neuron_store: &mut NeuronStore,
         ballots: &mut HashMap<u64, Ballot>,
diff --git a/rs/nns/governance/tests/fixtures/mod.rs b/rs/nns/governance/tests/fixtures/mod.rs
index c6034f13da9..9b2d0c724d7 100755
--- a/rs/nns/governance/tests/fixtures/mod.rs
+++ b/rs/nns/governance/tests/fixtures/mod.rs
@@ -46,6 +46,12 @@ use std::{
     sync::{Arc, Mutex},
 };
 
+#[cfg(feature = "tla")]
+use ic_nns_governance::governance::tla::{
+    self, account_to_tla, Destination, ToTla, TLA_INSTRUMENTATION_STATE,
+};
+use ic_nns_governance::{tla_log_request, tla_log_response};
+
 pub mod environment_fixture;
 
 const DEFAULT_TEST_START_TIMESTAMP_SECONDS: u64 = 999_111_000_u64;
@@ -442,6 +448,18 @@ impl IcpLedger for NNSFixture {
             "Issuing ledger transfer from account {} (subaccount {}) to account {} amount {} fee {}",
             from_account, from_subaccount.as_ref().map_or_else(||"None".to_string(), ToString::to_string), to_account, amount_e8s, fee_e8s
         );
+        tla_log_request!(
+            "WaitForTransfer",
+            Destination::new("ledger"),
+            "Transfer",
+            tla::TlaValue::Record(BTreeMap::from([
+                ("amount".to_string(), amount_e8s.to_tla_value()),
+                ("fee".to_string(), fee_e8s.to_tla_value()),
+                ("from".to_string(), account_to_tla(from_account)),
+                ("to".to_string(), account_to_tla(to_account)),
+            ]))
+        );
+
         let accounts = &mut self.nns_state.try_lock().unwrap().ledger.accounts;
 
         let from_e8s = accounts
@@ -462,6 +480,14 @@ impl IcpLedger for NNSFixture {
 
         *accounts.entry(to_account).or_default() += amount_e8s;
 
+        tla_log_response!(
+            Destination::new("ledger"),
+            tla::TlaValue::Variant {
+                tag: "TransferOk".to_string(),
+                value: Box::new(tla::TlaValue::Constant("UNIT".to_string()))
+            }
+        );
+
         Ok(0)
     }
 
diff --git a/rs/nns/governance/tests/merge_neurons.rs b/rs/nns/governance/tests/merge_neurons.rs
index e4d70df042a..0b43b3d1189 100644
--- a/rs/nns/governance/tests/merge_neurons.rs
+++ b/rs/nns/governance/tests/merge_neurons.rs
@@ -19,6 +19,11 @@ use ic_nns_governance::{
 };
 use proptest::prelude::{proptest, TestCaseError};
 
+#[cfg(feature = "tla")]
+use ic_nns_governance::governance::tla::{check_traces as tla_check_traces, TLA_TRACES_LKEY};
+#[cfg(feature = "tla")]
+use tla_instrumentation_proc_macros::with_tla_trace_check;
+
 // Using a `pub mod` works around spurious dead code warnings; see
 // https://github.com/rust-lang/rust/issues/46379
 pub mod fixtures;
@@ -167,6 +172,7 @@ fn do_test_merge_neurons(
 proptest! {
 
 #[test]
+#[cfg_attr(feature = "tla", with_tla_trace_check)]
 fn test_merge_neurons_small(
     n1_stake in 0u64..50_000,
     n1_maturity in 0u64..500_000_000,
diff --git a/rs/nns/governance/tla/Merge_Neurons.tla b/rs/nns/governance/tla/Merge_Neurons.tla
new file mode 100644
index 00000000000..cb556d7e172
--- /dev/null
+++ b/rs/nns/governance/tla/Merge_Neurons.tla
@@ -0,0 +1,351 @@
+---- MODULE Merge_Neurons ----
+EXTENDS TLC, Sequences, Integers, FiniteSets, Variants
+
+(*
+@typeAlias: proc = Str;
+@typeAlias: account = Str;
+@typeAlias: neuronId = Int;
+@typeAlias: methodCall = Transfer({ from: $account, to: $account, amount: Int, fee: Int}) | AccountBalance({ account: $account });
+@typeAlias: methodResponse = Fail(UNIT) | TransferOk(UNIT) | BalanceQueryOk(Int);
+@typeAlias: neurons = $neuronId -> {cached_stake: Int, account: $account, maturity: Int, fees: Int};
+*)
+
+_type_alias_dummy == TRUE
+
+CONSTANTS
+    Minting_Account_Id,
+    Merge_Neurons_Process_Ids,
+    TRANSACTION_FEE
+
+TRANSFER_OK == "Ok"
+TRANSFER_FAIL == "Err"
+DUMMY_ACCOUNT == ""
+
+\* @type: ($neurons, $neuronId) => Int;
+Minted_Stake(neuron, neuron_id) == LET diff == neuron[neuron_id].cached_stake - neuron[neuron_id].fees IN
+    IF diff > 0 THEN diff ELSE 0
+request(caller, request_args) == [caller |-> caller, method_and_args |-> request_args]
+transfer(from, to, amount, fee) == Variant("Transfer", [from |-> from, to |-> to, amount |-> amount, fee |-> fee])
+
+\* @type: ($neurons, $neuronId, Int) => $neurons;
+Decrease_Stake(neuron, neuron_id, amount) == [neuron EXCEPT ![neuron_id].cached_stake = @ - amount]
+\* @type: ($neurons, $neuronId, Int) => $neurons;
+Increase_Stake(neuron, neuron_id, amount) == [neuron EXCEPT ![neuron_id].cached_stake = @ + amount]
+\* @type: ($neurons, $neuronId, Int) => $neurons;
+Update_Fees(neuron, neuron_id, fees_amount) == [neuron EXCEPT
+    ![neuron_id].cached_stake = Minted_Stake(neuron, neuron_id),
+    ![neuron_id].fees = 0 ]
+\* @type: ($neurons, $neuronId, Int) => $neurons;
+Decrease_Maturity(neuron, neuron_id, amount) == [neuron EXCEPT ![neuron_id].maturity = @ - amount]
+\* @type: ($neurons, $neuronId, Int) => $neurons;
+Increase_Maturity(neuron, neuron_id, amount) == [neuron EXCEPT ![neuron_id].maturity = @ + amount]
+
+
+(* --algorithm Merge_Neurons {
+
+variables
+
+    neuron \in [{} -> {}];
+    \* Used to decide whether we should refresh or claim a neuron
+    neuron_id_by_account \in [{} -> {}];
+    \* The set of currently locked neurons
+    locks = {};
+    \* The queue of messages sent from the governance canister to the ledger canister
+    governance_to_ledger = <<>>;
+    ledger_to_governance = {};
+
+macro reset_mn_vars() {
+    source_neuron_id := 0;
+    target_neuron_id := 0;
+    fees_amount := 0;
+    amount_to_target := 0;
+}
+
+macro send_request(caller_id, request_args) {
+    governance_to_ledger := Append(governance_to_ledger, request(caller_id, request_args))
+};
+
+macro adjust_maturities(neuron_changes) {
+    neuron := Decrease_Maturity(
+        Increase_Maturity(neuron_changes, target_nid, neuron[source_nid].maturity),
+        source_nid, neuron[source_nid].maturity);
+}
+
+macro finish() {
+    locks := locks \ {source_neuron_id, target_neuron_id };
+    reset_mn_vars();
+    goto Done;
+}
+
+\* This assumes that att, source_nid and target_nid are implicitly available
+macro maybe_transfer_stake(neuron_changes) {
+    if(att > 0) {
+        source_neuron_id := source_nid;
+        target_neuron_id := target_nid;
+        locks := locks \union { source_neuron_id, target_neuron_id };
+        amount_to_target := att;
+        neuron := Decrease_Stake(neuron_changes, source_neuron_id, amount_to_target + TRANSACTION_FEE);
+        send_request(self,
+                transfer(neuron[source_neuron_id].account,
+                    neuron[target_neuron_id].account,
+                    amount_to_target,
+                    TRANSACTION_FEE)
+        );
+        goto MergeNeurons_Stake_WaitForTransfer;
+    } else {
+        adjust_maturities(neuron_changes);
+        finish();
+    }
+}
+
+process ( Merge_Neurons \in Merge_Neurons_Process_Ids )
+    variable
+        \* These model the parameters of the call
+        source_neuron_id = 0;
+        target_neuron_id = 0;
+
+        \* internal variables
+        fees_amount = 0;
+        amount_to_target = 0;
+    {
+    MergeNeurons_Start:
+        either {
+            \* Simulate calls that just fail early (e.g, due to failing checks) and
+            \* don't change the state.
+            \* Not so useful for model checking, but needed to follow the code traces.
+            goto Done;
+        } or with(source_nid \in DOMAIN(neuron) \ locks; target_nid \in DOMAIN(neuron) \ locks) {
+            \* We block this branch of the process from starting where an error would be returned
+            \* in the implementation
+            \* Note that the sequential taking of locks in the implementation already implies that
+            \* source_nid != target_nid, as the locks are taken sequentially there.
+            \* Here, also we manually ensure that these neuron IDs differ.
+            await source_nid /= target_nid;
+
+            \* total stake cannot equal 0
+            await (neuron[source_nid].cached_stake - neuron[source_nid].fees) +
+                (neuron[target_nid].cached_stake - neuron[target_nid].fees) /= 0;
+
+
+            \* here the impl has a few guards:
+            \* - caller must be controller of both source and target.
+            \* - source must be younger than target
+            \* - kyc_verified must match for both source and target
+            \* - not_for_profit must match for both source and target
+            \* - source neuron cannot be dedicated to community fund
+
+            with(fa = neuron[source_nid].fees;
+                att = LET diff == Minted_Stake(neuron, source_nid) - TRANSACTION_FEE
+                      IN IF diff > 0 THEN diff ELSE 0
+            ) {
+                if(fa > TRANSACTION_FEE) {
+                    \* This is a bit braindead, but seems to be the best way to work around PlusCal limitations.
+                    \* Since we might unlock the neurons in the same message handler if we don't try to
+                    \* burn the fees, and since the stupid PlusCal limitation prevents us from updating
+                    \* the locks variable twice in the same block, we work around this by only locking
+                    \* here conditionally. We'll also explicitly add the neurons to the locks again
+                    \* if we want to transfer stake later on. This will be idempotent if they're already
+                    \* locked, so it will behave the same as the implementation.
+                    \* And same for the other local variables, they may get reset if the whole
+                    \* update completes in a just a single message execution
+                    source_neuron_id := source_nid;
+                    target_neuron_id := target_nid;
+                    locks := locks \union {source_neuron_id, target_neuron_id};
+                    fees_amount := fa;
+                    amount_to_target := att;
+
+                    \* The burning fee is 0, even though we check that the amounts are less than the transaction fee
+                    send_request(self, transfer(neuron[source_neuron_id].account, Minting_Account_Id, fees_amount, 0));
+                }
+                else {
+                    \* There's some code duplication here, but modeling the Rust control flow
+                    \* in PlusCal is tricky, especially as we now have to match the labels 1-1
+                    \* with the code link checker.
+                    maybe_transfer_stake(neuron);
+                };
+            }
+        };
+    MergeNeurons_Burn_WaitForTransfer:
+        \* Note that we're here only because the fees amount was larger than the
+        \* transaction fee (otherwise, the goto above would have taken us to MergeNeurons_Stake_WaitForTransfer/MergeNeurons_End)
+        with(answer \in { resp \in ledger_to_governance: resp.caller = self}) {
+            ledger_to_governance := ledger_to_governance \ {answer};
+            if(answer.response = Variant("Fail", UNIT)) {
+                finish();
+            }
+            else {
+                \* The with here introduces some context to the macro, which reassigns
+                \* source/target_neuron_id to themselves
+                with(source_nid = source_neuron_id; target_nid = target_neuron_id; att = amount_to_target) {
+                    maybe_transfer_stake(Update_Fees(neuron, source_neuron_id, fees_amount));
+                }
+            };
+        };
+
+    MergeNeurons_Stake_WaitForTransfer:
+        with(answer \in { resp \in ledger_to_governance: resp.caller = self}) {
+            ledger_to_governance := ledger_to_governance \ {answer};
+            if(answer.response = Variant("Fail", UNIT)) {
+                neuron := Increase_Stake(neuron, source_neuron_id, amount_to_target + TRANSACTION_FEE);
+                finish();
+            } else {
+                with(source_nid = source_neuron_id; target_nid = target_neuron_id) {
+                    adjust_maturities(Increase_Stake(neuron, target_neuron_id, amount_to_target));
+                    finish();
+                }
+            };
+        };
+    }
+}
+*)
+\* BEGIN TRANSLATION (chksum(pcal) = "e673c31c" /\ chksum(tla) = "225bd637")
+VARIABLES pc, neuron, neuron_id_by_account, locks, governance_to_ledger,
+          ledger_to_governance, source_neuron_id, target_neuron_id,
+          fees_amount, amount_to_target
+
+vars == << pc, neuron, neuron_id_by_account, locks, governance_to_ledger,
+           ledger_to_governance, source_neuron_id, target_neuron_id,
+           fees_amount, amount_to_target >>
+
+ProcSet == (Merge_Neurons_Process_Ids)
+
+Init == (* Global variables *)
+        /\ neuron \in [{} -> {}]
+        /\ neuron_id_by_account \in [{} -> {}]
+        /\ locks = {}
+        /\ governance_to_ledger = <<>>
+        /\ ledger_to_governance = {}
+        (* Process Merge_Neurons *)
+        /\ source_neuron_id = [self \in Merge_Neurons_Process_Ids |-> 0]
+        /\ target_neuron_id = [self \in Merge_Neurons_Process_Ids |-> 0]
+        /\ fees_amount = [self \in Merge_Neurons_Process_Ids |-> 0]
+        /\ amount_to_target = [self \in Merge_Neurons_Process_Ids |-> 0]
+        /\ pc = [self \in ProcSet |-> "MergeNeurons_Start"]
+
+MergeNeurons_Start(self) == /\ pc[self] = "MergeNeurons_Start"
+                            /\ \/ /\ pc' = [pc EXCEPT ![self] = "Done"]
+                                  /\ UNCHANGED <<neuron, locks, governance_to_ledger, source_neuron_id, target_neuron_id, fees_amount, amount_to_target>>
+                               \/ /\ \E source_nid \in DOMAIN(neuron) \ locks:
+                                       \E target_nid \in DOMAIN(neuron) \ locks:
+                                         /\ source_nid /= target_nid
+                                         /\   (neuron[source_nid].cached_stake - neuron[source_nid].fees) +
+                                            (neuron[target_nid].cached_stake - neuron[target_nid].fees) /= 0
+                                         /\ LET fa == neuron[source_nid].fees IN
+                                              LET att == LET diff == Minted_Stake(neuron, source_nid) - TRANSACTION_FEE
+                                                         IN IF diff > 0 THEN diff ELSE 0 IN
+                                                IF fa > TRANSACTION_FEE
+                                                   THEN /\ source_neuron_id' = [source_neuron_id EXCEPT ![self] = source_nid]
+                                                        /\ target_neuron_id' = [target_neuron_id EXCEPT ![self] = target_nid]
+                                                        /\ locks' = (locks \union {source_neuron_id'[self], target_neuron_id'[self]})
+                                                        /\ fees_amount' = [fees_amount EXCEPT ![self] = fa]
+                                                        /\ amount_to_target' = [amount_to_target EXCEPT ![self] = att]
+                                                        /\ governance_to_ledger' = Append(governance_to_ledger, request(self, (transfer(neuron[source_neuron_id'[self]].account, Minting_Account_Id, fees_amount'[self], 0))))
+                                                        /\ pc' = [pc EXCEPT ![self] = "MergeNeurons_Burn_WaitForTransfer"]
+                                                        /\ UNCHANGED neuron
+                                                   ELSE /\ IF att > 0
+                                                              THEN /\ source_neuron_id' = [source_neuron_id EXCEPT ![self] = source_nid]
+                                                                   /\ target_neuron_id' = [target_neuron_id EXCEPT ![self] = target_nid]
+                                                                   /\ locks' = (locks \union { source_neuron_id'[self], target_neuron_id'[self] })
+                                                                   /\ amount_to_target' = [amount_to_target EXCEPT ![self] = att]
+                                                                   /\ neuron' = Decrease_Stake(neuron, source_neuron_id'[self], amount_to_target'[self] + TRANSACTION_FEE)
+                                                                   /\ governance_to_ledger' = Append(governance_to_ledger, request(self, (transfer(neuron'[source_neuron_id'[self]].account,
+                                                                                                                                              neuron'[target_neuron_id'[self]].account,
+                                                                                                                                              amount_to_target'[self],
+                                                                                                                                              TRANSACTION_FEE))))
+                                                                   /\ pc' = [pc EXCEPT ![self] = "MergeNeurons_Stake_WaitForTransfer"]
+                                                                   /\ UNCHANGED fees_amount
+                                                              ELSE /\ neuron' =       Decrease_Maturity(
+                                                                                Increase_Maturity(neuron, target_nid, neuron[source_nid].maturity),
+                                                                                source_nid, neuron[source_nid].maturity)
+                                                                   /\ locks' = locks \ {source_neuron_id[self], target_neuron_id[self] }
+                                                                   /\ source_neuron_id' = [source_neuron_id EXCEPT ![self] = 0]
+                                                                   /\ target_neuron_id' = [target_neuron_id EXCEPT ![self] = 0]
+                                                                   /\ fees_amount' = [fees_amount EXCEPT ![self] = 0]
+                                                                   /\ amount_to_target' = [amount_to_target EXCEPT ![self] = 0]
+                                                                   /\ pc' = [pc EXCEPT ![self] = "Done"]
+                                                                   /\ UNCHANGED governance_to_ledger
+                            /\ UNCHANGED << neuron_id_by_account,
+                                            ledger_to_governance >>
+
+MergeNeurons_Burn_WaitForTransfer(self) == /\ pc[self] = "MergeNeurons_Burn_WaitForTransfer"
+                                           /\ \E answer \in { resp \in ledger_to_governance: resp.caller = self}:
+                                                /\ ledger_to_governance' = ledger_to_governance \ {answer}
+                                                /\ IF answer.response = Variant("Fail", UNIT)
+                                                      THEN /\ locks' = locks \ {source_neuron_id[self], target_neuron_id[self] }
+                                                           /\ source_neuron_id' = [source_neuron_id EXCEPT ![self] = 0]
+                                                           /\ target_neuron_id' = [target_neuron_id EXCEPT ![self] = 0]
+                                                           /\ fees_amount' = [fees_amount EXCEPT ![self] = 0]
+                                                           /\ amount_to_target' = [amount_to_target EXCEPT ![self] = 0]
+                                                           /\ pc' = [pc EXCEPT ![self] = "Done"]
+                                                           /\ UNCHANGED << neuron,
+                                                                           governance_to_ledger >>
+                                                      ELSE /\ LET source_nid == source_neuron_id[self] IN
+                                                                LET target_nid == target_neuron_id[self] IN
+                                                                  LET att == amount_to_target[self] IN
+                                                                    IF att > 0
+                                                                       THEN /\ source_neuron_id' = [source_neuron_id EXCEPT ![self] = source_nid]
+                                                                            /\ target_neuron_id' = [target_neuron_id EXCEPT ![self] = target_nid]
+                                                                            /\ locks' = (locks \union { source_neuron_id'[self], target_neuron_id'[self] })
+                                                                            /\ amount_to_target' = [amount_to_target EXCEPT ![self] = att]
+                                                                            /\ neuron' = Decrease_Stake((Update_Fees(neuron, source_neuron_id'[self], fees_amount[self])), source_neuron_id'[self], amount_to_target'[self] + TRANSACTION_FEE)
+                                                                            /\ governance_to_ledger' = Append(governance_to_ledger, request(self, (transfer(neuron'[source_neuron_id'[self]].account,
+                                                                                                                                                       neuron'[target_neuron_id'[self]].account,
+                                                                                                                                                       amount_to_target'[self],
+                                                                                                                                                       TRANSACTION_FEE))))
+                                                                            /\ pc' = [pc EXCEPT ![self] = "MergeNeurons_Stake_WaitForTransfer"]
+                                                                            /\ UNCHANGED fees_amount
+                                                                       ELSE /\ neuron' =       Decrease_Maturity(
+                                                                                         Increase_Maturity((Update_Fees(neuron, source_neuron_id[self], fees_amount[self])), target_nid, neuron[source_nid].maturity),
+                                                                                         source_nid, neuron[source_nid].maturity)
+                                                                            /\ locks' = locks \ {source_neuron_id[self], target_neuron_id[self] }
+                                                                            /\ source_neuron_id' = [source_neuron_id EXCEPT ![self] = 0]
+                                                                            /\ target_neuron_id' = [target_neuron_id EXCEPT ![self] = 0]
+                                                                            /\ fees_amount' = [fees_amount EXCEPT ![self] = 0]
+                                                                            /\ amount_to_target' = [amount_to_target EXCEPT ![self] = 0]
+                                                                            /\ pc' = [pc EXCEPT ![self] = "Done"]
+                                                                            /\ UNCHANGED governance_to_ledger
+                                           /\ UNCHANGED neuron_id_by_account
+
+MergeNeurons_Stake_WaitForTransfer(self) == /\ pc[self] = "MergeNeurons_Stake_WaitForTransfer"
+                                            /\ \E answer \in { resp \in ledger_to_governance: resp.caller = self}:
+                                                 /\ ledger_to_governance' = ledger_to_governance \ {answer}
+                                                 /\ IF answer.response = Variant("Fail", UNIT)
+                                                       THEN /\ neuron' = Increase_Stake(neuron, source_neuron_id[self], amount_to_target[self] + TRANSACTION_FEE)
+                                                            /\ locks' = locks \ {source_neuron_id[self], target_neuron_id[self] }
+                                                            /\ source_neuron_id' = [source_neuron_id EXCEPT ![self] = 0]
+                                                            /\ target_neuron_id' = [target_neuron_id EXCEPT ![self] = 0]
+                                                            /\ fees_amount' = [fees_amount EXCEPT ![self] = 0]
+                                                            /\ amount_to_target' = [amount_to_target EXCEPT ![self] = 0]
+                                                            /\ pc' = [pc EXCEPT ![self] = "Done"]
+                                                       ELSE /\ LET source_nid == source_neuron_id[self] IN
+                                                                 LET target_nid == target_neuron_id[self] IN
+                                                                   /\ neuron' =       Decrease_Maturity(
+                                                                                Increase_Maturity((Increase_Stake(neuron, target_neuron_id[self], amount_to_target[self])), target_nid, neuron[source_nid].maturity),
+                                                                                source_nid, neuron[source_nid].maturity)
+                                                                   /\ locks' = locks \ {source_neuron_id[self], target_neuron_id[self] }
+                                                                   /\ source_neuron_id' = [source_neuron_id EXCEPT ![self] = 0]
+                                                                   /\ target_neuron_id' = [target_neuron_id EXCEPT ![self] = 0]
+                                                                   /\ fees_amount' = [fees_amount EXCEPT ![self] = 0]
+                                                                   /\ amount_to_target' = [amount_to_target EXCEPT ![self] = 0]
+                                                                   /\ pc' = [pc EXCEPT ![self] = "Done"]
+                                            /\ UNCHANGED << neuron_id_by_account,
+                                                            governance_to_ledger >>
+
+Merge_Neurons(self) == MergeNeurons_Start(self)
+                          \/ MergeNeurons_Burn_WaitForTransfer(self)
+                          \/ MergeNeurons_Stake_WaitForTransfer(self)
+
+(* Allow infinite stuttering to prevent deadlock on termination. *)
+Terminating == /\ \A self \in ProcSet: pc[self] = "Done"
+               /\ UNCHANGED vars
+
+Next == (\E self \in Merge_Neurons_Process_Ids: Merge_Neurons(self))
+           \/ Terminating
+
+Spec == Init /\ [][Next]_vars
+
+Termination == <>(\A self \in ProcSet: pc[self] = "Done")
+
+\* END TRANSLATION
+
+====
diff --git a/rs/nns/governance/tla/Merge_Neurons_Apalache.tla b/rs/nns/governance/tla/Merge_Neurons_Apalache.tla
new file mode 100644
index 00000000000..4e029383977
--- /dev/null
+++ b/rs/nns/governance/tla/Merge_Neurons_Apalache.tla
@@ -0,0 +1,52 @@
+---- MODULE Merge_Neurons_Apalache ----
+
+EXTENDS TLC, Variants
+
+
+\* CODE_LINK_INSERT_CONSTANTS
+
+(*
+
+CONSTANTS
+
+    \* @type: Set($proc);
+    Merge_Neurons_Process_Ids
+
+CONSTANTS
+    \* The transfer fee charged by the ledger canister
+    \* @type: Int;
+    TRANSACTION_FEE
+*)
+
+VARIABLES
+    \* @type: $neuronId -> {cached_stake: Int, account: $account, maturity: Int, fees: Int};
+    neuron,
+    \* @type: $account -> $neuronId;
+    neuron_id_by_account,
+    \* @type: Set($neuronId);
+    locks,
+    \* @type: Seq({caller : $proc, method_and_args: $methodCall });
+    governance_to_ledger,
+    \* @type: Set({caller: $proc, response: $methodResponse });
+    ledger_to_governance,
+    \* @type: $proc -> Str;
+    pc,
+    \* @type: $proc -> $neuronId;
+    source_neuron_id,
+    \* @type: $proc -> $neuronId;
+    target_neuron_id,
+    \* @type: $proc -> Int;
+    fees_amount,
+    \* @type: $proc -> Int;
+    amount_to_target
+
+\* @type: Set($neuronId) => $neuronId;
+FRESH_NEURON_ID(existing_neurons) == CHOOSE nid \in (Neuron_Ids \ existing_neurons): TRUE
+
+MOD == INSTANCE Merge_Neurons
+
+Next == [MOD!Next]_MOD!vars
+
+====
+
+====
diff --git a/rs/nns/integration_tests/BUILD.bazel b/rs/nns/integration_tests/BUILD.bazel
index 55d38fff45d..ecfada93f43 100644
--- a/rs/nns/integration_tests/BUILD.bazel
+++ b/rs/nns/integration_tests/BUILD.bazel
@@ -117,6 +117,7 @@ MACRO_DEPENDENCIES = [
 
 DEV_DEPENDENCIES = [
     # Keep sorted.
+    "//packages/pocket-ic",
     "//rs/nervous_system/common/test_utils",
     "//rs/nervous_system/integration_tests:nervous_system_integration_tests",
     "//rs/nns/test_utils/golden_nns_state",
@@ -124,6 +125,7 @@ DEV_DEPENDENCIES = [
     "@crate_index//:ic-cbor",
     "@crate_index//:ic-certificate-verification",
     "@crate_index//:ic-certification",
+    "@crate_index//:itertools",
     "@crate_index//:serde_cbor",
 ]
 
@@ -152,6 +154,7 @@ DEV_DATA = [
     "//rs/nns/handlers/lifeline/impl:lifeline_canister",
     "//rs/nns/handlers/root/impl:root-canister",
     "//rs/nns/sns-wasm:sns-wasm-canister",
+    "//rs/pocket_ic_server:pocket-ic-server",
     "//rs/registry/canister:registry-canister",
     "//rs/rosetta-api/tvl/xrc_mock:xrc_mock_canister",
     "//rs/sns/governance:sns-governance-canister",
@@ -180,6 +183,7 @@ DEV_ENV = {
     "GENESIS_TOKEN_CANISTER_WASM_PATH": "$(rootpath //rs/nns/gtc:genesis-token-canister)",
     "CYCLES_MINTING_CANISTER_WASM_PATH": "$(rootpath //rs/nns/cmc:cycles-minting-canister)",
     "MEM_UTILS_TEST_CANISTER_WASM_PATH": "$(rootpath :mem-utils-test-canister)",
+    "POCKET_IC_BIN": "$(rootpath //rs/pocket_ic_server:pocket-ic-server)",
     "GOVERNANCE_MEM_TEST_CANISTER_WASM_PATH": "$(rootpath :governance-mem-test-canister)",
     "CANISTER_PLAYGROUND_CANISTER_WASM_PATH": "$(rootpath :canister-playground-canister)",
     "SNS_WASM_CANISTER_WASM_PATH": "$(rootpath //rs/nns/sns-wasm:sns-wasm-canister)",
diff --git a/rs/nns/integration_tests/Cargo.toml b/rs/nns/integration_tests/Cargo.toml
index a3497b9990e..29d6d62fbdc 100644
--- a/rs/nns/integration_tests/Cargo.toml
+++ b/rs/nns/integration_tests/Cargo.toml
@@ -98,9 +98,11 @@ ic-test-utilities = { path = "../../test_utilities" }
 ic-types = { path = "../../types/types" }
 ic-types-test-utils = { path = "../../types/types_test_utils" }
 ic-xrc-types = "1.0.0"
+itertools = { workspace = true }
 maplit = "1.0.2"
 on_wire = { path = "../../rust_canisters/on_wire" }
 phantom_newtype = { path = "../../phantom_newtype" }
+pocket-ic = { path = "../../../packages/pocket-ic" }
 rand = { workspace = true }
 registry-canister = { path = "../../registry/canister" }
 rustc-hash = "1.1.0"
diff --git a/rs/nns/integration_tests/src/neuron_following.rs b/rs/nns/integration_tests/src/neuron_following.rs
index c2338fe2c17..90635fb7251 100644
--- a/rs/nns/integration_tests/src/neuron_following.rs
+++ b/rs/nns/integration_tests/src/neuron_following.rs
@@ -1,12 +1,18 @@
 use assert_matches::assert_matches;
+use ic_base_types::PrincipalId;
+use ic_nervous_system_common::{E8, ONE_MONTH_SECONDS};
+use ic_nervous_system_integration_tests::pocket_ic_helpers::{install_canister, nns};
 use ic_nns_common::{pb::v1::NeuronId, types::ProposalId};
+use ic_nns_constants::{GOVERNANCE_CANISTER_ID, ROOT_CANISTER_ID};
 use ic_nns_governance_api::pb::v1::{
     governance_error::ErrorType,
     manage_neuron_response::{Command, FollowResponse},
-    Tally, Topic, Vote,
+    neuron::{DissolveState, Followees},
+    Neuron, Tally, Topic, Vote,
 };
+use ic_nns_governance_init::GovernanceCanisterInitPayloadBuilder;
 use ic_nns_test_utils::{
-    common::NnsInitPayloadsBuilder,
+    common::{build_test_governance_wasm, NnsInitPayloadsBuilder},
     neuron_helpers::{
         get_neuron_1, get_neuron_2, get_neuron_3, get_nonexistent_neuron, get_unauthorized_neuron,
         submit_proposal, TestNeuronOwner,
@@ -19,6 +25,11 @@ use ic_nns_test_utils::{
     },
 };
 use ic_state_machine_tests::StateMachine;
+use itertools::Itertools;
+use maplit::hashmap;
+use pocket_ic::{nonblocking::PocketIc, PocketIcBuilder};
+use prost::Message;
+use std::time::{Duration, SystemTime};
 
 const VALID_TOPIC: i32 = Topic::ParticipantManagement as i32;
 const INVALID_TOPIC: i32 = 69420;
@@ -379,6 +390,153 @@ fn vote_propagation_with_following() {
     assert_eq!(ballot_n3, (VOTING_POWER_NEURON_3, Vote::Yes));
 }
 
+/// Each neuron in this scenario represents a different case:
+///
+/// 1. Storage Location:
+///    1. Heap          - Active neuron.
+///    2. Stable Memory - Inactive neuron.
+/// 2. Voting Power Refreshed
+///    1. Recently - No prune.
+///    2. Long Ago - Needs pruning.
+#[tokio::test]
+async fn test_prune_some_following() {
+    // Step 1: Prepare the world. (This mainly consists of initializing NNS
+    // governance canister with some neurons.)
+
+    let pocket_ic = PocketIcBuilder::new().with_nns_subnet().build_async().await;
+
+    let now_seconds = pocket_ic
+        .get_time()
+        .await
+        .duration_since(SystemTime::UNIX_EPOCH)
+        .unwrap()
+        .as_secs();
+    // To ensure neurons are not considered "active" (for the purposes of storage location).
+    let earlier_timestamp_seconds = now_seconds - ONE_MONTH_SECONDS;
+
+    let followees = hashmap! {
+        // When pruning is needed, this gets erased.
+        Topic::Governance as i32 => Followees {
+            followees: vec![NeuronId { id: 1000 }],
+        },
+
+        // This NEVER gets erased.
+        Topic::NeuronManagement as i32 => Followees {
+            followees: vec![NeuronId { id: 1001 }],
+        },
+    };
+
+    let neuron_base = Neuron {
+        dissolve_state: Some(DissolveState::WhenDissolvedTimestampSeconds(
+            earlier_timestamp_seconds,
+        )),
+        created_timestamp_seconds: earlier_timestamp_seconds,
+        aging_since_timestamp_seconds: u64::MAX,
+
+        // This is where possible changes occur. (Thus, we will inspect this
+        // later to verify that the code under test did its job.)
+        followees: followees.clone(),
+
+        ..Default::default()
+    };
+
+    let seven_months_ago_timestamp_seconds = now_seconds - 7 * ONE_MONTH_SECONDS;
+    let voting_power_refreshed_timestamp_seconds_neuron_values = vec![
+        seven_months_ago_timestamp_seconds - 600, // Long ago -> needs pruning.
+        seven_months_ago_timestamp_seconds + 600, // Recent -> no prune (but almost).
+    ];
+
+    let cached_neuron_stake_e8s_neuron_values = vec![
+        0,       // inactive -> stable memory
+        42 * E8, // active -> heap
+    ];
+
+    let neurons = voting_power_refreshed_timestamp_seconds_neuron_values
+        .into_iter()
+        .cartesian_product(cached_neuron_stake_e8s_neuron_values.into_iter())
+        .collect::<Vec<_>>();
+
+    let neurons = (42..)
+        .zip(neurons.into_iter())
+        .map(
+            |(id, (voting_power_refreshed_timestamp_seconds, cached_neuron_stake_e8s))| Neuron {
+                id: Some(NeuronId { id }),
+                controller: Some(PrincipalId::new_user_test_id(id)),
+                account: vec![id as u8; 32],
+                cached_neuron_stake_e8s,
+                voting_power_refreshed_timestamp_seconds: Some(
+                    voting_power_refreshed_timestamp_seconds,
+                ),
+                ..neuron_base.clone()
+            },
+        )
+        .collect::<Vec<_>>();
+
+    assert_eq!(neurons.len(), 4);
+
+    let governance_proto = GovernanceCanisterInitPayloadBuilder::new()
+        .with_additional_neurons(neurons)
+        .build();
+
+    install_canister(
+        &pocket_ic,
+        "NNS Governance",
+        GOVERNANCE_CANISTER_ID,
+        governance_proto.encode_to_vec(),
+        // TODO: Once following pruning is released, replace with vanilla
+        // build_governance_wasm(). For now, the feature is only enabled when
+        // built with feature = "test".
+        build_test_governance_wasm(),
+        Some(ROOT_CANISTER_ID.get()),
+    )
+    .await;
+
+    // Step 2: Call the code under test.
+
+    // Wait for pruning to occur in the background.
+    for _ in 0..100 {
+        pocket_ic.advance_time(Duration::from_secs(1)).await;
+        pocket_ic.tick().await;
+    }
+
+    // Step 3: Inspect results
+
+    async fn get_full_neuron(pocket_ic: &PocketIc, id: u64) -> Neuron {
+        let mut result =
+            nns::governance::list_neurons(pocket_ic, PrincipalId::new_user_test_id(id))
+                .await
+                .full_neurons;
+
+        assert_eq!(result.len(), 1);
+
+        result.pop().unwrap()
+    }
+
+    // Assert that neurons that were refreshed "long" ago were pruned.
+    for id in [42, 43] {
+        let neuron = get_full_neuron(&pocket_ic, id).await;
+
+        assert_eq!(
+            neuron.followees,
+            hashmap! {
+                Topic::NeuronManagement as i32 => Followees {
+                    followees: vec![NeuronId { id: 1001 }],
+                }
+            },
+            "{}",
+            id,
+        );
+    }
+
+    // Assert that neurons that were refreshed recently were NOT modified.
+    for id in [44, 45] {
+        let neuron = get_full_neuron(&pocket_ic, id).await;
+
+        // Assert that neuron was pruned.
+        assert_eq!(neuron.followees, followees, "{}", id,);
+    }
+}
+
 fn split_neuron(state_machine: &StateMachine, neuron: &TestNeuronOwner, amount: u64) -> NeuronId {
     let response = nns_split_neuron(state_machine, neuron.principal_id, neuron.neuron_id, amount);
     if let Command::Split(resp) = response.command.unwrap() {
diff --git a/rs/orchestrator/BUILD.bazel b/rs/orchestrator/BUILD.bazel
index 741a52a97e8..4b4fa3eb70a 100644
--- a/rs/orchestrator/BUILD.bazel
+++ b/rs/orchestrator/BUILD.bazel
@@ -62,6 +62,7 @@ rust_library(
         "@crate_index//:rand",
         "@crate_index//:serde",
         "@crate_index//:serde_cbor",
+        "@crate_index//:serde_json",
         "@crate_index//:slog",
         "@crate_index//:slog-async",
         "@crate_index//:strum",
diff --git a/rs/orchestrator/Cargo.toml b/rs/orchestrator/Cargo.toml
index fb164517bf7..aac8a74fbe2 100644
--- a/rs/orchestrator/Cargo.toml
+++ b/rs/orchestrator/Cargo.toml
@@ -53,6 +53,7 @@ prost = { workspace = true }
 rand = { workspace = true }
 serde = { workspace = true }
 serde_cbor = { workspace = true }
+serde_json = { workspace = true }
 slog = { workspace = true }
 slog-async = { workspace = true }
 strum = { workspace = true }
diff --git a/rs/orchestrator/src/boundary_node.rs b/rs/orchestrator/src/boundary_node.rs
index 111fdd28dcf..563d77ea1bf 100644
--- a/rs/orchestrator/src/boundary_node.rs
+++ b/rs/orchestrator/src/boundary_node.rs
@@ -4,6 +4,7 @@ use crate::{
     process_manager::{Process, ProcessManager},
     registry_helper::RegistryHelper,
 };
+use ic_config::crypto::CryptoConfig;
 use ic_logger::{info, warn, ReplicaLogger};
 use ic_types::{NodeId, ReplicaVersion};
 use std::{
@@ -46,6 +47,7 @@ pub(crate) struct BoundaryNodeManager {
     _metrics: Arc<OrchestratorMetrics>,
     process: Arc<Mutex<ProcessManager<BoundaryNodeProcess>>>,
     ic_binary_dir: PathBuf,
+    crypto_config: CryptoConfig,
     version: ReplicaVersion,
     logger: ReplicaLogger,
     node_id: NodeId,
@@ -59,6 +61,7 @@ impl BoundaryNodeManager {
         version: ReplicaVersion,
         node_id: NodeId,
         ic_binary_dir: PathBuf,
+        crypto_config: CryptoConfig,
         logger: ReplicaLogger,
     ) -> Self {
         Self {
@@ -68,6 +71,7 @@ impl BoundaryNodeManager {
                 logger.clone().inner_logger.root,
             ))),
             ic_binary_dir,
+            crypto_config,
             version,
             logger,
             node_id,
@@ -164,7 +168,14 @@ impl BoundaryNodeManager {
             OrchestratorError::IoError("unable to read ic-boundary environment variables".into(), e)
         })?;
 
-        let args = vec![format!("--tls-hostname={}", domain_name)];
+        let args = vec![
+            format!("--tls-hostname={}", domain_name),
+            format!(
+                "--crypto-config={}",
+                serde_json::to_string(&self.crypto_config)
+                    .map_err(OrchestratorError::SerializeCryptoConfigError)?
+            ),
+        ];
 
         process
             .start(BoundaryNodeProcess {
diff --git a/rs/orchestrator/src/error.rs b/rs/orchestrator/src/error.rs
index de8920fc039..33f8dfdf506 100644
--- a/rs/orchestrator/src/error.rs
+++ b/rs/orchestrator/src/error.rs
@@ -43,6 +43,9 @@ pub(crate) enum OrchestratorError {
     /// A replica version (of a subnet record) could not be parsed
     ReplicaVersionParseError(ReplicaVersionParseError),
 
+    /// The crypto-config could not be serialized
+    SerializeCryptoConfigError(serde_json::Error),
+
     /// An IO error occurred
     IoError(String, io::Error),
 
@@ -145,6 +148,9 @@ impl fmt::Display for OrchestratorError {
             OrchestratorError::ReplicaVersionParseError(e) => {
                 write!(f, "Failed to parse replica version: {}", e)
             }
+            OrchestratorError::SerializeCryptoConfigError(e) => {
+                write!(f, "Failed to serialize crypto-config: {}", e)
+            }
             OrchestratorError::MakeRegistryCupError(subnet_id, registry_version) => write!(
                 f,
                 "Failed to construct the genesis/recovery CUP, subnet_id: {}, registry_version: {}",
diff --git a/rs/orchestrator/src/orchestrator.rs b/rs/orchestrator/src/orchestrator.rs
index 9463e23ffa9..d453684be8e 100644
--- a/rs/orchestrator/src/orchestrator.rs
+++ b/rs/orchestrator/src/orchestrator.rs
@@ -277,6 +277,7 @@ impl Orchestrator {
             replica_version.clone(),
             node_id,
             ic_binary_directory.clone(),
+            config.crypto.clone(),
             logger.clone(),
         );
 
diff --git a/rs/p2p/consensus_manager/README.adoc b/rs/p2p/consensus_manager/README.adoc
new file mode 100644
index 00000000000..bfde5e9599e
--- /dev/null
+++ b/rs/p2p/consensus_manager/README.adoc
@@ -0,0 +1,35 @@
+= Abortable Broadcast 
+:toc:  
+
+== Overview  
+
+This library implements the https://arxiv.org/abs/2410.22080[_Abortable Broadcast_] primitive.  
+
+Currently, the implementation has some limitations that restrict its generalization:  
+
+- **ArtifactAssembler coupling**: The implementation is tightly coupled with the `ArtifactAssembler`, reducing modularity.  
+- **Slot table deletions**: Deletions in the slot table are not propagated, which lead to inconsistencies.  
+
+== Requirements  
+
+[cols="3,3,3", options="header"]  
+|===  
+| **Capability** | **Purpose** | **Implementation Requirements**  
+
+| **PubSub-like library**  
+| Simplifies application development by abstracting one-to-many communication within a set of nodes.  
+| The library must implement https://en.wikipedia.org/wiki/Eventual_consistency[_eventual consistency_].  
+
+| **Multitenancy of applications**  
+| Allows multiple applications to safely use the library, ensuring isolation and uninterrupted operation between all applications.  
+| Must implement fair scheduling across peers to ensure resource allocation and isolation.  
+
+| **Operation in P2P networks with Byzantine peers**  
+| Ensures reliable message publishing and creation rates, even in networks with faulty or malicious nodes.  
+| The implementation must provide a non-IO-bound API and be memory-bounded.  
+
+| **Scalable and resource-efficient**  
+| Optimizes usage of shared resources (e.g., CPU, file descriptors) to maintain performance under high demand and prevent resource exhaustion.  
+| The library should expose a synchronous interface but implement asynchronous operations under the hood.  
+
+|===  
diff --git a/rs/p2p/quic_transport/README.adoc b/rs/p2p/quic_transport/README.adoc
index 56e8b9edd9c..7de146705ab 100644
--- a/rs/p2p/quic_transport/README.adoc
+++ b/rs/p2p/quic_transport/README.adoc
@@ -15,7 +15,7 @@ The IC Transport layer enables message delivery between nodes within a subnet.
 | **Implementation Requirement**
 
 | RPC-like library
-| Simplifies application development by abstracting communication between nodes, allowing developers to focus on application logic instead of low-level networking.
+| Abstracting one-to-one communication between nodes, allowing developers to focus on application logic instead of low-level networking.
 | Ensure https://en.wikipedia.org/wiki/Reliability_(computer_networking)[reliable data delivery] so the sender can confirm successful message delivery to the recipient.
 
 | Multitenancy of applications
diff --git a/rs/p2p/quic_transport/src/connection_manager.rs b/rs/p2p/quic_transport/src/connection_manager.rs
index 4cb54d95dfd..4c8a66464c2 100644
--- a/rs/p2p/quic_transport/src/connection_manager.rs
+++ b/rs/p2p/quic_transport/src/connection_manager.rs
@@ -36,7 +36,7 @@ use axum::{
 use futures::StreamExt;
 use ic_async_utils::JoinMap;
 use ic_base_types::NodeId;
-use ic_crypto_tls_interfaces::{SomeOrAllNodes, TlsConfig, TlsConfigError};
+use ic_crypto_tls_interfaces::{SomeOrAllNodes, TlsConfig};
 use ic_crypto_utils_tls::node_id_from_certificate_der;
 use ic_interfaces_registry::RegistryClient;
 use ic_logger::{error, info, ReplicaLogger};
@@ -127,22 +127,17 @@ enum ConnectionEstablishError {
         CONNECT_TIMEOUT
     )]
     Timeout,
-    #[error("Failed to get rustls client config for peer {peer_id:?}. {cause:?}")]
-    TlsClientConfigError {
-        peer_id: NodeId,
-        cause: TlsConfigError,
-    },
-    #[error("Failed to connect to peer {peer_id:?}. {cause:?}")]
-    ConnectError {
-        peer_id: NodeId,
-        cause: ConnectError,
-    },
     #[error("Incoming connection failed. {cause:?}")]
     ConnectionError {
         peer_id: Option<NodeId>,
         cause: ConnectionError,
     },
     // The following errors should be infallible.
+    #[error("Failed to establish outbound connection to peer {peer_id:?} due to errors in the parameters being used. {cause:?}")]
+    BadConnectParameters {
+        peer_id: NodeId,
+        cause: ConnectError,
+    },
     #[error("No peer identity available.")]
     MissingPeerIdentity,
     #[error("Malformed peer identity. {0}")]
@@ -207,7 +202,9 @@ pub(crate) fn start_connection_manager(
             SomeOrAllNodes::Some(BTreeSet::new()),
             registry_client.get_latest_version(),
         )
-        .expect("Failed to get rustls server config, so transport can't start.");
+        .expect(
+            "The rustls server config must be locally available, otherwise transport can't start.",
+        );
 
     let mut transport_config = quinn::TransportConfig::default();
 
@@ -450,21 +447,26 @@ impl ConnectionManager {
         let rustls_client_config = self
             .tls_config
             .client_config(peer_id, self.topology.latest_registry_version())
-            .map_err(|cause| ConnectionEstablishError::TlsClientConfigError { peer_id, cause })
-            .unwrap();
+            .expect("The rustls client config must be locally available, otherwise transport can't start.");
         let transport_config = self.transport_config.clone();
+        let quinn_client_config = QuicClientConfig::try_from(rustls_client_config).unwrap();
+        let mut client_config = quinn::ClientConfig::new(Arc::new(quinn_client_config));
+        client_config.transport_config(transport_config);
         let conn_fut = async move {
-            let quinn_client_config = QuicClientConfig::try_from(rustls_client_config).unwrap();
-            let mut client_config = quinn::ClientConfig::new(Arc::new(quinn_client_config));
-            client_config.transport_config(transport_config);
-            let connecting = endpoint.connect_with(client_config, addr, "irrelevant");
-            let established = connecting
-                .map_err(|cause| ConnectionEstablishError::ConnectError { peer_id, cause })?
-                .await
-                .map_err(|cause| ConnectionEstablishError::ConnectionError {
-                    peer_id: Some(peer_id),
+            // 'connect_with' is placed inside the async block so the event loop retries on failure.
+            let connecting = endpoint
+                .connect_with(client_config, addr, "irrelevant")
+                .map_err(|cause| ConnectionEstablishError::BadConnectParameters {
+                    peer_id,
                     cause,
                 })?;
+            let established =
+                connecting
+                    .await
+                    .map_err(|cause| ConnectionEstablishError::ConnectionError {
+                        peer_id: Some(peer_id),
+                        cause,
+                    })?;
 
             Ok::<_, ConnectionEstablishError>(ConnectionWithPeerId {
                 peer_id,
diff --git a/rs/p2p/quic_transport/src/lib.rs b/rs/p2p/quic_transport/src/lib.rs
index 1c1514703fd..2099719f653 100644
--- a/rs/p2p/quic_transport/src/lib.rs
+++ b/rs/p2p/quic_transport/src/lib.rs
@@ -186,9 +186,12 @@ impl QuicTransport {
 /// https://datatracker.ietf.org/doc/html/draft-ietf-quic-transport-03#section-12.3.
 const QUIC_STREAM_CANCELLED: VarInt = VarInt::from_u32(0x80000006);
 
-/// Drop guard to send a [`SendStream::reset`] frame on drop. QUINN sends a [`SendStream::finish`] frame by default when dropping a [`SendStream`],
-/// which can lead to the peer receiving the stream thinking a complete message was sent. This guard is used to send a reset frame instead, to signal
-/// that the transmission of the message was cancelled.
+/// A drop guard that sends a [`SendStream::reset`] frame when dropped.
+///
+/// By default, QUINN sends a [`SendStream::finish`] frame upon dropping a [`SendStream`].
+/// This struct overrides that behavior by sending a reset frame instead, signaling
+/// that the message transmission was canceled. This approach helps optimize bandwidth
+/// usage in scenarios involving message cancellation.
 struct ResetStreamOnDrop {
     send_stream: SendStream,
 }
diff --git a/rs/p2p/quic_transport/src/metrics.rs b/rs/p2p/quic_transport/src/metrics.rs
index 73cf9cceca7..6678de167d0 100644
--- a/rs/p2p/quic_transport/src/metrics.rs
+++ b/rs/p2p/quic_transport/src/metrics.rs
@@ -16,13 +16,14 @@ const REQUEST_TYPE_LABEL: &str = "request";
 pub(crate) const CONNECTION_RESULT_SUCCESS_LABEL: &str = "success";
 pub(crate) const CONNECTION_RESULT_FAILED_LABEL: &str = "failed";
 pub(crate) const ERROR_TYPE_APP: &str = "app";
+// A serious internal invariant is broken (i.e. worthy of a bug or outage report)
 pub(crate) const INFALIBBLE: &str = "infallible";
 const ERROR_RESET_STREAM: &str = "reset_stream";
 const ERROR_STOPPED_STREAM: &str = "stopped_stream";
 const ERROR_APP_CLOSED_CONN: &str = "app_closed_conn";
 const ERROR_TIMED_OUT_CONN: &str = "timed_out_conn";
+const ERROR_TRANSPORT_ERROR: &str = "transport_error_conn";
 const ERROR_LOCALLY_CLOSED_CONN: &str = "locally_closed_conn";
-const ERROR_QUIC_CLOSED_CONN: &str = "quic_closed_conn";
 
 pub(crate) const STREAM_TYPE_BIDI: &str = "bidi";
 
@@ -214,16 +215,19 @@ pub fn observe_conn_error(err: &ConnectionError, op: &str, counter: &IntCounterV
             .inc(),
         // This can occur if the peer crashes or experiences connectivity issues.
         ConnectionError::TimedOut => counter.with_label_values(&[op, ERROR_TIMED_OUT_CONN]).inc(),
-        // A connection was closed by the QUIC protocol. Overall should be infallible.
-        _ => counter
-            .with_label_values(&[op, ERROR_QUIC_CLOSED_CONN])
+        // This should be made infallible.
+        ConnectionError::TransportError(_) => counter
+            .with_label_values(&[op, ERROR_TRANSPORT_ERROR])
             .inc(),
+        // A connection was closed by the QUIC protocol. Overall should be infallible.
+        _ => counter.with_label_values(&[op, INFALIBBLE]).inc(),
     }
 }
 
 pub fn observe_write_error(err: &WriteError, op: &str, counter: &IntCounterVec) {
     match err {
-        // This should be infallible. The peer will never stop a stream, it can only reset it.
+        // Occurs when the peer cancels the `RecvStream` future, similar to `ERROR_RESET_STREAM` semantics,
+        // e.g., when the RPC method is part of a `select` branch.
         WriteError::Stopped(_) => counter.with_label_values(&[op, ERROR_STOPPED_STREAM]).inc(),
         WriteError::ConnectionLost(conn_err) => observe_conn_error(conn_err, op, counter),
         // If any of the following errors occur it means that we have a bug in the protocol implementation or
@@ -236,8 +240,8 @@ pub fn observe_write_error(err: &WriteError, op: &str, counter: &IntCounterVec)
 
 pub fn observe_read_error(err: &ReadError, op: &str, counter: &IntCounterVec) {
     match err {
-        // This can happen if the peer reset the stream due to aborting the future that writes to the stream.
-        // E.g. the RPC method is part of a select branch.
+        // Occurs when the peer cancels the `SendStream` future, similar to `ERROR_STOPPED_STREAM` semantics,
+        // e.g., when the RPC method is part of a `select` branch.
         ReadError::Reset(_) => counter.with_label_values(&[op, ERROR_RESET_STREAM]).inc(),
         ReadError::ConnectionLost(conn_err) => observe_conn_error(conn_err, op, counter),
         // If any of the following errors occur it means that we have a bug in the protocol implementation or
diff --git a/rs/protobuf/def/state/metadata/v1/metadata.proto b/rs/protobuf/def/state/metadata/v1/metadata.proto
index f12eb451702..06194d23af8 100644
--- a/rs/protobuf/def/state/metadata/v1/metadata.proto
+++ b/rs/protobuf/def/state/metadata/v1/metadata.proto
@@ -76,6 +76,7 @@ message EcdsaArguments {
 message SchnorrArguments {
   types.v1.SchnorrKeyId key_id = 1;
   bytes message = 2;
+  optional bytes taproot_tree_root = 3;
 }
 
 message VetKdArguments {
diff --git a/rs/protobuf/src/gen/state/state.metadata.v1.rs b/rs/protobuf/src/gen/state/state.metadata.v1.rs
index b21a67564a3..02927c828f4 100644
--- a/rs/protobuf/src/gen/state/state.metadata.v1.rs
+++ b/rs/protobuf/src/gen/state/state.metadata.v1.rs
@@ -97,6 +97,8 @@ pub struct SchnorrArguments {
     pub key_id: ::core::option::Option<super::super::super::types::v1::SchnorrKeyId>,
     #[prost(bytes = "vec", tag = "2")]
     pub message: ::prost::alloc::vec::Vec<u8>,
+    #[prost(bytes = "vec", optional, tag = "3")]
+    pub taproot_tree_root: ::core::option::Option<::prost::alloc::vec::Vec<u8>>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct VetKdArguments {
diff --git a/rs/replay/src/player.rs b/rs/replay/src/player.rs
index 02b32e08f67..5898e9be313 100644
--- a/rs/replay/src/player.rs
+++ b/rs/replay/src/player.rs
@@ -759,7 +759,7 @@ impl Player {
             messages: BatchMessages::default(),
             // Use a fake randomness here since we don't have random tape for extra messages
             randomness,
-            idkg_subnet_public_keys: BTreeMap::new(),
+            chain_key_subnet_public_keys: BTreeMap::new(),
             idkg_pre_signature_ids: BTreeMap::new(),
             registry_version,
             time,
diff --git a/rs/replicated_state/src/metadata_state/subnet_call_context_manager.rs b/rs/replicated_state/src/metadata_state/subnet_call_context_manager.rs
index bb201250692..f7575d04e04 100644
--- a/rs/replicated_state/src/metadata_state/subnet_call_context_manager.rs
+++ b/rs/replicated_state/src/metadata_state/subnet_call_context_manager.rs
@@ -784,6 +784,7 @@ impl TryFrom<pb_metadata::EcdsaArguments> for EcdsaArguments {
 pub struct SchnorrArguments {
     pub key_id: SchnorrKeyId,
     pub message: Arc<Vec<u8>>,
+    pub taproot_tree_root: Option<Arc<Vec<u8>>>,
 }
 
 impl From<&SchnorrArguments> for pb_metadata::SchnorrArguments {
@@ -791,6 +792,7 @@ impl From<&SchnorrArguments> for pb_metadata::SchnorrArguments {
         Self {
             key_id: Some((&args.key_id).into()),
             message: args.message.to_vec(),
+            taproot_tree_root: args.taproot_tree_root.as_ref().map(|v| v.to_vec()),
         }
     }
 }
@@ -801,6 +803,7 @@ impl TryFrom<pb_metadata::SchnorrArguments> for SchnorrArguments {
         Ok(SchnorrArguments {
             key_id: try_from_option_field(context.key_id, "SchnorrArguments::key_id")?,
             message: Arc::new(context.message),
+            taproot_tree_root: context.taproot_tree_root.map(Arc::new),
         })
     }
 }
diff --git a/rs/rosetta-api/icp/BUILD.bazel b/rs/rosetta-api/icp/BUILD.bazel
index 5fb0fc3f099..62f5a53c275 100644
--- a/rs/rosetta-api/icp/BUILD.bazel
+++ b/rs/rosetta-api/icp/BUILD.bazel
@@ -13,7 +13,7 @@ package(default_visibility = ["//visibility:public"])
 DEPENDENCIES = [
     # Keep sorted.
     "//packages/ic-ledger-hash-of:ic_ledger_hash_of",
-    "//rs/canister_client",
+    "//rs/canister_client/read_state_response_parser",
     "//rs/crypto/sha2",
     "//rs/crypto/tree_hash",
     "//rs/crypto/utils/threshold_sig_der",
@@ -179,6 +179,7 @@ rust_test_suite_with_extra_srcs(
         "@mainnet_icp_ledger_canister//file",
     ],
     env = {
+        "RUST_TEST_THREADS": "4",
         "CANISTER_LAUNCHER": "$(rootpath //rs/canister_sandbox)",
         "LEDGER_CANISTER_NOTIFY_METHOD_WASM_PATH": "$(rootpath //rs/ledger_suite/icp/ledger:ledger-canister-wasm-notify-method)",
         "POCKET_IC_BIN": "$(rootpath //rs/pocket_ic_server:pocket-ic-server)",
@@ -197,6 +198,7 @@ rust_test_suite_with_extra_srcs(
     ]),
     flaky = True,
     proc_macro_deps = MACRO_DEV_DEPENDENCIES,
+    tags = ["cpu:4"],
     deps = DEV_DEPENDENCIES + DEPENDENCIES,
 )
 
diff --git a/rs/rosetta-api/icp/Cargo.toml b/rs/rosetta-api/icp/Cargo.toml
index d411fa625f1..8a1aef3a170 100644
--- a/rs/rosetta-api/icp/Cargo.toml
+++ b/rs/rosetta-api/icp/Cargo.toml
@@ -18,11 +18,10 @@ dfn_candid = { path = "../../rust_canisters/dfn_candid" }
 dfn_protobuf = { path = "../../rust_canisters/dfn_protobuf" }
 hex = { workspace = true }
 ic-agent = { workspace = true }
-ic-canister-client = { path = "../../canister_client" }
-ic-limits = { path = "../../limits" }
 ic-crypto-sha2 = { path = "../../crypto/sha2/" }
 ic-crypto-tree-hash = { path = "../../crypto/tree_hash" }
 ic-crypto-utils-threshold-sig-der = { path = "../../crypto/utils/threshold_sig_der" }
+ic-limits = { path = "../../limits" }
 ic-ledger-canister-blocks-synchronizer = { path = "ledger_canister_blocks_synchronizer" }
 ic-ledger-canister-core = { path = "../../ledger_suite/common/ledger_canister_core" }
 ic-ledger-core = { path = "../../ledger_suite/common/ledger_core" }
@@ -30,6 +29,7 @@ ic-ledger-hash-of = { path = "../../../packages/ic-ledger-hash-of" }
 ic-nns-common = { path = "../../nns/common" }
 ic-nns-constants = { path = "../../nns/constants" }
 ic-nns-governance-api = { path = "../../nns/governance/api" }
+ic-read-state-response-parser = { path = "../../canister_client/read_state_response_parser" }
 ic-types = { path = "../../types/types" }
 icp-ledger = { path = "../../ledger_suite/icp" }
 lazy_static = { workspace = true }
diff --git a/rs/rosetta-api/icp/src/ledger_client.rs b/rs/rosetta-api/icp/src/ledger_client.rs
index f33aed96de9..d06e45707ae 100644
--- a/rs/rosetta-api/icp/src/ledger_client.rs
+++ b/rs/rosetta-api/icp/src/ledger_client.rs
@@ -510,6 +510,15 @@ impl LedgerAccess for LedgerClient {
     }
 }
 
+/// The HTTP path for update calls on the replica.
+fn update_path(cid: CanisterId) -> String {
+    format!("api/v2/canister/{}/call", cid)
+}
+
+fn read_state_path(cid: CanisterId) -> String {
+    format!("api/v2/canister/{}/read_state", cid)
+}
+
 impl LedgerClient {
     // Exponential backoff from 100ms to 10s with a multiplier of 1.3.
     const MIN_POLL_INTERVAL: Duration = Duration::from_millis(100);
@@ -575,7 +584,7 @@ impl LedgerClient {
 
         let url = self
             .ic_url
-            .join(&ic_canister_client::update_path(canister_id))
+            .join(&update_path(canister_id))
             .expect("URL join failed");
 
         // Submit the update call (with retry).
@@ -726,7 +735,7 @@ impl LedgerClient {
             let wait_timeout = Self::TIMEOUT - start_time.elapsed();
             let url = self
                 .ic_url
-                .join(&ic_canister_client::read_state_path(canister_id))
+                .join(&read_state_path(canister_id))
                 .expect("URL join failed");
 
             match send_post_request(
@@ -746,7 +755,7 @@ impl LedgerClient {
                         let cbor: serde_cbor::Value = serde_cbor::from_slice(&body)
                             .map_err(|err| format!("While parsing the status body: {}", err))?;
 
-                        let status = ic_canister_client::parse_read_state_response(
+                        let status = ic_read_state_response_parser::parse_read_state_response(
                             &request_id,
                             &canister_id,
                             self.root_key.as_ref(),
diff --git a/rs/rust_canisters/xnet_test/BUILD.bazel b/rs/rust_canisters/xnet_test/BUILD.bazel
index 7861a5b5ae7..9ffd7588eab 100644
--- a/rs/rust_canisters/xnet_test/BUILD.bazel
+++ b/rs/rust_canisters/xnet_test/BUILD.bazel
@@ -5,13 +5,19 @@ package(default_visibility = ["//visibility:public"])
 
 DEPENDENCIES = [
     # Keep sorted.
-    "//rs/rust_canisters/dfn_core",
     "@crate_index//:candid",
+    "@crate_index//:futures",
+    "@crate_index//:ic-cdk",
     "@crate_index//:rand",
     "@crate_index//:rand_pcg",
     "@crate_index//:serde",
 ]
 
+MACRO_DEPENDENCIES = [
+    # Keep sorted.
+    "@crate_index//:ic-cdk-macros",
+]
+
 rust_library(
     name = "xnet_test",
     srcs = glob(["src/**"]),
@@ -28,6 +34,7 @@ rust_doc_test(
 rust_canister(
     name = "xnet-test-canister",
     srcs = ["src/main.rs"],
+    proc_macro_deps = MACRO_DEPENDENCIES,
     service_file = ":xnet_test.did",
     deps = DEPENDENCIES + [":xnet_test"],
 )
diff --git a/rs/rust_canisters/xnet_test/Cargo.toml b/rs/rust_canisters/xnet_test/Cargo.toml
index 455e196a4c3..45a631ba151 100644
--- a/rs/rust_canisters/xnet_test/Cargo.toml
+++ b/rs/rust_canisters/xnet_test/Cargo.toml
@@ -12,7 +12,9 @@ path = "src/main.rs"
 
 [dependencies]
 candid = { workspace = true }
-dfn_core = { path = "../dfn_core" }
+futures = { workspace = true }
+ic-cdk = { workspace = true }
+ic-cdk-macros = { workspace = true }
 rand = { workspace = true }
 rand_pcg = "0.3"
 serde = { workspace = true }
diff --git a/rs/rust_canisters/xnet_test/src/lib.rs b/rs/rust_canisters/xnet_test/src/lib.rs
index 7c1d682f60d..0ab8122568f 100644
--- a/rs/rust_canisters/xnet_test/src/lib.rs
+++ b/rs/rust_canisters/xnet_test/src/lib.rs
@@ -1,22 +1,29 @@
 use candid::{CandidType, Deserialize};
+use ic_cdk::api::management_canister::provisional::CanisterId;
+use serde::Serialize;
 use std::time::Duration;
 
-/// Id of a canister is an opaque blob.
-pub type CanisterId = Vec<u8>;
-
 /// Configuration of the network: the outer vector enumerates canisters
 /// installed on the same subnet.
 ///
 /// This message is used as request payload for "start" call.
 pub type NetworkTopology = Vec<Vec<CanisterId>>;
 
+/// Arguments for the "start" call of this canister.
+#[derive(Default, Clone, CandidType, Deserialize, Debug)]
+pub struct StartArgs {
+    pub network_topology: NetworkTopology,
+    pub canister_to_subnet_rate: u64,
+    pub payload_size_bytes: u64,
+}
+
 /// Metrics observed by this canister.
 ///
 /// This message is used as reply payload for "metrics" query.
-#[derive(Debug, Default, CandidType, Deserialize)]
+#[derive(Default, Clone, CandidType, Serialize, Deserialize, Debug)]
 pub struct Metrics {
-    /// Number of requests sent.
-    pub requests_sent: usize,
+    /// Number of calls attempted (whether successful or not).
+    pub calls_attempted: usize,
 
     /// Number of times a call failed synchronously (e.g. due to a full canister
     /// output queue or running out of cycles).
@@ -39,7 +46,7 @@ pub struct Metrics {
 impl Metrics {
     /// Adds the observations of `other` to `self`.
     pub fn merge(&mut self, other: &Metrics) {
-        self.requests_sent += other.requests_sent;
+        self.calls_attempted += other.calls_attempted;
         self.call_errors += other.call_errors;
         self.reject_responses += other.reject_responses;
         self.seq_errors += other.seq_errors;
@@ -47,6 +54,11 @@ impl Metrics {
         self.log.push_str("-----\n");
         self.log.push_str(&other.log);
     }
+
+    /// Returns the number of requests sent successfully.
+    pub fn requests_sent(&self) -> usize {
+        self.calls_attempted - self.call_errors
+    }
 }
 
 /// Latency distribution implements a cumulative histogram used to record
@@ -54,7 +66,7 @@ impl Metrics {
 ///
 /// The latency is measured using IC time, which is not guaranteed to be
 /// particularly accurate.
-#[derive(Debug, CandidType, Deserialize)]
+#[derive(CandidType, Clone, Serialize, Deserialize, Debug)]
 pub struct LatencyDistribution {
     buckets: Vec<(i64, usize)>,
     sum_millis: usize,
diff --git a/rs/rust_canisters/xnet_test/src/main.rs b/rs/rust_canisters/xnet_test/src/main.rs
index 238beb22d1e..c528d85b730 100644
--- a/rs/rust_canisters/xnet_test/src/main.rs
+++ b/rs/rust_canisters/xnet_test/src/main.rs
@@ -5,16 +5,24 @@
 //! ```text
 //! cargo build --target wasm32-unknown-unknown --release
 //! ```
-use candid::{CandidType, Decode, Deserialize, Encode};
-use dfn_core::api;
+use candid::{CandidType, Deserialize, Principal};
+use futures::future::join_all;
+use ic_cdk::api::management_canister::provisional::CanisterId;
+use ic_cdk::{
+    api::{
+        call::{call, call_with_payment},
+        caller, canister_balance, id, time,
+    },
+    setup,
+};
+use ic_cdk_macros::{heartbeat, query, update};
 use rand::Rng;
 use rand_pcg::Lcg64Xsh32;
 use std::cell::RefCell;
 use std::collections::BTreeMap;
-use std::convert::TryFrom;
 use std::str::FromStr;
 use std::time::Duration;
-use xnet_test::{CanisterId, Metrics, NetworkTopology};
+use xnet_test::{Metrics, NetworkTopology, StartArgs};
 
 thread_local! {
     /// Whether this canister is generating traffic.
@@ -47,6 +55,12 @@ thread_local! {
     static RNG: RefCell<Lcg64Xsh32> = RefCell::new(Lcg64Xsh32::new(0xcafe_f00d_d15e_a5e5, 0x0a02_bdbf_7bb3_c0a7));
 }
 
+/// Input for `return_cycles` method.
+#[derive(CandidType, Deserialize)]
+struct CanisterIdRecord {
+    canister_id: Principal,
+}
+
 /// Request sent by the "fanout" method.
 #[derive(CandidType, Deserialize)]
 struct Request {
@@ -55,6 +69,8 @@ struct Request {
     seq_no: u64,
     /// Local time observed in the round when this message was sent.
     time_nanos: u64,
+    /// Optional padding, to bring the payload to the desired byte size.
+    padding: Vec<u8>,
 }
 
 /// A `Reply` to the `Request` message, sent from the "handle_request" method.
@@ -63,6 +79,8 @@ struct Reply {
     /// Time copied from the corresponding request.  It's used to compute the
     /// roundtrip latency on the caller side.
     time_nanos: u64,
+    /// Optional padding, to bring the payload to the desired byte size.
+    padding: Vec<u8>,
 }
 
 /// State of the XNet messaging.
@@ -92,56 +110,19 @@ impl MessagingState {
     }
 }
 
-/// Calls "msg_reply" with reply being argument encoded as Candid.
-fn candid_reply<T: CandidType>(t: &T) {
-    let msg = candid::Encode!(t).expect("failed to encode reply");
-    api::reply(&msg[..])
-}
-
-/// Encodes `t` as Candid, padded to `PAYLOAD_SIZE`.
-fn candid_encode_padded<T: CandidType>(t: &T) -> Vec<u8> {
-    let msg = candid::Encode!(t, &vec![13u8; 1]).expect("failed to encode message");
-
-    let payload_size = PAYLOAD_SIZE.with(|p| *p.borrow()) as usize;
-    if msg.len() < payload_size {
-        candid::Encode!(t, &vec![13u8; payload_size - msg.len() + 1])
-            .expect("failed to encode message")
-    } else {
-        msg
-    }
-}
-
-/// Returns system time in nanoseconds.
-fn time_nanos() -> u64 {
-    unsafe { api::ic0::time() }
-}
-
-/// Callback for handling replies from "handle_request".
-fn on_reply(_env: *mut ()) {
-    let (reply, _) =
-        candid::Decode!(&api::arg_data()[..], Reply, Vec<u8>).expect("failed to decode response");
-    let elapsed = Duration::from_nanos(time_nanos() - reply.time_nanos);
-    METRICS.with(|m| m.borrow_mut().latency_distribution.observe(elapsed));
-}
-
-/// Callback for handling reject responses from "handle_request".
-fn on_reject(_env: *mut ()) {
-    METRICS.with(|m| m.borrow_mut().reject_responses += 1);
-}
-
 /// Returns true if this canister should continue generating traffic.
 fn is_running() -> bool {
     RUNNING.with(|r| *r.borrow())
 }
 
 /// Canister heartbeat, calls `fanout()` if `RUNNING` is `true`.
-#[export_name = "canister_heartbeat"]
-fn heartbeat() {
+#[heartbeat]
+async fn heartbeat() {
     if !is_running() {
         return;
     }
 
-    fanout();
+    fanout().await;
 }
 
 /// Appends a message to the log, ensuring log size stays below 2000 bytes.
@@ -162,37 +143,31 @@ fn log(message: &str) {
 
 /// Initializes network topology and instructs this canister to start sending
 /// requests to other canisters.
-#[export_name = "canister_update start"]
-fn start() {
-    dfn_core::printer::hook();
-    let (network_topology, rate, payload_size) =
-        candid::Decode!(&api::arg_data()[..], NetworkTopology, u64, u64)
-            .expect("failed to decode subnet canister ids");
-
+#[update]
+fn start(start_args: StartArgs) -> String {
     NETWORK_TOPOLOGY.with(move |canisters| {
-        *canisters.borrow_mut() = network_topology;
+        *canisters.borrow_mut() = start_args.network_topology;
     });
-
-    PER_SUBNET_RATE.with(|r| *r.borrow_mut() = rate);
-    PAYLOAD_SIZE.with(|r| *r.borrow_mut() = payload_size);
+    PER_SUBNET_RATE.with(|r| *r.borrow_mut() = start_args.canister_to_subnet_rate);
+    PAYLOAD_SIZE.with(|r| *r.borrow_mut() = start_args.payload_size_bytes);
 
     RUNNING.with(|r| *r.borrow_mut() = true);
 
-    candid_reply(&"started");
+    "started".to_string()
 }
 
 /// Stops traffic.
-#[export_name = "canister_update stop"]
-fn stop() {
+#[update]
+fn stop() -> String {
     RUNNING.with(|r| *r.borrow_mut() = false);
-    candid_reply(&"stopped");
+    "stopped".to_string()
 }
 
 /// Sends `PER_SUBNET_RATE` messages to random canisters on the remote subnets.
 /// Invoked by the canister heartbeat handler as long as `RUNNING` is `true`
 /// (`start()` was and `stop()` was not yet called).
-fn fanout() {
-    let self_id = api::id();
+async fn fanout() {
+    let self_id = id();
 
     let network_topology =
         NETWORK_TOPOLOGY.with(|network_topology| network_topology.borrow().clone());
@@ -202,96 +177,98 @@ fn fanout() {
             continue;
         }
 
-        if canisters.contains(&self_id.get().as_slice().to_vec()) {
+        if canisters.contains(&self_id) {
             // Same subnet
             continue;
         }
 
+        let mut futures = vec![];
         for _ in 0..PER_SUBNET_RATE.with(|r| *r.borrow()) {
             let idx = RNG.with(|rng| rng.borrow_mut().gen_range(0..canisters.len()));
-            let canister = canisters[idx].clone();
+            let canister = canisters[idx];
 
-            let seq_no = STATE.with(|s| s.borrow_mut().next_out_seq_no(canister.clone()));
+            let seq_no = STATE.with(|s| s.borrow_mut().next_out_seq_no(canister));
 
-            let msg = candid_encode_padded(&Request {
+            let payload_size = PAYLOAD_SIZE.with(|p| *p.borrow()) as usize;
+            let payload = Request {
                 seq_no,
-                time_nanos: time_nanos(),
-            });
-
-            let err_code = api::call_raw(
-                api::CanisterId::try_from(canister.clone()).unwrap(),
-                "handle_request",
-                &msg[..],
-                on_reply,
-                on_reject,
-                None,
-                std::ptr::null_mut(),
-                api::Funds::zero(),
-            );
-
-            if err_code != 0 {
-                log(&format!(
-                    "{} call failed with {}",
-                    time_nanos() / 1_000_000,
-                    err_code
-                ));
-                METRICS.with(|m| m.borrow_mut().call_errors += 1);
-            } else {
-                METRICS.with(move |m| m.borrow_mut().requests_sent += 1);
+                time_nanos: time(),
+                padding: vec![0; payload_size.saturating_sub(16)],
+            };
+
+            let res = call::<(Request,), (Reply,)>(canister, "handle_request", (payload,));
+            futures.push(res);
+            METRICS.with(move |m| m.borrow_mut().calls_attempted += 1);
+        }
+
+        let results = join_all(futures).await;
+
+        for res in results {
+            match res {
+                Ok((reply,)) => {
+                    let elapsed = Duration::from_nanos(time() - reply.time_nanos);
+                    METRICS.with(|m| m.borrow_mut().latency_distribution.observe(elapsed));
+                }
+                Err((err_code, err_message)) => {
+                    // Catch whether the call failed due to a synchronous or
+                    // asynchronous error. Based on the current implementation of
+                    // the Rust CDK, a synchronous error will contain a specific
+                    // error message.
+                    if err_message.contains("Couldn't send message") {
+                        log(&format!(
+                            "{} call failed with {:?}",
+                            time() / 1_000_000,
+                            err_code
+                        ));
+                        METRICS.with(|m| m.borrow_mut().call_errors += 1);
+                    } else {
+                        METRICS.with(|m| m.borrow_mut().reject_responses += 1);
+                    }
+                }
             }
         }
     }
 }
 
 /// Endpoint that handles requests from canisters located on remote subnets.
-#[export_name = "canister_update handle_request"]
-fn handle_request() {
-    let (req, _) =
-        candid::Decode!(&api::arg_data()[..], Request, Vec<u8>).expect("failed to decode request");
-    let caller = api::caller();
-    let in_seq_no = STATE.with(|s| s.borrow_mut().set_in_seq_no(caller.into_vec(), req.seq_no));
+#[update]
+fn handle_request(req: Request) -> Reply {
+    let caller = caller();
+    let in_seq_no = STATE.with(|s| s.borrow_mut().set_in_seq_no(caller, req.seq_no));
 
     if req.seq_no <= in_seq_no {
         METRICS.with(|m| m.borrow_mut().seq_errors += 1);
     }
 
-    let msg = candid_encode_padded(&Reply {
+    let payload_size = PAYLOAD_SIZE.with(|p| *p.borrow()) as usize;
+    Reply {
         time_nanos: req.time_nanos,
-    });
-    api::reply(&msg[..]);
+        padding: vec![0; payload_size.saturating_sub(8)],
+    }
 }
 
-/// Deposits the cycles this canister has minus 1T according to the given
-/// `DepositCyclesArgs`
-#[export_name = "canister_update return_cycles"]
-fn return_cycles() {
-    let cycle_refund = api::canister_cycle_balance().saturating_sub(1_000_000_000_000);
-    let noop = |_| ();
-    let _ = api::call_raw(
-        api::CanisterId::from_str("aaaaa-aa").unwrap(),
+/// Deposits the cycles this canister has minus 1T at the given destination.
+#[update]
+async fn return_cycles(canister_id_record: CanisterIdRecord) -> String {
+    let cycle_refund = canister_balance().saturating_sub(1_000_000_000_000);
+    let _ = call_with_payment::<(CanisterIdRecord,), ()>(
+        Principal::from_str("aaaaa-aa").unwrap(),
         "deposit_cycles",
-        &api::arg_data(),
-        noop,
-        noop,
-        None,
-        std::ptr::null_mut(),
-        api::Funds {
-            cycles: cycle_refund,
-        },
-    );
-
-    candid_reply(&"ok");
+        (canister_id_record,),
+        cycle_refund,
+    )
+    .await;
+
+    "ok".to_string()
 }
 
 /// Query call that serializes metrics as a candid message.
-#[export_name = "canister_query metrics"]
-fn metrics() {
-    let msg = METRICS
-        .with(|m| candid::Encode!(&*m.borrow()))
-        .expect("failed to encode metrics");
-
-    api::reply(&msg[..]);
+#[query]
+fn metrics() -> Metrics {
+    METRICS.with(|m| m.borrow().clone())
 }
 
 #[export_name = "canister_init"]
-fn main() {}
+fn main() {
+    setup();
+}
diff --git a/rs/rust_canisters/xnet_test/xnet_test.did b/rs/rust_canisters/xnet_test/xnet_test.did
index f88bbd20ab4..71bda4b1d2d 100644
--- a/rs/rust_canisters/xnet_test/xnet_test.did
+++ b/rs/rust_canisters/xnet_test/xnet_test.did
@@ -1,5 +1,15 @@
+type StartArgs = record {
+  network_topology : vec vec principal;
+  canister_to_subnet_rate : nat64;
+  payload_size_bytes : nat64;
+};
+
+type CanisterIdRecord = record {
+  canister_id : principal;
+};
+
 service : {
-  start : (vec vec blob, nat64, nat64) -> (text);
+  start : (StartArgs) -> (text);
   stop : () -> (text);
-  return_cycles : () -> (text);
-}
\ No newline at end of file
+  return_cycles : (CanisterIdRecord) -> (text);
+};
diff --git a/rs/sns/governance/BUILD.bazel b/rs/sns/governance/BUILD.bazel
index 39adaf9000f..0b98210b77b 100644
--- a/rs/sns/governance/BUILD.bazel
+++ b/rs/sns/governance/BUILD.bazel
@@ -61,6 +61,7 @@ DEPENDENCIES = [
     "@crate_index//:serde",
     "@crate_index//:serde_bytes",
     "@crate_index//:strum",
+    "@crate_index//:time",
 ]
 
 MACRO_DEPENDENCIES = [
diff --git a/rs/sns/governance/Cargo.toml b/rs/sns/governance/Cargo.toml
index d66babf4a6a..86db0a34d3c 100644
--- a/rs/sns/governance/Cargo.toml
+++ b/rs/sns/governance/Cargo.toml
@@ -27,7 +27,6 @@ path = "tests/proposal.rs"
 
 [dependencies]
 build-info = { workspace = true }
-
 async-trait = { workspace = true }
 base64 = { workspace = true }
 candid = { workspace = true }
@@ -81,6 +80,7 @@ serde = { workspace = true }
 serde_bytes = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
+time = { workspace = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 ic-types = { path = "../../types/types" }
diff --git a/rs/sns/governance/api/src/ic_sns_governance.pb.v1.rs b/rs/sns/governance/api/src/ic_sns_governance.pb.v1.rs
index e159bfe22a5..1cbdd6bf129 100644
--- a/rs/sns/governance/api/src/ic_sns_governance.pb.v1.rs
+++ b/rs/sns/governance/api/src/ic_sns_governance.pb.v1.rs
@@ -1,3 +1,11 @@
+/// Formats the 32 bytes of a hash as a hexadecimal string. Corresponds to 64 ascii symbols.
+pub fn format_full_hash(hash: &[u8]) -> String {
+    hash.iter()
+        .map(|b| format!("{:02x}", b))
+        .collect::<Vec<_>>()
+        .join("")
+}
+
 // This file is @generated by prost-build.
 /// A principal with a particular set of permissions over a neuron.
 #[derive(
@@ -1723,6 +1731,9 @@ pub struct Governance {
 }
 /// Nested message and enum types in `Governance`.
 pub mod governance {
+    use super::format_full_hash;
+    use serde::ser::SerializeStruct;
+
     /// The commands that require a neuron lock.
     #[derive(
         candid::CandidType,
@@ -1898,6 +1909,32 @@ pub mod governance {
         #[prost(string, optional, tag = "4")]
         pub description: ::core::option::Option<::prost::alloc::string::String>,
     }
+
+    impl serde::Serialize for Version {
+        fn serialize<S>(self: &Version, serializer: S) -> Result<S::Ok, S::Error>
+        where
+            S: serde::Serializer,
+        {
+            let mut version = serializer.serialize_struct("Version", 6)?;
+            version.serialize_field("root_wasm_hash", &format_full_hash(&self.root_wasm_hash))?;
+            version.serialize_field(
+                "governance_wasm_hash",
+                &format_full_hash(&self.governance_wasm_hash),
+            )?;
+            version.serialize_field("swap_wasm_hash", &format_full_hash(&self.swap_wasm_hash))?;
+            version.serialize_field("index_wasm_hash", &format_full_hash(&self.index_wasm_hash))?;
+            version.serialize_field(
+                "ledger_wasm_hash",
+                &format_full_hash(&self.ledger_wasm_hash),
+            )?;
+            version.serialize_field(
+                "archive_wasm_hash",
+                &format_full_hash(&self.archive_wasm_hash),
+            )?;
+            version.end()
+        }
+    }
+
     /// A version of the SNS defined by the WASM hashes of its canisters.
     #[derive(
         candid::CandidType,
@@ -1905,7 +1942,6 @@ pub mod governance {
         comparable::Comparable,
         Eq,
         std::hash::Hash,
-        serde::Serialize,
         Clone,
         PartialEq,
         ::prost::Message,
diff --git a/rs/sns/governance/canister/canister.rs b/rs/sns/governance/canister/canister.rs
index 5a031428b4a..89afd45f59e 100644
--- a/rs/sns/governance/canister/canister.rs
+++ b/rs/sns/governance/canister/canister.rs
@@ -44,6 +44,7 @@ use ic_sns_governance::{
     },
     types::{Environment, HeapGrowthPotential},
 };
+use ic_sns_governance_api::pb::v1 as api;
 use prost::Message;
 use rand::{RngCore, SeedableRng};
 use rand_chacha::ChaCha20Rng;
@@ -604,13 +605,15 @@ ic_nervous_system_common_build_metadata::define_get_build_metadata_candid_method
 pub fn http_request(request: HttpRequest) -> HttpResponse {
     match request.path() {
         "/journal/json" => {
-            let journal_entries = &governance()
+            let journal = governance()
                 .proto
                 .upgrade_journal
-                .as_ref()
-                .expect("The upgrade journal is not initialized for this SNS.")
-                .entries;
-            serve_journal(journal_entries)
+                .clone()
+                .expect("The upgrade journal is not initialized for this SNS.");
+
+            let journal = api::UpgradeJournal::from(journal);
+
+            serve_journal(&journal.entries)
         }
         "/metrics" => serve_metrics(encode_metrics),
         "/logs" => serve_logs_v2(request, &INFO, &ERROR),
diff --git a/rs/sns/governance/canister/tests.rs b/rs/sns/governance/canister/tests.rs
index 401a2f6e024..15ac971e16c 100644
--- a/rs/sns/governance/canister/tests.rs
+++ b/rs/sns/governance/canister/tests.rs
@@ -1,5 +1,3 @@
-use std::collections::HashSet;
-
 use super::*;
 use assert_matches::assert_matches;
 use candid_parser::utils::{service_equal, CandidSource};
@@ -8,7 +6,10 @@ use ic_sns_governance::pb::v1::{
     upgrade_journal_entry::{Event, UpgradeStepsRefreshed},
     DisburseMaturityInProgress, Neuron, UpgradeJournal, UpgradeJournalEntry,
 };
+use ic_sns_governance_api::pb::v1 as api;
 use maplit::btreemap;
+use pretty_assertions::assert_eq;
+use std::collections::HashSet;
 
 /// This is NOT affected by
 ///
@@ -124,21 +125,23 @@ fn test_upgrade_journal() {
                         root_wasm_hash: vec![0, 0, 0, 0],
                         governance_wasm_hash: vec![0, 0, 0, 1],
                         swap_wasm_hash: vec![0, 0, 0, 2],
-                        index_wasm_hash: vec![0, 0, 0, 4],
-                        ledger_wasm_hash: vec![0, 0, 0, 5],
-                        archive_wasm_hash: vec![0, 0, 0, 6],
+                        index_wasm_hash: vec![0, 0, 0, 3],
+                        ledger_wasm_hash: vec![0, 0, 0, 4],
+                        archive_wasm_hash: vec![0, 0, 0, 5],
                     }],
                 }),
             })),
         }],
     };
 
+    let journal = api::UpgradeJournal::from(journal);
+
     // Currently, the `/journal` Http endpoint serves the entries directly, rather than the whole
     // journal object.
     let http_response = serve_journal(&journal.entries);
     let expected_headers: HashSet<(_, _)> = HashSet::from_iter([
         ("Content-Type".to_string(), "application/json".to_string()),
-        ("Content-Length".to_string(), "271".to_string()),
+        ("Content-Length".to_string(), "277".to_string()),
     ]);
     let (observed_headers, observed_body) = assert_matches!(
         http_response,
@@ -170,12 +173,12 @@ fn test_upgrade_journal() {
                         "upgrade_steps": {
                             "versions": [
                                 {
-                                    "root_wasm_hash":       [0,0,0,0],
-                                    "governance_wasm_hash": [0,0,0,1],
-                                    "ledger_wasm_hash":     [0,0,0,5],
-                                    "swap_wasm_hash":       [0,0,0,2],
-                                    "archive_wasm_hash":    [0,0,0,6],
-                                    "index_wasm_hash":      [0,0,0,4]
+                                    "root_wasm_hash":       "00000000",
+                                    "governance_wasm_hash": "00000001",
+                                    "swap_wasm_hash":       "00000002",
+                                    "index_wasm_hash":      "00000003",
+                                    "ledger_wasm_hash":     "00000004",
+                                    "archive_wasm_hash":    "00000005"
                                 }
                             ]
                         }
diff --git a/rs/sns/governance/src/cached_upgrade_steps.rs b/rs/sns/governance/src/cached_upgrade_steps.rs
index ec1b11ab0f4..0eedd402b7b 100644
--- a/rs/sns/governance/src/cached_upgrade_steps.rs
+++ b/rs/sns/governance/src/cached_upgrade_steps.rs
@@ -10,6 +10,7 @@ use crate::sns_upgrade::ListUpgradeStep;
 use crate::sns_upgrade::ListUpgradeStepsResponse;
 use crate::sns_upgrade::SnsCanisterType;
 use ic_canister_log::log;
+use ic_sns_governance_api::pb::v1::format_full_hash;
 
 #[derive(Clone, Debug, PartialEq)]
 pub(crate) struct CachedUpgradeSteps {
@@ -106,14 +107,6 @@ pub fn format_short_hash(hash: &[u8]) -> String {
         .join("")
 }
 
-/// Formats the 32 bytes of a hash as a hexadecimal string. Corresponds to 64 ascii symbols.
-pub fn format_full_hash(hash: &[u8]) -> String {
-    hash.iter()
-        .map(|b| format!("{:02x}", b))
-        .collect::<Vec<_>>()
-        .join("")
-}
-
 pub fn render_two_versions_as_markdown_table(
     current_version: &Version,
     target_version: &Version,
diff --git a/rs/sns/governance/src/governance.rs b/rs/sns/governance/src/governance.rs
index aebe5321854..82466e131b3 100644
--- a/rs/sns/governance/src/governance.rs
+++ b/rs/sns/governance/src/governance.rs
@@ -3034,9 +3034,6 @@ impl Governance {
         &mut self,
         new_target: Version,
     ) -> Result<(), GovernanceError> {
-        // TODO[NNS1-3365]: Enable the AdvanceSnsTargetVersionFeature.
-        self.check_test_features_enabled();
-
         let (_, target_version) = self
             .proto
             .validate_new_target_version(Some(new_target))
diff --git a/rs/sns/governance/src/lib.rs b/rs/sns/governance/src/lib.rs
index 779bef2cdee..837b1c00a7b 100644
--- a/rs/sns/governance/src/lib.rs
+++ b/rs/sns/governance/src/lib.rs
@@ -1,5 +1,5 @@
 use crate::pb::v1::Subaccount as SubaccountProto;
-use std::{convert::TryInto, fmt::Debug};
+use std::convert::TryInto;
 
 mod cached_upgrade_steps;
 pub mod canister_control;
@@ -20,29 +20,37 @@ trait Len {
     fn len(&self) -> usize;
 }
 
+/// Maximum size, in bytes, of a scalar field (e.g., of type `String` or numeric types) that.
+/// Scalar values greater than this will be truncated during error reporting.
+pub const MAX_SCALAR_FIELD_LEN_BYTES: usize = 50_000;
+
 /// Warning: the len method on str and String is in bytes, not characters. If
 /// you want to constrain the number of characters, look at
 /// validate_chars_count.
 fn validate_len<V>(field_name: &str, field_value: &V, min: usize, max: usize) -> Result<(), String>
 where
-    V: Len + Debug,
+    V: Len + ToString,
 {
     let len = field_value.len();
 
     if len < min {
-        return field_err(
-            field_name,
-            field_value,
-            &format!("too short (min = {} vs. observed = {})", min, len),
-        );
+        let defect = &format!("too short (min = {} vs. observed = {})", min, len);
+
+        let bounded_field_value = field_value.to_string();
+
+        return field_err(field_name, bounded_field_value, defect);
     }
 
     if len > max {
-        return field_err(
-            field_name,
-            field_value,
-            &format!("too long (min = {} vs. observed = {})", min, len),
-        );
+        let defect = &format!("too long (max = {} vs. observed = {})", max, len);
+
+        let bounded_field_value = field_value
+            .to_string()
+            .chars()
+            .take(max)
+            .collect::<String>();
+
+        return field_err(field_name, bounded_field_value, defect);
     }
 
     Ok(())
@@ -94,19 +102,16 @@ fn validate_chars_count(
     let len = field_value.chars().count();
 
     if len < min {
-        return field_err(
-            field_name,
-            field_value,
-            &format!("too short (min = {} vs. observed = {})", min, len),
-        );
+        let defect = &format!("too short (min = {} vs. observed = {})", min, len);
+
+        return field_err(field_name, field_value.to_string(), defect);
     }
 
     if len > max {
-        return field_err(
-            field_name,
-            field_value,
-            &format!("too long (max = {} vs. observed = {})", max, len),
-        );
+        let defect = &format!("too long (max = {} vs. observed = {})", max, len);
+        let bounded_field_value = field_value.chars().take(max).collect::<String>();
+
+        return field_err(field_name, bounded_field_value, defect);
     }
 
     Ok(())
@@ -121,12 +126,33 @@ fn validate_required_field<'a, Inner>(
         .ok_or_else(|| format!("The {} field must be populated.", field_name))
 }
 
-/// Return an Err whose inner value describes (in detail) what is wrong with a
-/// field value, and where within some (Protocol Buffers message) struct.
-fn field_err(field_name: &str, field_value: impl Debug, defect: &str) -> Result<(), String> {
+/// Return an Err whose inner value describes (in detail) what is wrong with `field_value`,
+/// and where within some (Protocol Buffers message) struct.
+///
+/// Only up to the first `MAX_SCALAR_FIELD_LEN_BYTES` bytes will be taken from `field_value`.
+fn field_err(field_name: &str, field_value: String, defect: &str) -> Result<(), String> {
+    let mut bounded_field_value = String::new();
+    // Concatenate characters one-by-one, until we either run out of characters or exceed
+    // the limit (in which case we pop the last character to still comply with the limits).
+    // Note that a `char` is always 4 bytes, but pushing it to a string does not always increase
+    // a string's byte size by 4 bytes. For example:
+    // ```
+    // println!("bytes = {}", std::mem::size_of_val(&'\u{200D}')); // bytes = 4
+    // println!("bytes = {}", std::mem::size_of_val("\u{200D}"));  // bytes = 3
+    // ```
+    for c in field_value.chars() {
+        bounded_field_value.push(c);
+        if bounded_field_value.len() > MAX_SCALAR_FIELD_LEN_BYTES {
+            bounded_field_value.pop();
+            break;
+        }
+    }
     Err(format!(
-        "The value in field {} is {}: {:?}",
-        field_name, defect, field_value
+        "The first {} characters of the value in field `{}` are {}: `{}`",
+        bounded_field_value.chars().count(),
+        field_name,
+        defect,
+        bounded_field_value
     ))
 }
 
@@ -201,6 +227,14 @@ mod tests {
         assert_is_ok(validate(&"abcde"));
 
         assert_is_err(validate(&"abcd\u{1F389}"));
+        assert_eq!(
+            validate(&"abcdefg"),
+            Err(
+                "The first 5 characters of the value in field `field_name` are too long \
+                 (max = 5 vs. observed = 7): `abcde`"
+                    .to_string()
+            ),
+        );
     }
 
     #[test]
@@ -261,7 +295,7 @@ mod tests {
 
     #[test]
     fn test_field_err() {
-        let result = field_err("my_field", 41, "not the meaning of life");
+        let result = field_err("my_field", 41.to_string(), "not the meaning of life");
         match result {
             Ok(()) => panic!("field_err is supposed to always return an Err."),
             Err(err) => {
@@ -271,4 +305,37 @@ mod tests {
             }
         }
     }
+
+    #[test]
+    fn test_giant_field_err() {
+        let barely_not_too_large_len = 12_500;
+
+        let run_test_for_value_of_size = |value_size| {
+            let input_value: String = (0..value_size).map(|_| '🤝').collect();
+            // Sanity check: We construct a string in which each character is encoded as 4 bytes.
+            assert_eq!(input_value.len(), 4 * input_value.chars().count());
+            let observer_err = field_err("field_name", input_value.clone(), "defect").unwrap_err();
+            (input_value, observer_err)
+        };
+
+        // Value is (barely) not too large to be fully included in the defect description.
+        {
+            let (input_value, observer_err) = run_test_for_value_of_size(barely_not_too_large_len);
+            assert!(observer_err.contains(&input_value));
+        }
+
+        // Value is too large to be fully included in the defect description.
+        {
+            let (input_value, observer_err) =
+                run_test_for_value_of_size(barely_not_too_large_len + 1);
+            assert!(
+                !observer_err.contains(&input_value),
+                "Expected ```{}``` not to contain ```{}```.",
+                observer_err,
+                input_value
+            );
+            // Only the last character was dropped.
+            assert!(observer_err.contains(&input_value[..(input_value.chars().count() - 1)]));
+        }
+    }
 }
diff --git a/rs/sns/governance/src/proposal.rs b/rs/sns/governance/src/proposal.rs
index e82d3e77591..d1cbeb81a78 100644
--- a/rs/sns/governance/src/proposal.rs
+++ b/rs/sns/governance/src/proposal.rs
@@ -52,6 +52,7 @@ use std::{
     convert::TryFrom,
     fmt::Write,
 };
+use time;
 
 /// The maximum number of bytes in an SNS proposal's title.
 pub const PROPOSAL_TITLE_BYTES_MAX: usize = 256;
@@ -1068,30 +1069,26 @@ fn validate_and_render_upgrade_sns_controlled_canister(
     const RAW_WASM_HEADER: [u8; 4] = [0, 0x61, 0x73, 0x6d];
     // see https://ic-interface-spec.netlify.app/#canister-module-format
     const GZIPPED_WASM_HEADER: [u8; 3] = [0x1f, 0x8b, 0x08];
-    // Minimum length of raw WASM is 8 bytes (4 magic bytes and 4 bytes encoding version).
-    // Minimum length of gzipped WASM is 10 bytes (2 magic bytes, 1 byte encoding compression method, and 7 additional gzip header bytes).
-    const MIN_WASM_LEN: usize = 8;
-    if let Err(err) = validate_len(
-        "new_canister_wasm",
-        new_canister_wasm,
-        MIN_WASM_LEN,
-        usize::MAX,
-    ) {
-        defects.push(err);
-    } else if new_canister_wasm[..4] != RAW_WASM_HEADER[..]
-        && new_canister_wasm[..3] != GZIPPED_WASM_HEADER[..]
+
+    if new_canister_wasm.len() < 4
+        || new_canister_wasm[..4] != RAW_WASM_HEADER[..]
+            && new_canister_wasm[..3] != GZIPPED_WASM_HEADER[..]
     {
         defects.push("new_canister_wasm lacks the magic value in its header.".into());
     }
 
-    if new_canister_wasm.len()
-        + canister_upgrade_arg
+    if new_canister_wasm.len().saturating_add(
+        canister_upgrade_arg
             .as_ref()
             .map(|arg| arg.len())
-            .unwrap_or_default()
-        >= MAX_INSTALL_CODE_WASM_AND_ARG_SIZE
+            .unwrap_or_default(),
+    ) >= MAX_INSTALL_CODE_WASM_AND_ARG_SIZE
     {
-        defects.push(format!("the maximum canister WASM and argument size for UpgradeSnsControlledCanister is {} bytes.", MAX_INSTALL_CODE_WASM_AND_ARG_SIZE));
+        defects.push(format!(
+            "the maximum canister WASM and argument size \
+             for UpgradeSnsControlledCanister is {} bytes.",
+            MAX_INSTALL_CODE_WASM_AND_ARG_SIZE
+        ));
     }
 
     // Generate final report.
@@ -1716,6 +1713,21 @@ fn validate_and_render_manage_dapp_canister_settings(
     }
 }
 
+/// Attempts to format `` as a human-readable string.
+///
+/// For example:
+/// ```
+/// assert_eq!(format_timestamp(1732896850), Some("2024-11-29 16:14:10 UTC".to_string()));
+/// ```
+fn format_timestamp(timestamp_seconds: u64) -> Option<String> {
+    let timestamp_seconds = i64::try_from(timestamp_seconds).ok()?;
+    let dt_offset = time::OffsetDateTime::from_unix_timestamp(timestamp_seconds).ok()?;
+    let format =
+        time::format_description::parse("[year]-[month]-[day] [hour]:[minute]:[second] UTC")
+            .ok()?;
+    dt_offset.format(&format).ok()
+}
+
 /// Attempts to validate an `AdvanceSnsTargetVersion` action and render its human-readable text.
 /// Invalidates the action in the following cases:
 /// - There are no pending upgrades.
@@ -1737,7 +1749,14 @@ fn validate_and_render_advance_sns_target_version_proposal(
     let (upgrade_steps, target_version) = governance_proto
         .validate_new_target_version(advance_sns_target_version.new_target.clone())?;
 
-    let valid_timestamp_seconds = upgrade_steps.approximate_time_of_validity_timestamp_seconds();
+    let time_of_validity = {
+        let timestamp_seconds = upgrade_steps.approximate_time_of_validity_timestamp_seconds();
+        // This fallback should not occur unless `timestamp_seconds` is outside of the range
+        // from +1970-01-01 00:00:00 UTC (0)
+        // till +9999-12-31 23:59:59 UTC (253402300799).
+        format_timestamp(timestamp_seconds)
+            .unwrap_or_else(|| format!("timestamp {} seconds", timestamp_seconds))
+    };
 
     let current_target_versions_render =
         render_two_versions_as_markdown_table(upgrade_steps.current(), &target_version);
@@ -1753,9 +1772,8 @@ fn validate_and_render_advance_sns_target_version_proposal(
          ### Upgrade steps\n\n\
          {upgrade_steps}\n\n\
          ### Monitoring the upgrade process\n\n\
-         Please note: the upgrade steps above (valid around timestamp {valid_timestamp_seconds} \
-         seconds) might change during this proposal's voting period. Such changes are unlikely and \
-         are subject to NNS community's approval.\n\n\
+         Please note: the upgrade steps mentioned above (valid around {time_of_validity}) \
+         might change during this proposal's voting period.\n\n\
          The **upgrade journal** provides up-to-date information on this SNS's upgrade process:\n\n\
          {upgrade_journal_url_render}"
     );
diff --git a/rs/sns/governance/src/proposal/advance_sns_target_version.rs b/rs/sns/governance/src/proposal/advance_sns_target_version.rs
index d98bf263ae7..628b69de1ee 100644
--- a/rs/sns/governance/src/proposal/advance_sns_target_version.rs
+++ b/rs/sns/governance/src/proposal/advance_sns_target_version.rs
@@ -5,6 +5,7 @@ use crate::pb::v1::Governance as GovernancePb;
 use crate::types::test_helpers::NativeEnvironment;
 use futures::FutureExt;
 use ic_test_utilities_types::ids::canister_test_id;
+use pretty_assertions::assert_eq;
 
 fn sns_version_for_tests() -> Version {
     Version {
@@ -65,6 +66,28 @@ fn standard_governance_proto_for_tests(deployed_version: Option<Version>) -> Gov
     }
 }
 
+#[test]
+fn test_format_timestamp() {
+    for (expected, timestamp_seconds) in [
+        (Some("1970-01-01 00:00:00 UTC"), 0),
+        (Some("2024-11-29 16:14:10 UTC"), 1732896850),
+        (Some("2038-01-19 03:14:07 UTC"), i32::MAX as u64),
+        (Some("4571-09-24 08:52:47 UTC"), 82102668767),
+        (Some("9999-12-31 23:59:59 UTC"), 253402300799),
+        (None, 253402300800),
+        (None, i64::MAX as u64),
+        (None, u64::MAX),
+    ] {
+        let observed = format_timestamp(timestamp_seconds);
+        assert_eq!(
+            observed,
+            expected.map(|s| s.to_string()),
+            "unexpected result from format_timestamp({})",
+            timestamp_seconds,
+        );
+    }
+}
+
 #[test]
 fn test_validate_and_render_advance_target_version_action() {
     // Prepare the world.
@@ -176,7 +199,7 @@ fn test_validate_and_render_advance_target_version_action() {
 
 ### Monitoring the upgrade process
 
-Please note: the upgrade steps above (valid around timestamp 0 seconds) might change during this proposal's voting period. Such changes are unlikely and are subject to NNS community's approval.
+Please note: the upgrade steps mentioned above (valid around 1970-01-01 00:00:00 UTC) might change during this proposal's voting period.
 
 The **upgrade journal** provides up-to-date information on this SNS's upgrade process:
 
diff --git a/rs/state_machine_tests/src/lib.rs b/rs/state_machine_tests/src/lib.rs
index 74b25ff9210..839a4ed0e1f 100644
--- a/rs/state_machine_tests/src/lib.rs
+++ b/rs/state_machine_tests/src/lib.rs
@@ -841,7 +841,7 @@ pub struct StateMachine {
     // the time of the last round
     // (equal to `time` when this `StateMachine` is initialized)
     time_of_last_round: RwLock<Time>,
-    idkg_subnet_public_keys: BTreeMap<MasterPublicKeyId, MasterPublicKey>,
+    chain_key_subnet_public_keys: BTreeMap<MasterPublicKeyId, MasterPublicKey>,
     idkg_subnet_secret_keys: BTreeMap<MasterPublicKeyId, SignatureSecretKey>,
     pub replica_logger: ReplicaLogger,
     pub log_level: Option<Level>,
@@ -1618,7 +1618,7 @@ impl StateMachine {
             name: "master_ecdsa_public_key".to_string(),
         };
 
-        let mut idkg_subnet_public_keys = BTreeMap::new();
+        let mut chain_key_subnet_public_keys = BTreeMap::new();
         let mut idkg_subnet_secret_keys = BTreeMap::new();
 
         for key_id in idkg_keys_signing_enabled_status.keys() {
@@ -1721,7 +1721,7 @@ impl StateMachine {
 
             idkg_subnet_secret_keys.insert(key_id.clone(), private_key);
 
-            idkg_subnet_public_keys.insert(key_id.clone(), public_key);
+            chain_key_subnet_public_keys.insert(key_id.clone(), public_key);
         }
 
         let time_source = FastForwardTimeSource::new();
@@ -1790,7 +1790,7 @@ impl StateMachine {
             nonce: AtomicU64::new(nonce),
             time: AtomicU64::new(time.as_nanos_since_unix_epoch()),
             time_of_last_round: RwLock::new(time),
-            idkg_subnet_public_keys,
+            chain_key_subnet_public_keys,
             idkg_subnet_secret_keys,
             replica_logger: replica_logger.clone(),
             log_level,
@@ -2331,7 +2331,7 @@ impl StateMachine {
                 query_stats: payload.query_stats,
             },
             randomness: Randomness::from(seed),
-            idkg_subnet_public_keys: self.idkg_subnet_public_keys.clone(),
+            chain_key_subnet_public_keys: self.chain_key_subnet_public_keys.clone(),
             idkg_pre_signature_ids: BTreeMap::new(),
             registry_version: self.registry_client.get_latest_version(),
             time: time_of_next_round,
diff --git a/rs/system_api/src/routing.rs b/rs/system_api/src/routing.rs
index 243781031f5..4db52561114 100644
--- a/rs/system_api/src/routing.rs
+++ b/rs/system_api/src/routing.rs
@@ -548,6 +548,7 @@ mod tests {
             message: vec![1; 32],
             derivation_path: DerivationPath::new(vec![ByteBuf::from(vec![0; 10])]),
             key_id,
+            taproot_tree_root: None,
         };
         Encode!(&args).unwrap()
     }
diff --git a/rs/test_utilities/types/src/batch/batch_builder.rs b/rs/test_utilities/types/src/batch/batch_builder.rs
index f7381190113..fd148c4c343 100644
--- a/rs/test_utilities/types/src/batch/batch_builder.rs
+++ b/rs/test_utilities/types/src/batch/batch_builder.rs
@@ -20,7 +20,7 @@ impl Default for BatchBuilder {
                 requires_full_state_hash: false,
                 messages: BatchMessages::default(),
                 randomness: Randomness::from([0; 32]),
-                idkg_subnet_public_keys: BTreeMap::new(),
+                chain_key_subnet_public_keys: BTreeMap::new(),
                 idkg_pre_signature_ids: BTreeMap::new(),
                 registry_version: RegistryVersion::from(1),
                 time: UNIX_EPOCH,
diff --git a/rs/tests/ckbtc/ckbtc_minter_batching.rs b/rs/tests/ckbtc/ckbtc_minter_batching.rs
index 8a5cbda6fd2..d1bf2fdc510 100644
--- a/rs/tests/ckbtc/ckbtc_minter_batching.rs
+++ b/rs/tests/ckbtc/ckbtc_minter_batching.rs
@@ -297,11 +297,8 @@ pub fn test_batching(env: TestEnv) {
             .sum::<u64>();
 
         // We have 1 input and 21 outputs (20 requests and the minter's address)
-        // Hence, we can compute the minter's fee
-        let minters_fee: u64 = ic_ckbtc_minter::MINTER_FEE_PER_INPUT
-            + ic_ckbtc_minter::MINTER_FEE_PER_OUTPUT
-                * (RETRIEVE_REQUESTS_COUNT_TO_BATCH as u64 + 1)
-            + ic_ckbtc_minter::MINTER_FEE_CONSTANT;
+        let minters_fee: u64 =
+            ic_ckbtc_minter::evaluate_minter_fee(1, RETRIEVE_REQUESTS_COUNT_TO_BATCH as u64 + 1);
 
         // We can check that the destination address has received all the bitcoin
         assert_eq!(
diff --git a/rs/tests/ckbtc/ckbtc_minter_kyt.rs b/rs/tests/ckbtc/ckbtc_minter_kyt.rs
index 3013063b66c..13ba2898a16 100644
--- a/rs/tests/ckbtc/ckbtc_minter_kyt.rs
+++ b/rs/tests/ckbtc/ckbtc_minter_kyt.rs
@@ -334,9 +334,7 @@ pub fn test_kyt(env: TestEnv) {
         let _mempool_txids = wait_for_mempool_change(&btc_rpc, &logger).await;
         generate_blocks(&btc_rpc, &logger, BTC_MIN_CONFIRMATIONS, &btc_address0);
         // We can compute the minter's fee
-        let minters_fee: u64 = ic_ckbtc_minter::MINTER_FEE_PER_INPUT
-            + ic_ckbtc_minter::MINTER_FEE_PER_OUTPUT * 2
-            + ic_ckbtc_minter::MINTER_FEE_CONSTANT;
+        let minters_fee: u64 = ic_ckbtc_minter::evaluate_minter_fee(1, 2);
         // Use the following estimator : https://btc.network/estimate
         // 1 input and 2 outputs => 141 vbyte
         // The regtest network fee defined in ckbtc/minter/src/lib.rs is 5 sat/vbyte.
diff --git a/rs/tests/consensus/orchestrator/node_reassignment_test.rs b/rs/tests/consensus/orchestrator/node_reassignment_test.rs
index b220efdb06a..412e8491f32 100644
--- a/rs/tests/consensus/orchestrator/node_reassignment_test.rs
+++ b/rs/tests/consensus/orchestrator/node_reassignment_test.rs
@@ -26,7 +26,7 @@ Coverage::
 end::catalog[] */
 
 use anyhow::Result;
-use ic_consensus_system_test_utils::node::assert_node_is_unassigned;
+use ic_consensus_system_test_utils::node::{assert_node_is_assigned, assert_node_is_unassigned};
 use ic_consensus_system_test_utils::rw_message::{
     can_read_msg, can_read_msg_with_retries, install_nns_and_check_progress, store_message,
 };
@@ -130,6 +130,9 @@ fn test(env: TestEnv) {
     // Unassign 2 NNS nodes using remove_nodes_from_subnet operation
     node3.await_status_is_healthy().unwrap();
     node4.await_status_is_healthy().unwrap();
+    // Assert nodes are assigned before they are removed
+    assert_node_is_assigned(&node1, log);
+    assert_node_is_assigned(&node2, log);
     let node_ids: Vec<_> = vec![node1.node_id, node2.node_id];
     block_on(remove_nodes_via_endpoint(node3.get_public_url(), &node_ids)).unwrap();
     info!(log, "Removed node ids {:?} from the NNS subnet", node_ids);
@@ -237,6 +240,9 @@ fn test(env: TestEnv) {
     // APP: [node3, node4, <original-app-subnet-nodes>]
     node1.await_status_is_healthy().unwrap();
     node2.await_status_is_healthy().unwrap();
+    // Assert nodes are assigned before the are removed
+    assert_node_is_assigned(&node1, log);
+    assert_node_is_assigned(&node2, log);
     let nns_subnet_id = topo_snapshot.root_subnet().subnet_id;
     let app_subnet_id = app_subnet.subnet_id;
     let node_ids_remove: Vec<_> = vec![node1.node_id, node2.node_id];
@@ -260,6 +266,10 @@ fn test(env: TestEnv) {
     assert_node_is_unassigned(&node1, log);
     assert_node_is_unassigned(&node2, log);
 
+    // Assert nodes are assigned before the are removed
+    assert_node_is_assigned(&node3, log);
+    assert_node_is_assigned(&node4, log);
+
     // Next, add node1 and node2 to the NNS subnet, and remove node3 and node4 at the same time
     let node_ids_add: Vec<_> = vec![node1.node_id, node2.node_id];
     let node_ids_remove: Vec<_> = vec![node3.node_id, node4.node_id];
diff --git a/rs/tests/consensus/tecdsa/BUILD.bazel b/rs/tests/consensus/tecdsa/BUILD.bazel
index 5cedc14d080..17a2019d07b 100644
--- a/rs/tests/consensus/tecdsa/BUILD.bazel
+++ b/rs/tests/consensus/tecdsa/BUILD.bazel
@@ -364,6 +364,7 @@ system_test_nns(
         "manual",
     ],
     test_driver_target = tecdsa_performance_test_template.test_driver_target,
+    test_timeout = "eternal",
     runtime_deps = GUESTOS_RUNTIME_DEPS + GRAFANA_RUNTIME_DEPS,
 )
 
@@ -387,6 +388,7 @@ system_test_nns(
         "manual",
     ],
     test_driver_target = tecdsa_performance_test_template.test_driver_target,
+    test_timeout = "eternal",
     runtime_deps = GUESTOS_RUNTIME_DEPS + GRAFANA_RUNTIME_DEPS,
 )
 
@@ -410,5 +412,6 @@ system_test_nns(
         "manual",
     ],
     test_driver_target = tecdsa_performance_test_template.test_driver_target,
+    test_timeout = "eternal",
     runtime_deps = GUESTOS_RUNTIME_DEPS + GRAFANA_RUNTIME_DEPS,
 )
diff --git a/rs/tests/consensus/tecdsa/utils/src/lib.rs b/rs/tests/consensus/tecdsa/utils/src/lib.rs
index 1b4f02d2e33..8c96ebd2692 100644
--- a/rs/tests/consensus/tecdsa/utils/src/lib.rs
+++ b/rs/tests/consensus/tecdsa/utils/src/lib.rs
@@ -577,6 +577,7 @@ pub async fn get_schnorr_signature_with_logger(
         message,
         derivation_path: DerivationPath::new(Vec::new()),
         key_id: key_id.clone(),
+        taproot_tree_root: None,
     };
     info!(
         logger,
@@ -870,6 +871,7 @@ impl ChainSignatureRequest {
             message: vec![1; message_size],
             derivation_path: DerivationPath::new(Vec::new()),
             key_id: schnorr_key_id,
+            taproot_tree_root: None,
         };
         ForwardParams {
             receiver: Principal::management_canister(),
diff --git a/rs/tests/consensus/utils/src/node.rs b/rs/tests/consensus/utils/src/node.rs
index f5c841ea6d5..e8510b5cdb0 100644
--- a/rs/tests/consensus/utils/src/node.rs
+++ b/rs/tests/consensus/utils/src/node.rs
@@ -54,16 +54,59 @@ pub fn get_node_certified_height(node: &IcNodeSnapshot, log: Logger) -> Height {
     .expect("Should be able to retrieve the certified height")
 }
 
+/// Assert that the given node has a state and local CUP within the next 5 minutes.
+pub fn assert_node_is_assigned(node: &IcNodeSnapshot, logger: &Logger) {
+    info!(
+        logger,
+        "Asserting that node {} has a state and local CUP.",
+        node.get_ip_addr()
+    );
+    // We consider the node to be assigned if it has both a subnet state
+    // and a local CUP
+    // We need to exclude the page_deltas/ directory, which is not deleted on state deletion.
+    // That is because deleting it would break SELinux assumptions.
+    let check = r#"
+        [ "$(ls -A /var/lib/ic/data/ic_state -I page_deltas)" ] && \
+        [ -f /var/lib/ic/data/cups/cup.types.v1.CatchUpPackage.pb ] && \
+        echo "assigned" || echo "unassigned"
+    "#;
+    let s = node
+        .block_on_ssh_session()
+        .expect("Failed to establish SSH session");
+
+    ic_system_test_driver::retry_with_msg!(
+        format!("check if node {} is assigned", node.node_id),
+        logger.clone(),
+        secs(300),
+        secs(10),
+        || match execute_bash_command(&s, check.to_string()) {
+            Ok(s) if s.trim() == "assigned" => Ok(()),
+            Ok(s) if s.trim() == "unassigned" => {
+                bail!("Node {} is unassigned.", node.get_ip_addr())
+            }
+            Ok(s) => bail!("Received unexpected output: {}", s),
+            Err(e) => bail!("Failed to read directory: {}", e),
+        }
+    )
+    .expect("Failed to detect that node has a state and local CUP.");
+}
+
 /// Assert that the given node has deleted its state within the next 5 minutes.
 pub fn assert_node_is_unassigned(node: &IcNodeSnapshot, logger: &Logger) {
     info!(
         logger,
-        "Asserting that node {} has deleted its state.",
+        "Asserting that node {} has deleted its state and local CUP.",
         node.get_ip_addr()
     );
+    // We consider the node to be unassigned once it deleted both the state directory and the
+    // local CUP.
     // We need to exclude the page_deltas/ directory, which is not deleted on state deletion.
     // That is because deleting it would break SELinux assumptions.
-    let check = r#"[ "$(ls -A /var/lib/ic/data/ic_state -I page_deltas)" ] && echo "assigned" || echo "unassigned""#;
+    let check = r#"
+        ([ "$(ls -A /var/lib/ic/data/ic_state -I page_deltas)" ] || \
+        [ -f /var/lib/ic/data/cups/cup.types.v1.CatchUpPackage.pb ]) && \
+        echo "assigned" || echo "unassigned"
+    "#;
     let s = node
         .block_on_ssh_session()
         .expect("Failed to establish SSH session");
@@ -82,7 +125,7 @@ pub fn assert_node_is_unassigned(node: &IcNodeSnapshot, logger: &Logger) {
             Err(e) => bail!("Failed to read directory: {}", e),
         }
     )
-    .expect("Failed to detect that node has deleted its state.");
+    .expect("Failed to detect that node has deleted its state and local CUP.");
 
     let state_removal_failed = "orchestrator_state_removal_failed_total".to_string();
     let fs_trim_duration = "orchestrator_fstrim_duration_milliseconds".to_string();
diff --git a/rs/tests/dashboards/IC/ic-p2p.json b/rs/tests/dashboards/IC/ic-p2p.json
deleted file mode 100644
index 4f1918882f2..00000000000
--- a/rs/tests/dashboards/IC/ic-p2p.json
+++ /dev/null
@@ -1,631 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": {
-          "type": "prometheus",
-          "uid": "000000001"
-        },
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "target": {
-          "limit": 100,
-          "matchAny": false,
-          "tags": [],
-          "type": "dashboard"
-        },
-        "type": "dashboard"
-      }
-    ]
-  },
-  "description": "P2P protocol metrics",
-  "editable": true,
-  "fiscalYearStartMonth": 0,
-  "graphTooltip": 0,
-  "id": 119,
-  "links": [],
-  "liveNow": false,
-  "panels": [
-    {
-      "cards": {
-        "cardPadding": 0
-      },
-      "color": {
-        "cardColor": "#b4ff00",
-        "colorScale": "sqrt",
-        "colorScheme": "interpolateGreens",
-        "exponent": 0.5,
-        "mode": "spectrum"
-      },
-      "dataFormat": "tsbuckets",
-      "datasource": {
-        "type": "prometheus",
-        "uid": "000000001"
-      },
-      "description": "The time it took each artifact client to process the changes to its artifact pool(s)",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "scaleDistribution": {
-              "type": "linear"
-            }
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "heatmap": {},
-      "hideZeroBuckets": true,
-      "highlightCards": true,
-      "id": 6,
-      "legend": {
-        "show": true
-      },
-      "options": {
-        "calculate": false,
-        "calculation": {},
-        "cellGap": 1,
-        "cellValues": {
-          "decimals": 0
-        },
-        "color": {
-          "exponent": 0.5,
-          "fill": "#b4ff00",
-          "mode": "scheme",
-          "reverse": false,
-          "scale": "exponential",
-          "scheme": "Greens",
-          "steps": 128
-        },
-        "exemplars": {
-          "color": "rgba(255,0,255,0.7)"
-        },
-        "filterValues": {
-          "le": 1e-9
-        },
-        "legend": {
-          "show": true
-        },
-        "rowsFrame": {
-          "layout": "auto"
-        },
-        "showValue": "never",
-        "tooltip": {
-          "show": true,
-          "yHistogram": true
-        },
-        "yAxis": {
-          "axisPlacement": "left",
-          "decimals": 0,
-          "reverse": false,
-          "unit": "s"
-        }
-      },
-      "pluginVersion": "9.2.5",
-      "reverseYBuckets": false,
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "000000001"
-          },
-          "editorMode": "code",
-          "exemplar": true,
-          "expr": "sum by (le) (\n  increase(artifact_manager_client_processing_time_seconds_bucket{ic=~\"$ic\", job=\"replica\", ic_subnet=~\"$ic_subnet\", instance=~\"$instance\"}[$__rate_interval])\n)",
-          "format": "heatmap",
-          "instant": false,
-          "interval": "",
-          "legendFormat": "{{le}} {{client}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Artifact Client Processing Time",
-      "tooltip": {
-        "show": true,
-        "showHistogram": true
-      },
-      "tooltipDecimals": 0,
-      "transparent": true,
-      "type": "heatmap",
-      "xAxis": {
-        "show": true
-      },
-      "yAxis": {
-        "decimals": 0,
-        "format": "s",
-        "logBase": 1,
-        "show": true
-      },
-      "yBucketBound": "auto"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "000000001"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "opacity",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 0
-      },
-      "id": 9,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "000000001"
-          },
-          "expr": "sum by (op) (rate(p2p_gossip_op_duration_seconds_count{ic=~\"$ic\", ic_subnet=~\"$ic_subnet\", instance=~\"$instance\"}[$__rate_interval]))",
-          "refId": "A"
-        }
-      ],
-      "title": "P2P ops per client",
-      "transparent": true,
-      "type": "timeseries"
-    },
-    {
-      "cards": {
-        "cardPadding": 0
-      },
-      "color": {
-        "cardColor": "#b4ff00",
-        "colorScale": "sqrt",
-        "colorScheme": "interpolateGreens",
-        "exponent": 0.5,
-        "mode": "spectrum"
-      },
-      "dataFormat": "tsbuckets",
-      "datasource": {
-        "type": "prometheus",
-        "uid": "000000001"
-      },
-      "description": "P2P op duration",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "scaleDistribution": {
-              "type": "linear"
-            }
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 12,
-        "y": 8
-      },
-      "heatmap": {},
-      "hideZeroBuckets": true,
-      "highlightCards": true,
-      "id": 10,
-      "legend": {
-        "show": true
-      },
-      "options": {
-        "calculate": false,
-        "calculation": {},
-        "cellGap": 1,
-        "cellValues": {
-          "decimals": 0
-        },
-        "color": {
-          "exponent": 0.5,
-          "fill": "#b4ff00",
-          "mode": "scheme",
-          "reverse": false,
-          "scale": "exponential",
-          "scheme": "Greens",
-          "steps": 128
-        },
-        "exemplars": {
-          "color": "rgba(255,0,255,0.7)"
-        },
-        "filterValues": {
-          "le": 1e-9
-        },
-        "legend": {
-          "show": true
-        },
-        "rowsFrame": {
-          "layout": "auto"
-        },
-        "showValue": "never",
-        "tooltip": {
-          "show": true,
-          "yHistogram": true
-        },
-        "yAxis": {
-          "axisPlacement": "left",
-          "decimals": 0,
-          "reverse": false,
-          "unit": "s"
-        }
-      },
-      "pluginVersion": "9.2.5",
-      "reverseYBuckets": false,
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "000000001"
-          },
-          "editorMode": "code",
-          "exemplar": true,
-          "expr": "sum by (le) (\n  increase(p2p_gossip_op_duration_seconds_bucket{ic=~\"$ic\", job=\"replica\", ic_subnet=~\"$ic_subnet\", instance=~\"$instance\"}[$__rate_interval])\n)",
-          "format": "heatmap",
-          "instant": false,
-          "interval": "",
-          "legendFormat": "{{le}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "P2P op duration",
-      "tooltip": {
-        "show": true,
-        "showHistogram": true
-      },
-      "tooltipDecimals": 0,
-      "transparent": true,
-      "type": "heatmap",
-      "xAxis": {
-        "show": true
-      },
-      "yAxis": {
-        "decimals": 0,
-        "format": "s",
-        "logBase": 1,
-        "show": true
-      },
-      "yBucketBound": "auto"
-    },
-    {
-      "cards": {
-        "cardPadding": 0
-      },
-      "color": {
-        "cardColor": "#b4ff00",
-        "colorScale": "sqrt",
-        "colorScheme": "interpolateGreens",
-        "exponent": 0.5,
-        "mode": "spectrum"
-      },
-      "dataFormat": "tsbuckets",
-      "datasource": {
-        "type": "prometheus",
-        "uid": "000000001"
-      },
-      "description": "Duration between artifact client processing calls",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "scaleDistribution": {
-              "type": "linear"
-            }
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 9
-      },
-      "heatmap": {},
-      "hideZeroBuckets": true,
-      "highlightCards": true,
-      "id": 7,
-      "legend": {
-        "show": true
-      },
-      "options": {
-        "calculate": false,
-        "calculation": {},
-        "cellGap": 1,
-        "cellValues": {
-          "decimals": 0
-        },
-        "color": {
-          "exponent": 0.5,
-          "fill": "#b4ff00",
-          "mode": "scheme",
-          "reverse": false,
-          "scale": "exponential",
-          "scheme": "Greens",
-          "steps": 128
-        },
-        "exemplars": {
-          "color": "rgba(255,0,255,0.7)"
-        },
-        "filterValues": {
-          "le": 1e-9
-        },
-        "legend": {
-          "show": true
-        },
-        "rowsFrame": {
-          "layout": "auto"
-        },
-        "showValue": "never",
-        "tooltip": {
-          "show": true,
-          "yHistogram": true
-        },
-        "yAxis": {
-          "axisPlacement": "left",
-          "decimals": 0,
-          "reverse": false,
-          "unit": "s"
-        }
-      },
-      "pluginVersion": "9.2.5",
-      "reverseYBuckets": false,
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "000000001"
-          },
-          "editorMode": "code",
-          "exemplar": true,
-          "expr": "sum by (le) (\n  increase(artifact_manager_client_processing_interval_seconds_bucket{ic=~\"$ic\", job=\"replica\", ic_subnet=~\"$ic_subnet\", instance=~\"$instance\"}[$__rate_interval])\n)",
-          "format": "heatmap",
-          "instant": false,
-          "interval": "",
-          "legendFormat": "{{le}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Artifact Client Processing Interval",
-      "tooltip": {
-        "show": true,
-        "showHistogram": true
-      },
-      "tooltipDecimals": 0,
-      "transparent": true,
-      "type": "heatmap",
-      "xAxis": {
-        "show": true
-      },
-      "yAxis": {
-        "decimals": 0,
-        "format": "s",
-        "logBase": 1,
-        "show": true
-      },
-      "yBucketBound": "auto"
-    }
-  ],
-  "refresh": "",
-  "schemaVersion": 37,
-  "style": "dark",
-  "tags": [
-    "production",
-    "networking"
-  ],
-  "templating": {
-    "list": [
-      {
-        "current": {
-          "selected": false,
-          "text": "IC Metrics",
-          "value": "IC Metrics"
-        },
-        "hide": 0,
-        "includeAll": false,
-        "multi": false,
-        "name": "datasource",
-        "options": [],
-        "query": "prometheus",
-        "refresh": 1,
-        "regex": "/IC.*/",
-        "skipUrlSync": false,
-        "type": "datasource"
-      },
-      {
-        "allValue": "",
-        "current": {
-          "selected": false,
-          "text": "mercury",
-          "value": "mercury"
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "000000001"
-        },
-        "definition": "label_values(up{job=\"replica\"}, ic)",
-        "hide": 0,
-        "includeAll": false,
-        "label": "IC",
-        "multi": false,
-        "name": "ic",
-        "options": [],
-        "query": {
-          "query": "label_values(up{job=\"replica\"}, ic)",
-          "refId": "StandardVariableQuery"
-        },
-        "refresh": 2,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 1,
-        "tagValuesQuery": "",
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "allValue": ".+",
-        "current": {
-          "selected": true,
-          "text": [
-            "tdb26-jop6k-aogll-7ltgs-eruif-6kk7m-qpktf-gdiqx-mxtrf-vb5e6-eqe"
-          ],
-          "value": [
-            "tdb26-jop6k-aogll-7ltgs-eruif-6kk7m-qpktf-gdiqx-mxtrf-vb5e6-eqe"
-          ]
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "000000001"
-        },
-        "definition": "label_values(up{job=\"replica\",ic=\"$ic\"},ic_subnet)",
-        "hide": 0,
-        "includeAll": true,
-        "label": "Subnet",
-        "multi": true,
-        "name": "ic_subnet",
-        "options": [],
-        "query": {
-          "query": "label_values(up{job=\"replica\",ic=\"$ic\"},ic_subnet)",
-          "refId": "StandardVariableQuery"
-        },
-        "refresh": 2,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 1,
-        "tagValuesQuery": "",
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "allValue": ".+",
-        "current": {
-          "selected": true,
-          "text": [
-            "All"
-          ],
-          "value": [
-            "$__all"
-          ]
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "000000001"
-        },
-        "definition": "label_values(up{job=\"replica\",ic=\"$ic\",ic_subnet=~\"$ic_subnet\"},instance)",
-        "hide": 0,
-        "includeAll": true,
-        "label": "Instance",
-        "multi": true,
-        "name": "instance",
-        "options": [],
-        "query": {
-          "query": "label_values(up{job=\"replica\",ic=\"$ic\",ic_subnet=~\"$ic_subnet\"},instance)",
-          "refId": "StandardVariableQuery"
-        },
-        "refresh": 2,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 1,
-        "tagValuesQuery": "",
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      }
-    ]
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "utc",
-  "title": "P2P",
-  "uid": "ic-p2p",
-  "version": 1,
-  "weekStart": ""
-}
\ No newline at end of file
diff --git a/rs/tests/driver/BUILD.bazel b/rs/tests/driver/BUILD.bazel
index 7b9a96a4db5..baac372c025 100644
--- a/rs/tests/driver/BUILD.bazel
+++ b/rs/tests/driver/BUILD.bazel
@@ -47,6 +47,7 @@ rust_library(
         "//rs/crypto/tree_hash",
         "//rs/crypto/utils/threshold_sig_der",
         "//rs/cycles_account_manager",
+        "//rs/ic_os/config_types",
         "//rs/ic_os/deterministic_ips",
         "//rs/interfaces",
         "//rs/interfaces/registry",
@@ -139,6 +140,7 @@ rust_library(
         "@crate_index//:kube",
         "@crate_index//:lazy_static",
         "@crate_index//:leb128",
+        "@crate_index//:macaddr",
         "@crate_index//:maplit",
         "@crate_index//:nix",
         "@crate_index//:num_cpus",
diff --git a/rs/tests/driver/Cargo.toml b/rs/tests/driver/Cargo.toml
index 97dac51a8b9..a266cf92856 100644
--- a/rs/tests/driver/Cargo.toml
+++ b/rs/tests/driver/Cargo.toml
@@ -17,6 +17,7 @@ candid = { workspace = true }
 canister-test = { path = "../../rust_canisters/canister_test" }
 chrono = { workspace = true }
 clap = { workspace = true }
+config_types = { path = "../../ic_os/config_types" }
 crossbeam-channel = { workspace = true }
 cycles-minting-canister = { path = "../../nns/cmc" }
 deterministic_ips = { path = "../../ic_os/deterministic_ips" }
@@ -105,6 +106,7 @@ kube = { workspace = true }
 lazy_static = { workspace = true }
 leb128 = "0.2.5"
 lifeline = { path = "../../nns/handlers/lifeline/impl" }
+macaddr = { workspace = true }
 maplit = "1.0.2"
 nix = { workspace = true }
 num_cpus = "1.13.1"
diff --git a/rs/tests/driver/src/driver/farm.rs b/rs/tests/driver/src/driver/farm.rs
index c05101c5136..47d97bc0750 100644
--- a/rs/tests/driver/src/driver/farm.rs
+++ b/rs/tests/driver/src/driver/farm.rs
@@ -448,34 +448,33 @@ pub struct GroupSpec {
 
 impl GroupSpec {
     pub fn add_meta(mut self, group_base_name: &str) -> Self {
-        let mut metadata = GroupMetadata {
-            user: None,
-            job_schedule: None,
-            test_name: Some(group_base_name.to_string()),
-        };
-
         // Acquire bazel's volatile status containing key value pairs like USER and CI_JOB_NAME:
-        let volatile_status_file_path = std::env::var("VOLATILE_STATUS_FILE_PATH")
-            .expect("Expected the environment variable VOLATILE_STATUS_FILE_PATH to be defined!");
-        let volatile_status = read_dependency_to_string(&volatile_status_file_path)
+        let farm_metadata_path = std::env::var("FARM_METADATA_PATH")
+            .expect("Expected the environment variable FARM_METADATA_PATH to be defined!");
+        let farm_metadata = read_dependency_to_string(&farm_metadata_path)
             .unwrap_or_else(|e| {
-                panic!("Couldn't read content of the volatile status file {volatile_status_file_path}: {e:?}")
+                panic!(
+                    "Couldn't read content of the volatile status file {farm_metadata_path}: {e:?}"
+                )
             })
             .trim_end()
             .to_string();
-        let runtime_args_map = parse_volatile_status_file(volatile_status);
-
-        if let Some(user) = runtime_args_map.get("USER") {
-            metadata.user = Some(String::from(user));
-        } else {
-            metadata.user = Some(String::from("CI"));
-        }
-
-        if let Some(ci_job_name) = runtime_args_map.get("CI_JOB_NAME") {
-            metadata.job_schedule = Some(String::from(ci_job_name));
-        } else {
-            metadata.job_schedule = Some(String::from("manual"));
-        }
+        let runtime_args_map = parse_farm_metadata_file(farm_metadata);
+
+        // Read values from the runtime args and use sensible defaults if unset
+        let user = runtime_args_map
+            .get("USER")
+            .cloned()
+            .unwrap_or("CI".to_string());
+        let job_schedule = runtime_args_map
+            .get("CI_JOB_NAME")
+            .cloned()
+            .unwrap_or("manual".to_string());
+        let metadata = GroupMetadata {
+            user,
+            job_schedule,
+            test_name: group_base_name.to_string(),
+        };
         self.metadata = Some(metadata);
         self
     }
@@ -484,14 +483,14 @@ impl GroupSpec {
 #[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Debug, Deserialize, Serialize)]
 pub struct GroupMetadata {
     #[serde(rename = "user")]
-    pub user: Option<String>,
+    pub user: String,
     #[serde(rename = "jobSchedule")]
-    pub job_schedule: Option<String>,
+    pub job_schedule: String,
     #[serde(rename = "testName")]
-    pub test_name: Option<String>,
+    pub test_name: String,
 }
 
-fn parse_volatile_status_file(input: String) -> HashMap<String, String> {
+fn parse_farm_metadata_file(input: String) -> HashMap<String, String> {
     let mut map = HashMap::new();
     let lines = input.split('\n');
     for line in lines {
diff --git a/rs/tests/driver/src/driver/group.rs b/rs/tests/driver/src/driver/group.rs
index 9b0012a3b76..7ab05d602ff 100644
--- a/rs/tests/driver/src/driver/group.rs
+++ b/rs/tests/driver/src/driver/group.rs
@@ -1117,7 +1117,7 @@ async fn stream_journald_from_cursor(
     unwrap_or_return!(
         cursor,
         stream
-            .write_all(format!("Range: entries={cursor}:0:\n\r\n\r").as_bytes())
+            .write_all(format!("Range: entries={cursor}\n\r\n\r").as_bytes())
             .await
     );
     let buf_reader = BufReader::new(stream);
diff --git a/rs/tests/driver/src/driver/nested.rs b/rs/tests/driver/src/driver/nested.rs
index 81a742bba35..e6bec284501 100644
--- a/rs/tests/driver/src/driver/nested.rs
+++ b/rs/tests/driver/src/driver/nested.rs
@@ -14,7 +14,10 @@ use std::path::PathBuf;
 
 use anyhow::{bail, Result};
 use async_trait::async_trait;
-use deterministic_ips::{calculate_deterministic_mac, Deployment, HwAddr, IpVariant};
+use config_types::DeploymentEnvironment;
+use deterministic_ips::node_type::NodeType;
+use deterministic_ips::{calculate_deterministic_mac, IpVariant, MacAddr6Ext};
+use macaddr::MacAddr6;
 use serde::{Deserialize, Serialize};
 use slog::info;
 use ssh2::Session;
@@ -124,7 +127,7 @@ impl NestedVms for TestEnv {
 
     fn write_nested_vm(&self, name: &str, vm: &AllocatedVm) -> Result<()> {
         // Remap the IPv6 addresses based on their deterministic IPs
-        let seed_mac = vm.mac6.parse::<HwAddr>().unwrap();
+        let seed_mac = vm.mac6.parse::<MacAddr6>().unwrap();
         let old_ip = vm.ipv6;
 
         // TODO: We transform the IPv6 to get this information, but it could be
@@ -135,10 +138,18 @@ impl NestedVms for TestEnv {
             segments[0], segments[1], segments[2], segments[3]
         );
 
-        let host_mac =
-            calculate_deterministic_mac(seed_mac, Deployment::Mainnet, IpVariant::V6, 0).unwrap();
-        let guest_mac =
-            calculate_deterministic_mac(seed_mac, Deployment::Mainnet, IpVariant::V6, 1).unwrap();
+        let host_mac = calculate_deterministic_mac(
+            &seed_mac,
+            DeploymentEnvironment::Mainnet,
+            IpVariant::V6,
+            NodeType::HostOS,
+        );
+        let guest_mac = calculate_deterministic_mac(
+            &seed_mac,
+            DeploymentEnvironment::Mainnet,
+            IpVariant::V6,
+            NodeType::GuestOS,
+        );
 
         let host_ip = host_mac.calculate_slaac(&prefix).unwrap();
         let guest_ip = guest_mac.calculate_slaac(&prefix).unwrap();
diff --git a/rs/tests/message_routing/BUILD.bazel b/rs/tests/message_routing/BUILD.bazel
index f79d33fdd85..3616bc7b3e6 100644
--- a/rs/tests/message_routing/BUILD.bazel
+++ b/rs/tests/message_routing/BUILD.bazel
@@ -25,6 +25,8 @@ system_test_nns(
         "//rs/rust_canisters/xnet_test",
         "//rs/tests/driver:ic-system-test-driver",
         "@crate_index//:anyhow",
+        "@crate_index//:candid",
+        "@crate_index//:ic-cdk",
         "@crate_index//:itertools",
         "@crate_index//:slog",
         "@crate_index//:tokio",
diff --git a/rs/tests/message_routing/Cargo.toml b/rs/tests/message_routing/Cargo.toml
index 3023150acb6..bbba932178f 100644
--- a/rs/tests/message_routing/Cargo.toml
+++ b/rs/tests/message_routing/Cargo.toml
@@ -8,15 +8,16 @@ documentation.workspace = true
 
 [dependencies]
 anyhow = { workspace = true }
+candid = { workspace = true }
 canister-test = { path = "../../rust_canisters/canister_test" }
 dfn_candid = { path = "../../rust_canisters/dfn_candid" }
+ic-cdk = { workspace = true }
 ic-registry-subnet-type = { path = "../../registry/subnet_type" }
 ic-system-test-driver = { path = "../driver" }
 itertools = { workspace = true }
 slog = { workspace = true }
 tokio = { workspace = true }
 xnet-test = { path = "../../rust_canisters/xnet_test" }
-candid = { workspace = true }
 ic-agent = { workspace = true }
 ic-base-types = { path = "../../types/base_types" }
 ic-types = { path = "../../types/types" }
diff --git a/rs/tests/message_routing/common/BUILD.bazel b/rs/tests/message_routing/common/BUILD.bazel
index 1d8feb8e7f5..44878dbc476 100644
--- a/rs/tests/message_routing/common/BUILD.bazel
+++ b/rs/tests/message_routing/common/BUILD.bazel
@@ -11,7 +11,9 @@ rust_library(
         "//rs/rust_canisters/dfn_candid",
         "//rs/rust_canisters/xnet_test",
         "//rs/tests/driver:ic-system-test-driver",
+        "@crate_index//:candid",
         "@crate_index//:futures",
+        "@crate_index//:ic-cdk",
         "@crate_index//:slog",
     ],
 )
diff --git a/rs/tests/message_routing/common/Cargo.toml b/rs/tests/message_routing/common/Cargo.toml
index 25b3296a161..18b33004f64 100644
--- a/rs/tests/message_routing/common/Cargo.toml
+++ b/rs/tests/message_routing/common/Cargo.toml
@@ -7,6 +7,8 @@ description.workspace = true
 documentation.workspace = true
 
 [dependencies]
+candid = { workspace = true }
+ic-cdk = { workspace = true }
 canister-test = { path = "../../../rust_canisters/canister_test" }
 dfn_candid = { path = "../../../rust_canisters/dfn_candid" }
 futures = { workspace = true }
diff --git a/rs/tests/message_routing/common/common.rs b/rs/tests/message_routing/common/common.rs
index 5e3670be2b5..017aefd8e4e 100644
--- a/rs/tests/message_routing/common/common.rs
+++ b/rs/tests/message_routing/common/common.rs
@@ -1,11 +1,12 @@
+use candid::Principal;
 use canister_test::{Canister, Runtime, Wasm};
 use dfn_candid::candid;
 use futures::{future::join_all, Future};
+use ic_cdk::api::management_canister::provisional::CanisterId;
 use ic_system_test_driver::driver::test_env::TestEnv;
 use ic_system_test_driver::driver::test_env_api::get_dependency_path;
 use slog::info;
-use std::env;
-use xnet_test::CanisterId;
+use std::{convert::TryFrom, env};
 
 /// Concurrently calls `start` on all canisters in `canisters` with the
 /// given parameters.
@@ -16,7 +17,11 @@ pub async fn start_all_canisters(
 ) {
     let topology: Vec<Vec<CanisterId>> = canisters
         .iter()
-        .map(|x| x.iter().map(|y| y.canister_id_vec8()).collect())
+        .map(|x| {
+            x.iter()
+                .map(|y| Principal::try_from(y.canister_id_vec8()).unwrap())
+                .collect()
+        })
         .collect();
     let mut futures = vec![];
     for (subnet_idx, canister_idx, canister) in canisters
diff --git a/rs/tests/message_routing/global_reboot_test.rs b/rs/tests/message_routing/global_reboot_test.rs
index 45b3f4a8d70..f964002b6ea 100644
--- a/rs/tests/message_routing/global_reboot_test.rs
+++ b/rs/tests/message_routing/global_reboot_test.rs
@@ -26,8 +26,10 @@ Success::
 end::catalog[] */
 
 use anyhow::Result;
+use candid::Principal;
 use canister_test::{Canister, Runtime, Wasm};
 use dfn_candid::candid;
+use ic_cdk::api::management_canister::provisional::CanisterId;
 use ic_registry_subnet_type::SubnetType;
 use ic_system_test_driver::driver::group::SystemTestGroup;
 use ic_system_test_driver::driver::ic::InternetComputer;
@@ -46,7 +48,7 @@ use slog::{info, Logger};
 use std::env;
 use std::time::Duration;
 use tokio::time::sleep;
-use xnet_test::{CanisterId, Metrics};
+use xnet_test::Metrics;
 
 const SUBNETS_COUNT: usize = 2;
 const CANISTERS_PER_SUBNET: usize = 3;
@@ -172,7 +174,11 @@ pub fn start_all_canisters(
 ) {
     let topology: Vec<Vec<CanisterId>> = canisters
         .iter()
-        .map(|x| x.iter().map(|y| y.canister_id_vec8()).collect())
+        .map(|x| {
+            x.iter()
+                .map(|y| Principal::try_from(y.canister_id_vec8()).unwrap())
+                .collect()
+        })
         .collect();
     block_on(async {
         for (subnet_idx, canister_idx, canister) in canisters
@@ -209,9 +215,9 @@ pub fn assert_metrics_progress_without_errors(
 
         assert_eq!(pre_reboot.seq_errors, 0);
         assert_eq!(post_reboot.seq_errors, 0);
-        assert!(pre_reboot.requests_sent > 0);
+        assert!(pre_reboot.requests_sent() > 0);
         // Assert positive dynamics after reboot.
-        assert!(post_reboot.requests_sent > pre_reboot.requests_sent);
+        assert!(post_reboot.requests_sent() > pre_reboot.requests_sent());
 
         let responses_pre_reboot = pre_reboot.latency_distribution.buckets().last().unwrap().1
             + pre_reboot.reject_responses;
diff --git a/rs/tests/message_routing/xnet/slo_test_lib/xnet_slo_test_lib.rs b/rs/tests/message_routing/xnet/slo_test_lib/xnet_slo_test_lib.rs
index 94c164b964e..102a82a8caa 100644
--- a/rs/tests/message_routing/xnet/slo_test_lib/xnet_slo_test_lib.rs
+++ b/rs/tests/message_routing/xnet/slo_test_lib/xnet_slo_test_lib.rs
@@ -336,7 +336,7 @@ pub fn check_success(
         };
 
     for (i, m) in aggregated_metrics.iter().enumerate() {
-        let attempted_calls = m.requests_sent + m.call_errors;
+        let attempted_calls = m.calls_attempted;
         if attempted_calls != 0 {
             let failed_calls = m.call_errors + m.reject_responses;
             let error_percentage = 100. * failed_calls as f64 / attempted_calls as f64;
@@ -378,7 +378,7 @@ pub fn check_success(
             m.latency_distribution.buckets().last().unwrap().1 + m.reject_responses;
         // All messages sent more than `targeted_latency_seconds` before the end of the
         // test should have gotten a response.
-        let responses_expected = (m.requests_sent as f64
+        let responses_expected = ((m.calls_attempted - m.call_errors) as f64
             * (config.runtime.as_secs() - config.targeted_latency_seconds) as f64
             / config.runtime.as_secs() as f64) as usize;
         // Account for requests enqueued this round (in case canister messages were
@@ -392,10 +392,16 @@ pub fn check_success(
             responses_received
         );
         let responses_expected = responses_expected - config.subnet_to_subnet_rate;
-        let actual = format!("{}/{}", responses_received, m.requests_sent);
+        let actual = format!(
+            "{}/{}",
+            responses_received,
+            m.calls_attempted - m.call_errors
+        );
         let msg = format!(
             "Expected requests sent more than {}s ago ({}/{}) to receive responses",
-            config.targeted_latency_seconds, responses_expected, m.requests_sent
+            config.targeted_latency_seconds,
+            responses_expected,
+            m.calls_attempted - m.call_errors
         );
         expect(
             responses_received >= responses_expected,
diff --git a/rs/tests/nns/ic_mainnet_nns_recovery/src/lib.rs b/rs/tests/nns/ic_mainnet_nns_recovery/src/lib.rs
index d15849708f6..2eb9199ff01 100644
--- a/rs/tests/nns/ic_mainnet_nns_recovery/src/lib.rs
+++ b/rs/tests/nns/ic_mainnet_nns_recovery/src/lib.rs
@@ -492,13 +492,9 @@ fn setup_boundary_node(
     let recovered_nns_node_ipv6 = recovered_nns_node.get_ip_addr();
     boundary_node.block_on_bash_script(&format!(r#"
         set -e
-        cp /etc/systemd/system/ic-boundary.service /tmp/
-        sed -i '/--nns-urls/d' /tmp/ic-boundary.service
-        sed -i '/--local-store-path/d' /tmp/ic-boundary.service
-        sed -i '/--nns-pub-key-pem/a\        --stub-replica [{recovered_nns_node_ipv6}]:8080 \\' /tmp/ic-boundary.service
-        sed -i '/--stub-replica/a\        --skip-replica-tls-verification \\' /tmp/ic-boundary.service
-        sudo mount --bind /tmp/ic-boundary.service /etc/systemd/system/ic-boundary.service
-        sudo systemctl daemon-reload
+        sudo sed -i '/REGISTRY_LOCAL_STORE_PATH/d' /run/ic-node/etc/default/ic-boundary
+        echo 'REGISTRY_STUB_REPLICA="[{recovered_nns_node_ipv6}]:8080"' | sudo tee -a /run/ic-node/etc/default/ic-boundary
+        echo 'SKIP_REPLICA_TLS_VERIFICATION="true"' | sudo tee -a /run/ic-node/etc/default/ic-boundary
         sudo systemctl restart ic-boundary
     "#)).unwrap_or_else(|e| {
         panic!("Could not reconfigure ic-boundary on {BOUNDARY_NODE_NAME} to only route to the recovered NNS because {e:?}",)
diff --git a/rs/tests/system_tests.bzl b/rs/tests/system_tests.bzl
index 87b8edea7d0..991fee0dd2f 100644
--- a/rs/tests/system_tests.bzl
+++ b/rs/tests/system_tests.bzl
@@ -12,6 +12,18 @@ load("//rs/tests:common.bzl", "BOUNDARY_NODE_GUESTOS_RUNTIME_DEPS", "GUESTOS_DEV
 def _run_system_test(ctx):
     run_test_script_file = ctx.actions.declare_file(ctx.label.name + "/run-test.sh")
 
+    # trim the volatile status file to only the values that farm needs and that rarely
+    # ever change (on CI at least); otherwise, BUILD_TIMESTAMP changes on every new Bazel
+    # server start and effectively invalidates all system tests on every CI run.
+    farm_metadata = ctx.actions.declare_file(ctx.label.name + "/farm_metadata")
+    ctx.actions.run_shell(
+        # NOTE: grep shouldn't return 1 as long as the workspace status command at least
+        # prints USER (which ours does).
+        command = "grep <{version_file} -e CI_JOB_NAME -e USER > {farm_metadata}".format(version_file = ctx.version_file.path, farm_metadata = farm_metadata.path),
+        inputs = [ctx.version_file],
+        outputs = [farm_metadata],
+    )
+
     # whether to use k8s instead of farm
     k8s = ctx.attr._k8s[BuildSettingInfo].value
 
@@ -71,7 +83,7 @@ def _run_system_test(ctx):
             env[key] = ctx.expand_location(value, ctx.attr.runtime_deps)
 
     env |= {
-        "VOLATILE_STATUS_FILE_PATH": ctx.version_file.short_path,
+        "FARM_METADATA_PATH": farm_metadata.short_path,
     }
 
     # The test runner script expects a list of enviromment variable names to files:
@@ -106,9 +118,9 @@ def _run_system_test(ctx):
             runfiles = ctx.runfiles(
                 files = [
                     run_test_script_file,
+                    farm_metadata,
                     ctx.executable.src,
                     ctx.executable._upload_systest_dep,
-                    ctx.version_file,
                 ],
                 transitive_files = depset(
                     direct = [],
diff --git a/rs/tla_instrumentation/tla_instrumentation/src/tla_state.rs b/rs/tla_instrumentation/tla_instrumentation/src/tla_state.rs
index 108dda76d35..d2fbd2b3611 100644
--- a/rs/tla_instrumentation/tla_instrumentation/src/tla_state.rs
+++ b/rs/tla_instrumentation/tla_instrumentation/src/tla_state.rs
@@ -48,11 +48,17 @@ impl VarAssignment {
 Possible causes:
 1. A local variable is set both after the last await and in default_locals.
    This is the most likely cause if the stack trace includes tla_log_method_return.
-2. A local variable of the same name is set in multiple functions in the call stack."#,
+2. A local variable of the same name is set in multiple functions in the call stack.
+States are:
+{:?}
+and
+{:?}"#,
             self.0
                 .keys()
                 .collect::<BTreeSet<_>>()
-                .intersection(&other.0.keys().collect::<BTreeSet<_>>())
+                .intersection(&other.0.keys().collect::<BTreeSet<_>>()),
+            self,
+            other
         );
         let mut new_locals = self.0.clone();
         new_locals.extend(other.0);
@@ -60,7 +66,7 @@ Possible causes:
     }
 }
 
-#[derive(Clone, Default)]
+#[derive(Clone, Default, PartialEq, Eq, Hash)]
 pub struct GlobalState(pub VarAssignment);
 
 impl GlobalState {
@@ -100,7 +106,7 @@ impl std::fmt::Debug for GlobalState {
     }
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Label(String);
 
 impl Label {
diff --git a/rs/types/error_types/src/lib.rs b/rs/types/error_types/src/lib.rs
index a4ccaae6c55..085ac126863 100644
--- a/rs/types/error_types/src/lib.rs
+++ b/rs/types/error_types/src/lib.rs
@@ -650,4 +650,17 @@ mod tests {
             [1, 2, 3, 4, 5, 6]
         );
     }
+
+    #[test]
+    fn reject_code_from_error_code() {
+        // If this fails, you are making a change to `RejectCode` which violates the property
+        // that the reject code can be derived from the leading digit of an error code.
+        for error_code in ErrorCode::iter() {
+            let reject_code: RejectCode = error_code.into();
+            let error_code_as_u64: u64 = error_code as u64;
+            assert!((100..700).contains(&error_code_as_u64));
+            let derived_reject_code: RejectCode = (error_code_as_u64 / 100).try_into().unwrap();
+            assert_eq!(reject_code, derived_reject_code);
+        }
+    }
 }
diff --git a/rs/types/management_canister_types/src/lib.rs b/rs/types/management_canister_types/src/lib.rs
index 63a06d95bc2..c504cd184dc 100644
--- a/rs/types/management_canister_types/src/lib.rs
+++ b/rs/types/management_canister_types/src/lib.rs
@@ -2725,6 +2725,7 @@ pub struct SignWithSchnorrArgs {
     pub message: Vec<u8>,
     pub derivation_path: DerivationPath,
     pub key_id: SchnorrKeyId,
+    pub taproot_tree_root: Option<ByteBuf>,
 }
 
 impl Payload<'_> for SignWithSchnorrArgs {}
diff --git a/rs/types/types/src/batch.rs b/rs/types/types/src/batch.rs
index 400d22480e2..7676e5d084e 100644
--- a/rs/types/types/src/batch.rs
+++ b/rs/types/types/src/batch.rs
@@ -53,7 +53,7 @@ pub struct Batch {
     /// A source of randomness for processing the Batch.
     pub randomness: Randomness,
     /// The Master public keys of the subnet.
-    pub idkg_subnet_public_keys: BTreeMap<MasterPublicKeyId, MasterPublicKey>,
+    pub chain_key_subnet_public_keys: BTreeMap<MasterPublicKeyId, MasterPublicKey>,
     /// The pre-signature Ids available to be matched with signature requests.
     pub idkg_pre_signature_ids: BTreeMap<MasterPublicKeyId, BTreeSet<PreSigId>>,
     /// The version of the registry to be referenced when processing the batch.
diff --git a/rs/types/types/src/consensus/idkg/schnorr.rs b/rs/types/types/src/consensus/idkg/schnorr.rs
index 302320742e0..d3e3cbb18a8 100644
--- a/rs/types/types/src/consensus/idkg/schnorr.rs
+++ b/rs/types/types/src/consensus/idkg/schnorr.rs
@@ -209,6 +209,7 @@ pub struct ThresholdSchnorrSigInputsRef {
     pub message: Arc<Vec<u8>>,
     pub nonce: Randomness,
     pub presig_transcript_ref: PreSignatureTranscriptRef,
+    pub taproot_tree_root: Option<Arc<Vec<u8>>>,
 }
 
 impl fmt::Debug for ThresholdSchnorrSigInputsRef {
@@ -235,12 +236,14 @@ impl ThresholdSchnorrSigInputsRef {
         message: Arc<Vec<u8>>,
         nonce: Randomness,
         presig_transcript_ref: PreSignatureTranscriptRef,
+        taproot_tree_root: Option<Arc<Vec<u8>>>,
     ) -> Self {
         Self {
             derivation_path,
             message,
             nonce,
             presig_transcript_ref,
+            taproot_tree_root,
         }
     }
 
@@ -259,7 +262,7 @@ impl ThresholdSchnorrSigInputsRef {
         ThresholdSchnorrSigInputs::new(
             &self.derivation_path,
             &self.message,
-            None, // TODO(CRP-2630)
+            self.taproot_tree_root.as_ref().map(|v| &***v),
             self.nonce,
             presig_transcript,
             key_transcript,
diff --git a/testnet/mainnet_revisions.json b/testnet/mainnet_revisions.json
index c06f8d3422a..b25ad0a97cf 100644
--- a/testnet/mainnet_revisions.json
+++ b/testnet/mainnet_revisions.json
@@ -1,6 +1,6 @@
 {
   "subnets": {
-    "tdb26-jop6k-aogll-7ltgs-eruif-6kk7m-qpktf-gdiqx-mxtrf-vb5e6-eqe": "cb3cb61009d904bcb726781ad379de10e1b745ff",
-    "io67a-2jmkw-zup3h-snbwi-g6a5n-rm5dn-b6png-lvdpl-nqnto-yih6l-gqe": "6e2c0d9fbea99f799a987a365ff6ad2b883067c9"
+    "tdb26-jop6k-aogll-7ltgs-eruif-6kk7m-qpktf-gdiqx-mxtrf-vb5e6-eqe": "a3478d571670053ebd09b9771bec489ef69425fa",
+    "io67a-2jmkw-zup3h-snbwi-g6a5n-rm5dn-b6png-lvdpl-nqnto-yih6l-gqe": "2d8611eb4efa8e69c4dd567546c1c353a545e0a6"
   }
 }
\ No newline at end of file
diff --git a/third_party/lmdb/BUILD.lmdb.bazel b/third_party/lmdb/BUILD.lmdb.bazel
index 00ddbb40361..ce8763ee6b2 100644
--- a/third_party/lmdb/BUILD.lmdb.bazel
+++ b/third_party/lmdb/BUILD.lmdb.bazel
@@ -2,6 +2,25 @@ package(default_visibility = ["//visibility:public"])
 
 exports_files(["lmdb.h"])
 
+# A copy of just the static archive, which can be used with `$(location ...)` in
+# builds that need it.
+genrule(
+    name = "liblmdb",
+    srcs = [":lmdb"],
+    outs = ["single/liblmdb.a"],
+
+    # Just iterate over the outputs of `cc_library` until we find the lib we want
+    cmd = """
+    for src in $(SRCS); do
+        if [[ $$src =~ liblmdb.a$$ ]]; then
+            cp "$$src" "$@"
+            break
+        fi
+    done
+    """,
+    visibility = ["//visibility:public"],
+)
+
 cc_library(
     name = "lmdb",
     srcs = [
@@ -10,4 +29,5 @@ cc_library(
         "midl.h",
     ],
     hdrs = ["lmdb.h"],
+    linkstatic = True,
 )