diff --git a/.github/workflows/auto-merge-keyman-server-pr.yml b/.github/workflows/auto-merge-keyman-server-pr.yml
index 6b93e716fa..39cafc3f91 100644
--- a/.github/workflows/auto-merge-keyman-server-pr.yml
+++ b/.github/workflows/auto-merge-keyman-server-pr.yml
@@ -17,12 +17,15 @@ jobs:
     if: ${{ github.repository == 'keymanapp/keyman' && github.actor == 'keyman-server' && startsWith(github.event.pull_request.title, 'auto:') }}
     steps:
     - name: auto approve PR from keyman-server
-      uses: hmarr/auto-approve-action@v3
-      with:
-        github-token: "${{ secrets.GITHUB_TOKEN }}"
-    - name: auto merge PR from keyman-server
-      uses: "pascalgn/automerge-action@7854d3bd607dccdaf0b2c134b699a812c8960213"
+      shell: bash
       env:
-        GITHUB_TOKEN: "${{ secrets.AUTOINC_GITHUB_TOKEN }}"
-        MERGE_LABELS: ""
-        MERGE_FORKS: false
+        GH_TOKEN: "${{ github.token }}"
+      run: |
+        gh pr review -R keymanapp/keyman --approve ${{ github.event.pull_request.number }}
+    - name: mark PR for auto-merge from keyman-server
+      shell: bash
+      if: contains(github.event.pull_request.labels.*.name, 'automerge')
+      env:
+        GH_TOKEN: "${{ secrets.AUTOINC_GITHUB_TOKEN }}"
+      run: |
+        gh pr merge -R keymanapp/keyman --merge --auto ${{ github.event.pull_request.number }}
diff --git a/.github/workflows/deb-packaging.yml b/.github/workflows/deb-packaging.yml
index aaeb1c6306..a40fcb7259 100644
--- a/.github/workflows/deb-packaging.yml
+++ b/.github/workflows/deb-packaging.yml
@@ -86,7 +86,14 @@ jobs:
       shell: bash
       run: |
         THIS_SCRIPT="$GITHUB_WORKSPACE/.github/workflows/deb-packaging.yml"
-        . "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+        if [[ -f "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh" ]]; then
+          . "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
+        else
+          # TODO: remove following block post v19 release (file was renamed in v19 alpha)
+          if [[ -f "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh" ]]; then
+            . "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+          fi
+        fi
         echo "KEYMAN_VERSION=${KEYMAN_VERSION:-${VERSION}}" >> $GITHUB_OUTPUT
 
     - name: Set prerelease tag as output parameter
@@ -127,7 +134,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        dist: [jammy, noble, oracular]
+        dist: [jammy, noble, plucky]
 
     steps:
     - name: Checkout
@@ -153,7 +160,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        dist: [plucky]
+        dist: [questing]
 
     steps:
     - name: Checkout
diff --git a/.github/workflows/pr-build-status.yml b/.github/workflows/pr-build-status.yml
new file mode 100644
index 0000000000..236970f141
--- /dev/null
+++ b/.github/workflows/pr-build-status.yml
@@ -0,0 +1,208 @@
+# GENERATED FILE - DO NOT EDIT!
+#
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# Do not modify the script in .github/workflows/pr-build-status.yml directly;
+# instead work on the sources in resources/build/pr-build-status and use the
+# build.sh script to rebuild the .github/workflows/pr-build-status.yml file from
+# them.
+#
+# build.sh will append the relevant portions of
+# resources/build/pr-build-status/pr-build-status.mjs to the content in
+# resources/build/pr-build-status/pr-build-status.prefix.yml to form the .github
+# workflow file.
+#
+name: Keyman Build Summary
+on:
+  status:
+  push:
+    branches-ignore:
+      - master
+      - beta
+      - stable-*
+  workflow_dispatch:
+    inputs:
+      commit:
+        description: 'Commit sha'
+        required: true
+        type: string
+jobs:
+  run_pr_build_status:
+    name: Summarize build status checks
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check PR build status
+        id: run_pr_build_status_script
+        uses: actions/github-script@v7
+        with:
+          script: |
+            // This code is copied out of resources/build/pr-build-status/pr-build-status.mjs
+            // where it is tested. It is copied inline here in order to avoid requiring the
+            // repository to be checked out, which dramatically reduces the run time of the
+            // check.
+            //
+            // Note: we don't currently look at check runs, only statuses
+            //
+            // Verify the following statuses:
+            //   'user_testing'
+            //   'API Verification' (github-actions[bot])
+            //
+            // At least 1 of the following statuses must be found:
+            //   'Test*' (keyman-server), e.g. 'Test Build (Keyman)'
+            //   'Ubuntu Packaging' (github-actions[bot])
+            //
+            // Ignore the following statuses:
+            //   check/web/file-size
+            //
+
+            function reduceStatuses(statuses) {
+              const filtered_statuses = statuses.reduce((o, status) => {
+                if(status.creator?.login == 'keyman-server' && status.context.startsWith('Test')) {
+                  if(!o[status.context]) o[status.context] = {type: 'build', state: status.state};
+                } else if(status.creator?.login == 'keymanapp-test-bot[bot]' && status.context == 'user_testing') {
+                  if(!o[status.context]) o[status.context] = {type: 'user-test', state: status.state};;
+                } else if(status.context == 'API Verification') {
+                  if(!o[status.context]) o[status.context] = {type: 'check', state: status.state};
+                } else if(status.context == 'Ubuntu Packaging') {
+                  if(!o[status.context]) o[status.context] = {type: 'build', state: status.state};
+                } else if(status.context == 'check/web/file-size') {
+                  // Ignore check/web/file-size -- we won't block automerge for this at this point
+                } else {
+                  // We fail with an 'unknown status' response if we get a new status check
+                  // so we can be sure we are not skipping known status checks
+                  o[status.context] = {type: 'unknown', state: status.state};
+                }
+                return o;
+
+              }, {});
+              return filtered_statuses;
+            }
+
+            //
+            // Given the collection of status checks we care about, return
+            // an aggregate status -- error, failed, pending, or success,
+            // and a summary description
+            //
+            function calculateFinalStatus(filtered_statuses) {
+              const counts = {};
+              let hasBuilds = false;
+              for(const context of Object.keys(filtered_statuses)) {
+                const { state, type } = filtered_statuses[context];
+                if(type == 'unknown') {
+                  // We special-case for unknown status checks, and never permit them
+                  return [
+                    'error', `An unknown context ${context} was found, cannot calculate build status.`
+                  ];
+                }
+                if(type == 'build') {
+                  hasBuilds = true;
+                }
+                counts[state] = counts[state] ? counts[state] + 1 : 1;
+              }
+
+              // If we do not have any statuses yet, we wait
+              if(Object.keys(filtered_statuses).length == 0 || !hasBuilds) {
+                return ['pending', 'Builds have not yet been triggered ⌛'];
+              }
+
+              const state =
+                counts.error ? 'error' :
+                counts.failed ? 'failed' :
+                counts.pending ? 'pending' :
+                'success';
+
+              let description = '';
+              function appendDescription(count, state) {
+                if(!count) return;
+                if(description != '') description += '; ';
+                description += `${count} check${count == 1 ? '' : 's'} ${state}`;
+              }
+              appendDescription(counts.error, 'in an error state ❌');
+              appendDescription(counts.failed, 'failed ❌');
+              appendDescription(counts.pending, 'pending ⌛');
+              appendDescription(counts.success, 'completed successfully ✅');
+
+              return [ state, description ];
+            }
+
+            async function getCommitStatuses(github, owner, repo, sha) {
+              const statuses = await github.paginate('GET /repos/{owner}/{repo}/commits/{sha}/statuses', {
+                owner,
+                repo,
+                sha,
+                headers: {
+                  'X-GitHub-Api-Version': '2022-11-28'
+                }
+              });
+              return statuses;
+            }
+
+            async function getCommitCheckRuns(github, owner, repo, sha) {
+              const statuses = await github.paginate('GET /repos/{owner}/{repo}/commits/{sha}/check-runs', {
+                owner,
+                repo,
+                sha,
+                headers: {
+                  'X-GitHub-Api-Version': '2022-11-28'
+                }
+              });
+              return statuses;
+            }
+
+            function calculateCheckResult(statuses) {
+              if(!Array.isArray(statuses)) {
+                return ['error', 'Failed to retrieve status checks from GitHub ❌'];
+              }
+
+              const filtered_statuses = reduceStatuses(statuses);
+
+              const result = calculateFinalStatus(filtered_statuses);
+              return result;
+            }
+
+            async function test(github, owner, repo, sha) {
+              // Get statuses from sha
+              const statuses = await getCommitStatuses(github, owner, repo, sha);
+              return calculateCheckResult(statuses);
+            }
+
+            async function createCheck(github, owner, repo, sha) {
+              const check = await github.rest.checks.create({
+                owner,
+                repo,
+                head_sha: sha,
+                name: 'Build Outcome',
+                status: 'in_progress',
+              });
+              return check.data.id;
+            }
+
+            async function updateCheck(github, owner, repo, checkRunId, status, description) {
+              const checkStatus = status == 'pending' ? 'in_progress' : 'completed';
+              const conclusion = checkStatus == 'in_progress' ? undefined : (status == 'success' ? 'success' : 'failure');
+
+              await github.rest.checks.update({
+                owner,
+                repo,
+                check_run_id: checkRunId,
+                status: checkStatus,
+                conclusion,
+                output: {
+                  title: description,
+                  summary: ''
+                }
+              });
+            }
+
+            const { owner, repo } = context.repo;
+            const sha =
+              context.payload?.check_suite?.sha ||    /* check run completed */
+              context.payload?.inputs?.commit ||      /* manual run */
+              context.payload?.after ||               /* push */
+              context.payload?.commit?.sha ||         /* status */
+              context.sha;                            /* probably 'master'! */
+
+            const checkRunId = await createCheck(github, owner, repo, sha);
+            const res = await test(github, owner, repo, sha);
+            await updateCheck(github, owner, repo, checkRunId, res[0], res[1]);
+
diff --git a/.gitignore b/.gitignore
index 6c8fbfbec8..6316adb5d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -164,7 +164,7 @@ tsconfig.tsbuildinfo
 # Windows system files
 Thumbs.db
 
-# Temporary file for logging scripts in xcode runs, see build-utils.sh for
+# Temporary file for logging scripts in xcode runs, see builder-basic.inc.sh for
 # details
 /xcodebuild-scripts.log
 
diff --git a/HISTORY.md b/HISTORY.md
index daf9a20257..6d8aecb9ed 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,229 @@
 # Keyman Version History
 
+## 19.0.99 alpha 2025-08-14
+
+* maint(web): skip unnecessary steps for `build` buildLevel (#14516)
+
+## 19.0.98 alpha 2025-08-14
+
+* maint(resources): specify `keymanapp/keyman` for gh in automerge (#14524)
+
+## 19.0.97 alpha 2025-08-14
+
+* maint(resources): use GH_TOKEN variable for gh calls (#14522)
+
+## 19.0.96 alpha 2025-08-14
+
+* maint(resources): add build-bot commands to increment-version auto PRs (#14504)
+* maint(resources): use GH builtin automerge for auto PRs (#14519)
+
+## 19.0.95 alpha 2025-08-13
+
+* fix(web): use actual legacy model for legacy-model support unit tests (#14460)
+* chore(common): Update Crowdin strings for Spanish (#14464)
+* fix(android): Get default sizes before initializing keyboard (#14472)
+* docs(resources): clarify Build-bot usage (#14282)
+* maint(resources): build.sh-style commands for build-bot (#14461)
+* chore(android): Update keycode test app dependencies (#14474)
+* maint(common): update npm modules brace-expansion to 1.1.12, form-data to 4.0.4 (#14479)
+* chore(android): Specify Java language version 21 (#14491)
+* maint(ios): skip unnecessary network steps when buildLevel is build (#14466)
+* maint(common): rename shellHelperFunctions.sh to utils.inc.sh (#14446)
+* maint(common): consolidate builder scripts (#14449)
+* maint(common): rename and move node-related script functions into node.inc.sh (#14451)
+* maint(common): move typescript script functions into typescript.inc.sh (#14452)
+* maint(common): reorganize mac/ios build script includes (#14458)
+* docs(resources): add note on builder-basic vs builder-full (#14507)
+
+## 19.0.94 alpha 2025-08-01
+
+* maint(common): use `cpp_std=c++17` in meson project default_options (#14433)
+
+## 19.0.93 alpha 2025-07-29
+
+* test(developer): add unit tests for `isValidUtf8` (#14381)
+* maint(linux): fix stopping of test server (#14403)
+
+## 19.0.92 alpha 2025-07-28
+
+* build(deps): bump multer from 2.0.1 to 2.0.2 (#14373)
+* refactor(linux): remove shellcheck warnings (#14409)
+* refactor(linux): move dbus defines to common include (#14407)
+* docs(linux): update readme for test service (#14408)
+* fix(windows): add check a fix for registry datatypes (#14358)
+
+## 19.0.91 alpha 2025-07-26
+
+* maint(windows): fix calls of renamed functions (#14413)
+
+## 19.0.90 alpha 2025-07-25
+
+* maint(common): fix standalone use of `resources/builder.inc.sh` (#14399)
+* maint(resources): use `tc_` prefix for all `tc-*.inc.sh` functions (#14267)
+
+## 19.0.89 alpha 2025-07-24
+
+* docs(common): Document minimum version of Chrome 95.0 for Android (#14385)
+* refactor(android): Update minimum target Chrome version to 95.0 and refactor to use constants (#14391)
+
+## 19.0.88 alpha 2025-07-23
+
+* maint(windows): consider `GO_FAST` env variable in `add_zip_files` (#14338)
+* maint(common): add unit tests for `locate_emscripten.inc.sh` (#14346)
+* refactor(android): create functions for actions (#14351)
+* maint(linux): fix `locate_emscripten` if `$EMSCRIPTEN_BASE` dir missing (#14347)
+* maint(android): consolidate creating zip file (#14353)
+
+## 19.0.87 alpha 2025-07-22
+
+* refactor(common): use test framework for zip tests (#14380)
+* maint(common): fix use of `jq.inc.sh` in git hooks (#14382)
+* test(common): improve zip tests (#14386)
+* maint(common): fix `add_zip_files` if flags come before zip filename (#14387)
+
+## 19.0.86 alpha 2025-07-21
+
+* maint(common): fail build if adding relative file to zip (#14352)
+* maint(common): set C++17 in standard.meson.build (#14355)
+* fix(linux): add `python3-pkg-resources` as explicit dependency (#14356)
+* docs(developer): add ansi and iso context and image, change img tags, and polish for readability (#14243)
+* maint(mac): consolidate `write-download_info` (#14325)
+* maint(common): add simple unit testing framework for bash (#14345)
+* maint(common): consolidate functions to determine OS (#14324)
+* fix(android): use correct path to zip.inc.sh for CI (#14377)
+* test(common): add unit test for reporting test failures (#14379)
+
+## 19.0.85 alpha 2025-07-18
+
+* refactor(common): remove warnings (#14368)
+* refactor(developer): replace deprecated std::codecvt_utf8_utf16 (#14369)
+* refactor(linux): move defines to common header files (#14372)
+
+## 19.0.84 alpha 2025-07-15
+
+* maint(common): add support for inline file exclusions to `add_zip_files` and unit tests (#14333)
+* maint(developer): use `add_zip_files` function (#14334)
+
+## 19.0.83 alpha 2025-07-14
+
+* maint(resources): add `build.sh` to run all `resource/build/test` tests (#14335)
+* maint(developer): consolidate creating KMC_ZIP file (#14309)
+
+## 19.0.82 alpha 2025-07-10
+
+* maint(android): fix Android release build (#14329)
+* maint(mac): fix end of blocks (#14330)
+* maint(mac): don't run `build.sh publish` twice (#14331)
+
+## 19.0.81 alpha 2025-07-09
+
+* docs(developer): explanation of the Description field added in Details section. (#14304)
+* fix(ios): restore keyboard scale map for iPad Air 2 (#14305)
+* maint(linux): remove Oracular, add Questing (#14319)
+* maint(android): remove `--ci` parameter from Android release builds (#14320)
+* maint(android): use absolute paths (#14308)
+* maint(windows): fix platform name for Windows (#14321)
+* maint(developer): include missing shellHelperFunctions.sh file (#14322)
+* maint(windows): replace hardcoded `symbols` paths with parameters (#14323)
+
+## 19.0.80 alpha 2025-07-08
+
+* maint(common): remove include of deleted `tc-download-info.inc.sh` (#14311)
+* maint(resources): fix triggering of builds (#14314)
+
+## 19.0.79 alpha 2025-07-07
+
+* maint(android): use `--release` for release builds (#14307)
+* refactor(common): some reformattings in `shellHelperFunctions.sh` (#14269)
+* maint(common): consolidate `write_download_info` functions (#14270)
+
+## 19.0.78 alpha 2025-07-04
+
+* docs(developer): Fix links in gestures guide (#14297)
+
+## 19.0.77 alpha 2025-07-04
+
+* maint(mac): rename `_do_publish` function to `do_publish` to fix release build (#14273)
+* maint(ios): remove extra `cd` command from ios release builds (#14272)
+* maint(android): remove `--ci` parameter from android builds (#14264)
+* refactor(resources): replace shebang for TC include files (#14265)
+* fix(core): fix failing `common-test-core.sh` script (#14271)
+* maint(common): match OSTYPE correctly on macOS (#14277)
+* fix(common): fix triggering builds if no builds to start (#14274)
+* maint(common): trigger common builds for resources/teamcity/common changes (#14279)
+
+## 19.0.76 alpha 2025-07-03
+
+* maint(common): move TC configuration for common tests (#14205)
+* refactor(common): improve downloads include script (#14253)
+* maint(web): move rsync code to shared functions (#14254)
+* maint(developer): replace Powershell scripts (#14255)
+* maint(windows): move TC configuration for Keyman Windows to scripts (#14186)
+* feat(windows): human text message for 413 error (#14055)
+* refactor(web): move helper functions to beginning of function (#14252)
+* maint(android): add TC build scripts for Keyman for Android (#14222)
+* maint(linux): use `tc_rsync_upload` and `write_download_info` functions (#14258)
+* maint(ios): add TC build scripts for iOS (#14229)
+* maint(mac): add TC build scripts for macOS (#14239)
+
+## 19.0.75 alpha 2025-07-02
+
+* feat(resources): support ignoring unknown options in builder (#14216)
+* maint(common): consolidate 7Z_HOME, SEVENZ_HOME, SEVEN_Z_HOME env vars (#14162)
+
+## 19.0.74 alpha 2025-07-01
+
+* maint(web): adjust rsync path (#14249)
+
+## 19.0.73 alpha 2025-07-01
+
+* fix(web): deploy `web/build/publish` folder (#14237)
+* fix(web): change env variable name (#14244)
+
+## 19.0.72 alpha 2025-07-01
+
+* maint(web): cleanup rsync call from bash for Windows agents and refactor (#14236)
+
+## 19.0.71 alpha 2025-06-30
+
+* refactor(linux): rename linux agent specific functions (#14231)
+
+## 19.0.70 alpha 2025-06-27
+
+* docs(developer): Add details on Template choices (#14228)
+* chore(common,developer): expand 'x' to 'compileContext' (#14218)
+
+## 19.0.69 alpha 2025-06-25
+
+* maint(resources): support additional workflow events for pr-build-status (#14219)
+* chore: add tips and caution of gestures for Keyman Developer + update license + removal of span tag (#14204)
+
+## 19.0.68 alpha 2025-06-24
+
+* maint(resources): Build-bot now available to control test builds (#14125)
+* maint(developer): support buildLevel (#14196)
+* fix(resources): allow branch names in run-required-test-builds shortcut call (#14217)
+* maint(resources): add pr-build-status GitHub Action to summarize build status (#14199)
+
+## 19.0.67 alpha 2025-06-22
+
+* chore(developer): ldml: additional line numbers (#14104)
+
+## 19.0.66 alpha 2025-06-16
+
+* fix(windows): add values wucUpdateAvailable and wucNotChecked to TRemoteUpdateCheckResult  enum (#14123)
+
+## 19.0.65 alpha 2025-06-13
+
+* maint(developer): fix developer release build (#14185)
+* maint(developer,web): use double quotes inside `--rsync-path` again (#14194)
+
+## 19.0.64 alpha 2025-06-13
+
+* fix(windows): fix download failing when cache.json missing (#14095)
+* maint(resources): only automatically merge keyman-server PRs with automerge label (#14171)
+* maint(developer,web): use braces for variables in powershell scripts (#14184)
+
 ## 19.0.63 alpha 2025-06-12
 
 * maint(web): add some more arguments for web release build script (#14167)
diff --git a/VERSION.md b/VERSION.md
index efcfb4b252..a053bc0ccb 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.64
\ No newline at end of file
+19.0.100
\ No newline at end of file
diff --git a/android/KMAPro/build.sh b/android/KMAPro/build.sh
index fd54215d1c..525b951138 100755
--- a/android/KMAPro/build.sh
+++ b/android/KMAPro/build.sh
@@ -3,10 +3,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-help.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
diff --git a/android/KMAPro/kMAPro/build.gradle b/android/KMAPro/kMAPro/build.gradle
index 864fb36ee9..705fb17a1c 100644
--- a/android/KMAPro/kMAPro/build.gradle
+++ b/android/KMAPro/kMAPro/build.gradle
@@ -11,6 +11,12 @@ apply from: "$rootPath/version.gradle"
 
 String tier = new File('../../TIER.md').getText('UTF-8').trim();
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 android {
     compileSdk 34
     namespace="com.tavultesoft.kmapro"
@@ -24,11 +30,6 @@ android {
         buildConfig = true
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
-    }
-
     defaultConfig {
         applicationId "com.tavultesoft.kmapro"
         minSdkVersion 21
diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
index 3eec444fbd..40b41b6176 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
@@ -864,6 +864,9 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
 
   private void displayUpdateChrome() {
     // TextView's default string is to update Chrome
+    TextView textView = (TextView)findViewById(R.id.kmWebViewChromeTextView);
+    textView.setText(String.format(getString(R.string.text_require_chrome_version),
+      WebViewUtils.KEYMAN_MIN_TARGET_VERSION_ANDROID_CHROME));
 
     Button button = (Button)findViewById(R.id.webViewChromeButton);
     button.setText(getString(R.string.button_update_chrome));
diff --git a/android/KMAPro/kMAPro/src/main/res/layout/check_chrome_webview_layout.xml b/android/KMAPro/kMAPro/src/main/res/layout/check_chrome_webview_layout.xml
index 09716bdd8a..ea5a9220d5 100644
--- a/android/KMAPro/kMAPro/src/main/res/layout/check_chrome_webview_layout.xml
+++ b/android/KMAPro/kMAPro/src/main/res/layout/check_chrome_webview_layout.xml
@@ -15,7 +15,7 @@
     android:background="@android:color/white"
     android:gravity="start"
     android:layout_gravity="center_vertical"
-    android:text="@string/text_require_chrome_57"
+    android:text="@string/text_require_chrome_version"
     android:layout_marginStart="@dimen/button_playstore_margin"
     android:textSize="@dimen/update_chrome_label_textsize" />
 
diff --git a/android/KMAPro/kMAPro/src/main/res/values/strings.xml b/android/KMAPro/kMAPro/src/main/res/values/strings.xml
index a0447d0f89..32cdf07f1a 100644
--- a/android/KMAPro/kMAPro/src/main/res/values/strings.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values/strings.xml
@@ -30,10 +30,13 @@
   <!-- Context: Title -->
   <string name="title_version" comment="Title of Keyman for Android version">Version: %1$s</string>
 
-  <!-- Context: Text label when old Chrome version installed -->
+  <!-- Context: Text label when old Chrome version installed. Label replaced in Keyman 19.0 -->
   <string name="text_require_chrome_57" comment="Banner text when old version of Chrome is installed">
     Keyman requires Chrome version 57 or newer.</string>
 
+  <string name="text_require_chrome_version" comment="Banner text when old version of Chrome is installed">
+    Keyman requires Chrome version %1$s or newer.</string>
+
   <!-- Context: Button label -->
   <string name="button_update_chrome" comment="Prompt to upgrade Chrome in the Play Store">Update Chrome</string>
 
diff --git a/android/KMEA/app/build.gradle b/android/KMEA/app/build.gradle
index dd4251025b..da7191ad5c 100644
--- a/android/KMEA/app/build.gradle
+++ b/android/KMEA/app/build.gradle
@@ -12,6 +12,12 @@ base {
     archivesName = "keyman-engine"
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 android {
     compileSdk 34
     namespace "com.keyman.engine"
@@ -21,11 +27,6 @@ android {
         buildConfig = true
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
-    }
-
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 34
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
index 75b0443537..5553d256b0 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMManager.java
@@ -495,6 +495,11 @@ public final class KMManager {
       didCopyAssets = true;
     }
 
+    calculateDefaultKeyboardHeights(context);
+    SharedPreferences prefs = context.getSharedPreferences(KMManager.KMEngine_PrefsKey, Context.MODE_PRIVATE);
+    KeyboardHeight_Context_Portrait_Current = prefs.getInt(KMManager.KMKey_KeyboardHeightPortrait, KMManager.KeyboardHeight_Context_Portrait_Default);
+    KeyboardHeight_Context_Landscape_Current = prefs.getInt(KMManager.KMKey_KeyboardHeightLandscape, KMManager.KeyboardHeight_Context_Landscape_Default);
+
     if (keyboardType == KeyboardType.KEYBOARD_TYPE_UNDEFINED) {
       String msg = "Cannot initialize: Invalid keyboard type";
       KMLog.LogError(TAG, msg);
@@ -508,12 +513,6 @@ public final class KMManager {
     migrateCloudKeyboards(appContext);
 
     CloudDownloadMgr.getInstance().initialize(appContext);
-
-    calculateDefaultKeyboardHeights(context);
-    SharedPreferences prefs = context.getSharedPreferences(KMManager.KMEngine_PrefsKey, Context.MODE_PRIVATE);
-    KeyboardHeight_Context_Portrait_Current = prefs.getInt(KMManager.KMKey_KeyboardHeightPortrait, KMManager.KeyboardHeight_Context_Portrait_Default);
-    KeyboardHeight_Context_Landscape_Current = prefs.getInt(KMManager.KMKey_KeyboardHeightLandscape, KMManager.KeyboardHeight_Context_Landscape_Default);
-
   }
 
   public static void executeResourceUpdate(Context aContext)
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/util/WebViewUtils.java b/android/KMEA/app/src/main/java/com/keyman/engine/util/WebViewUtils.java
index de8b37f73e..0586ecbcc8 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/util/WebViewUtils.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/util/WebViewUtils.java
@@ -32,6 +32,13 @@ public final class WebViewUtils {
     FULL;          // WebView installed and enabled
   }
 
+  // Min version of Chrome for Keyman for Android for EngineWebViewVersionStatus.DEGRADED
+  public static final String KEYMAN_MIN_TARGET_VERSION_DEGRADED_ANDROID_CHROME = "37.0";
+
+  // Min version of Chrome for Keyman for Android (EngineWebViewVersionStatus.FULL)
+  // TODO: Keep this version in sync with resources/build/minimum-versions.inc.sh
+  public static final String KEYMAN_MIN_TARGET_VERSION_ANDROID_CHROME = "95.0";
+
   private static final String CHROME_INSTALL_PATTERN_FORMATSTR = "^.*Chrome/([\\d.]+).*$";
   private static final Pattern installPattern = Pattern.compile(CHROME_INSTALL_PATTERN_FORMATSTR);
 
@@ -52,9 +59,11 @@ public final class WebViewUtils {
       chromeVersion = getChromeVersion(context, webView);
     }
 
-    if (FileUtils.compareVersions("37.0", chromeVersion) == FileUtils.VERSION_GREATER) {
+    if (FileUtils.compareVersions(KEYMAN_MIN_TARGET_VERSION_DEGRADED_ANDROID_CHROME, chromeVersion)
+        == FileUtils.VERSION_GREATER) {
       return EngineWebViewVersionStatus.DISABLED;
-    } else if (FileUtils.compareVersions("57.0", chromeVersion) == FileUtils.VERSION_GREATER) {
+    } else if (FileUtils.compareVersions(KEYMAN_MIN_TARGET_VERSION_ANDROID_CHROME, chromeVersion)
+        == FileUtils.VERSION_GREATER) {
       return EngineWebViewVersionStatus.DEGRADED;
     }
 
diff --git a/android/KMEA/app/src/main/res/values-es-rES/strings.xml b/android/KMEA/app/src/main/res/values-es-rES/strings.xml
index 0ab0ea317b..4846da0dac 100644
--- a/android/KMEA/app/src/main/res/values-es-rES/strings.xml
+++ b/android/KMEA/app/src/main/res/values-es-rES/strings.xml
@@ -83,13 +83,13 @@
     <!-- Context: Fatal keyboard error.  -->
     <string name="fatal_keyboard_error_short" comment="Error in keyboard (keyboard ID::packageID for language).">      Error en el teclado %1$s:%2$s para %3$s idioma.</string>
     <!-- Context: Alert Dialog body: System WebView not installed -->
-    <string name="body_install_webview" comment="Notification when WebView not installed">        Keyman requires WebView to be installed.\"</string>
+    <string name="body_install_webview" comment="Notification when WebView not installed">        Keyman requiere que WebView esté instalado.\"</string>
     <!-- Context: Alert Dialog body: System WebView installed but not enabled -->
-    <string name="body_enable_webview" comment="Notification when WebView installed but not enabled">        Keyman requires WebView to be enabled.\"</string>
+    <string name="body_enable_webview" comment="Notification when WebView installed but not enabled">        Keyman requiere que WebView esté habilitado.\"</string>
     <!-- Context Button label: Install WebView -->
-    <string name="label_install_webview" comment="Button label to install webview">Install WebView</string>
+    <string name="label_install_webview" comment="Button label to install webview">Instalar WebView</string>
     <!-- Context Button label: Enable WebView -->
-    <string name="label_enable_webview" comment="Button label to enable webview">Enable WebView</string>
+    <string name="label_enable_webview" comment="Button label to enable webview">Habilitar WebView</string>
     <!-- Context: Query for associated dictionary -->
     <string name="query_associated_model" comment="Check if there's an available dictionary to download">Comprobando si hay un diccionario asociado para descargar</string>
     <string name="cannot_query_associated_model" comment="Cannot reach server to check if there's an available dictionary to download">      No se puede conectar al servidor Keyman para comprobar si hay un diccionario asociado para descargar</string>
@@ -124,7 +124,7 @@
     <!-- Context: General Updates -->
     <string name="update_check_unavailable" comment="Error message when a Keyman server can't be reached">¡Falló al acceder al servidor!</string>
     <!-- Context:  Update-check failure notification -->
-    <string name="update_check_download_manager_disabled" comment="Notification that a system service needed for updates is disabled">DownloadManager disabled - cannot check for updates</string>
+    <string name="update_check_download_manager_disabled" comment="Notification that a system service needed for updates is disabled">Descargador deshabilitado: no se pueden comprobar actualizaciones</string>
     <!-- Context: General Updates -->
     <string name="update_check_current" comment="Notification that all resources are up to date">"¡Todos los recursos están actualizados!"</string>
     <!-- Context: General Updates -->
diff --git a/android/KMEA/app/src/test/java/com/keyman/engine/util/WebViewUtilsTest.java b/android/KMEA/app/src/test/java/com/keyman/engine/util/WebViewUtilsTest.java
index 344b01879a..342934200a 100644
--- a/android/KMEA/app/src/test/java/com/keyman/engine/util/WebViewUtilsTest.java
+++ b/android/KMEA/app/src/test/java/com/keyman/engine/util/WebViewUtilsTest.java
@@ -32,28 +32,30 @@ public class WebViewUtilsTest {
 
   @Test
   public void test_Chrome36_EngineWebViewVersionStatusDisabled() {
-    String chromeVersion = "36.0";
+    double chromeVersionFloat = Float.parseFloat(WebViewUtils.KEYMAN_MIN_TARGET_VERSION_DEGRADED_ANDROID_CHROME) - 1.0;
+    String chromeVersion = String.valueOf(chromeVersionFloat);
     Assert.assertEquals(WebViewUtils.getEngineWebViewVersionStatus(context, null, chromeVersion),
       WebViewUtils.EngineWebViewVersionStatus.DISABLED);
   }
 
   @Test
   public void test_Chrome37_EngineWebViewVersionStatusDegraded() {
-    String chromeVersion = "37.0";
+    String chromeVersion = WebViewUtils.KEYMAN_MIN_TARGET_VERSION_DEGRADED_ANDROID_CHROME;
     Assert.assertEquals(WebViewUtils.getEngineWebViewVersionStatus(context, null, chromeVersion),
       WebViewUtils.EngineWebViewVersionStatus.DEGRADED);
   }
 
   @Test
-  public void test_Chrome56_EngineWebViewVersionStatusDegraded() {
-    String chromeVersion = "56.0";
+  public void test_Chrome94_EngineWebViewVersionStatusDegraded() {
+    double chromeVersionFloat = Float.parseFloat(WebViewUtils.KEYMAN_MIN_TARGET_VERSION_ANDROID_CHROME) - 1.0;
+    String chromeVersion = String.valueOf(chromeVersionFloat);
     Assert.assertEquals(WebViewUtils.getEngineWebViewVersionStatus(context, null, chromeVersion),
       WebViewUtils.EngineWebViewVersionStatus.DEGRADED);
   }
 
   @Test
-  public void test_Chrome57_EngineWebViewVersionStatusFull() {
-    String chromeVersion = "57.0";
+  public void test_Chrome95_EngineWebViewVersionStatusFull() {
+    String chromeVersion = WebViewUtils.KEYMAN_MIN_TARGET_VERSION_ANDROID_CHROME;
     Assert.assertEquals(WebViewUtils.getEngineWebViewVersionStatus(context, null, chromeVersion),
       WebViewUtils.EngineWebViewVersionStatus.FULL);
   }
diff --git a/android/KMEA/build.sh b/android/KMEA/build.sh
index 4d4ea7f8e3..9b6d0d4892 100755
--- a/android/KMEA/build.sh
+++ b/android/KMEA/build.sh
@@ -4,10 +4,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 # ################################ Main script ################################
diff --git a/android/Samples/KMSample1/app/build.gradle b/android/Samples/KMSample1/app/build.gradle
index cc92dee298..025dd366f0 100644
--- a/android/Samples/KMSample1/app/build.gradle
+++ b/android/Samples/KMSample1/app/build.gradle
@@ -2,6 +2,12 @@ plugins {
     id 'com.android.application'
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 android {
     compileSdk 34
     namespace="com.keyman.kmsample1"
diff --git a/android/Samples/KMSample1/build.sh b/android/Samples/KMSample1/build.sh
index 172ef6c5e7..65e5619815 100755
--- a/android/Samples/KMSample1/build.sh
+++ b/android/Samples/KMSample1/build.sh
@@ -4,10 +4,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 ################################ Main script ################################
@@ -23,7 +23,7 @@ builder_describe "Build KMSample1 app for Android." \
   "configure" \
   "build" \
   "test" \
-  ":app                   KMSample1" 
+  ":app                   KMSample1"
 
 # parse before describe_outputs to check debug flags
 builder_parse "$@"
diff --git a/android/Samples/KMSample2/app/build.gradle b/android/Samples/KMSample2/app/build.gradle
index cd2f4d6225..472a70a1b4 100644
--- a/android/Samples/KMSample2/app/build.gradle
+++ b/android/Samples/KMSample2/app/build.gradle
@@ -2,6 +2,12 @@ plugins {
     id 'com.android.application'
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 android {
     compileSdk 34
     namespace="com.keyman.kmsample2"
diff --git a/android/Samples/KMSample2/build.sh b/android/Samples/KMSample2/build.sh
index 2f7a99c764..08c5261778 100755
--- a/android/Samples/KMSample2/build.sh
+++ b/android/Samples/KMSample2/build.sh
@@ -4,10 +4,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 ################################ Main script ################################
@@ -23,7 +23,7 @@ builder_describe "Build KMSample2 app for Android." \
   "configure" \
   "build" \
   "test" \
-  ":app                   KMSample2" 
+  ":app                   KMSample2"
 
 # parse before describe_outputs to check debug flags
 builder_parse "$@"
diff --git a/android/Tests/KeyboardHarness/app/build.gradle b/android/Tests/KeyboardHarness/app/build.gradle
index ab8066393b..6b28b62d9c 100644
--- a/android/Tests/KeyboardHarness/app/build.gradle
+++ b/android/Tests/KeyboardHarness/app/build.gradle
@@ -5,8 +5,14 @@ plugins {
 ext.rootPath = '../../../'
 apply from: "$rootPath/version.gradle"
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 android {
-    compileSdk 34
+    compileSdk 35
     namespace="com.keyman.android.tests.keyboardHarness"
 
     // Don't compress kmp files so they can be copied via AssetManager
@@ -21,7 +27,7 @@ android {
     defaultConfig {
         applicationId "com.keyman.android.tests.keyboardHarness"
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
 
         // KEYMAN_VERSION_CODE and KEYMAN_VERSION_NAME from version.gradle
         versionCode KEYMAN_VERSION_CODE as Integer
diff --git a/android/Tests/KeyboardHarness/build.gradle b/android/Tests/KeyboardHarness/build.gradle
index 8fdf2aa422..966127346a 100644
--- a/android/Tests/KeyboardHarness/build.gradle
+++ b/android/Tests/KeyboardHarness/build.gradle
@@ -15,8 +15,8 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url uri("${projectDir}/libs") }
         google()
-        jcenter()
         mavenCentral()
     }
 }
diff --git a/android/Tests/KeyboardHarness/build.sh b/android/Tests/KeyboardHarness/build.sh
index c23f8ca0f5..66f2b0496e 100755
--- a/android/Tests/KeyboardHarness/build.sh
+++ b/android/Tests/KeyboardHarness/build.sh
@@ -4,10 +4,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 ################################ Main script ################################
@@ -23,7 +23,7 @@ builder_describe "Build KeyboardHarness test app for Android." \
   "configure" \
   "build" \
   "test" \
-  ":app                   KeyboardHarness" 
+  ":app                   KeyboardHarness"
 
 # parse before describe outputs to check debug flags
 builder_parse "$@"
diff --git a/android/Tests/keycode/app/build.gradle b/android/Tests/keycode/app/build.gradle
index a0b24abb44..2f828db571 100644
--- a/android/Tests/keycode/app/build.gradle
+++ b/android/Tests/keycode/app/build.gradle
@@ -1,11 +1,18 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+}
 
 ext.rootPath = '../../../'
 apply from: "$rootPath/version.gradle"
 
 android {
     compileSdk 34
-    namespace="com.keyman.android.tests.keycode"
+    namespace "com.keyman.android.tests.keycode"
+
+    buildFeatures {
+        // needed for custom BuildConfigField values in defaultConfig
+        buildConfig = true
+    }
 
     defaultConfig {
         applicationId "com.keyman.android.tests.keycode"
@@ -27,11 +34,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'com.google.android.material:material:1.12.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-
-    testImplementation 'androidx.test:core:1.5.0'
-    testImplementation 'androidx.test.ext:junit:1.1.5'
-    testImplementation 'org.robolectric:robolectric:4.10.3'
+    testImplementation 'androidx.test.ext:junit:1.2.1'
+    testImplementation 'org.robolectric:robolectric:4.14.1'
+    testImplementation 'androidx.test:core:1.6.1'
 }
diff --git a/android/Tests/keycode/app/src/androidTest/java/com/keyman/android/tests/keycode/ExampleInstrumentedTest.java b/android/Tests/keycode/app/src/test/java/com/keyman/android/tests/keycode/ExampleInstrumentedTest.java
similarity index 72%
rename from android/Tests/keycode/app/src/androidTest/java/com/keyman/android/tests/keycode/ExampleInstrumentedTest.java
rename to android/Tests/keycode/app/src/test/java/com/keyman/android/tests/keycode/ExampleInstrumentedTest.java
index d4bbda1b05..cf2b42ce88 100644
--- a/android/Tests/keycode/app/src/androidTest/java/com/keyman/android/tests/keycode/ExampleInstrumentedTest.java
+++ b/android/Tests/keycode/app/src/test/java/com/keyman/android/tests/keycode/ExampleInstrumentedTest.java
@@ -1,25 +1,25 @@
 package com.keyman.android.tests.keycode;
 
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.core.app.ApplicationProvider;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import android.content.Context;
 
 import static org.junit.Assert.*;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 
 /**
  * Instrumented test, which will execute on an Android device.
  *
  * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
  */
-@RunWith(AndroidJUnit4.class)
+@RunWith(RobolectricTestRunner.class)
 public class ExampleInstrumentedTest {
   @Test
   public void useAppContext() {
     // Context of the app under test.
-    Context appContext = InstrumentationRegistry.getTargetContext();
+    Context appContext = ApplicationProvider.getApplicationContext();
 
     assertEquals("com.keyman.android.tests.keycode", appContext.getPackageName());
   }
diff --git a/android/Tests/keycode/app/src/test/java/com/keyman/android/tests/keycode/ExampleUnitTest.java b/android/Tests/keycode/app/src/test/java/com/keyman/android/tests/keycode/ExampleUnitTest.java
index 7e0e3c7481..544b21224c 100644
--- a/android/Tests/keycode/app/src/test/java/com/keyman/android/tests/keycode/ExampleUnitTest.java
+++ b/android/Tests/keycode/app/src/test/java/com/keyman/android/tests/keycode/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.example.darcy.keycode;
+package com.keyman.android.tests.keycode;
 
 import org.junit.Test;
 
diff --git a/android/Tests/keycode/build.gradle b/android/Tests/keycode/build.gradle
index 47a85343bf..3a7f319289 100644
--- a/android/Tests/keycode/build.gradle
+++ b/android/Tests/keycode/build.gradle
@@ -4,10 +4,10 @@ buildscript {
     
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.9.2'
         
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -18,10 +18,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
diff --git a/android/Tests/keycode/gradle.properties b/android/Tests/keycode/gradle.properties
index 7d43aa3719..44ff6135fe 100644
--- a/android/Tests/keycode/gradle.properties
+++ b/android/Tests/keycode/gradle.properties
@@ -14,4 +14,6 @@ org.gradle.jvmargs=-Xmx1024m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
+# AGP 8.0 generates R classes for resources defined in the current module only.
+android.nonTransitiveRClass=false
 
diff --git a/android/build.sh b/android/build.sh
index 12017e2c6b..e00c99e634 100755
--- a/android/build.sh
+++ b/android/build.sh
@@ -10,12 +10,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
-. "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
-. "$KEYMAN_ROOT/resources/build/zip.inc.sh"
+# shellcheck disable=SC2154
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "${KEYMAN_ROOT}/resources/build/build-utils-ci.inc.sh"
+. "${KEYMAN_ROOT}/resources/build/zip.inc.sh"
 
 ################################ Main script ################################
 
@@ -24,8 +25,8 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 #
 
 oemtargets=()
-if [ ! -z "${RELEASE_OEM+x}" ]; then
-  if [ "${RELEASE_OEM_FIRSTVOICES-false}" = true ]; then
+if [[ ! -z "${RELEASE_OEM+x}" ]]; then
+  if [[ "${RELEASE_OEM_FIRSTVOICES-false}" = true ]]; then
     oemtargets+=(":fv=../oem/firstvoices/android           OEM FirstVoices for Android app")
   fi
 fi
@@ -38,8 +39,7 @@ builder_describe \
   build \
   test \
   "publish                                  Publishes symbols to Sentry and the APKs to the Play Store." \
-  "archive                                  Copy release artifacts to upload/ and rsync to downloads.keyman" \
-  "--ci+                                    Deprecated build option. Remove in 20.0" \
+  "archive                                  Copy release artifacts to upload/ and create zip" \
   --upload-sentry+ \
   ":engine=KMEA                             Keyman Engine for Android" \
   ":app=KMAPro                              Keyman for Android" \
@@ -51,72 +51,85 @@ builder_describe \
 
 builder_parse "$@"
 
-# Override JAVA_HOME to OpenJDK 11
-set_java_home
-
-# This script also responsible for cleaning up /android/upload
-builder_run_child_actions clean
-
-if builder_start_action clean; then
+function do_clean() {
   builder_heading "Cleanup /android/upload"
-  rm -rf "$KEYMAN_ROOT/android/upload"
-  builder_finish_action success clean
-fi
-
-builder_run_child_actions configure build test
-
-function do_test_help() {
-  check-markdown  "$KEYMAN_ROOT/android/docs/help"
-  check-markdown  "$KEYMAN_ROOT/android/docs/engine"
+  rm -rf "${KEYMAN_ROOT}/android/upload"
 }
 
-builder_run_action        test:help    do_test_help
+function do_test_help() {
+  check-markdown  "${KEYMAN_ROOT}/android/docs/help"
+  check-markdown  "${KEYMAN_ROOT}/android/docs/engine"
+}
 
-builder_run_child_actions publish
+function archive_artifacts() {
+  local UPLOAD_PATH KEYMAN_ENGINE_ANDROID_ZIP KEYMAN_APK FIRSTVOICES_APK
 
-# Copy release artifacts to upload/ and rsync to downloads.keyman.com
-if builder_start_action archive; then
-  UPLOAD_PATH="$KEYMAN_ROOT/android/upload/${KEYMAN_VERSION}"
+  UPLOAD_PATH="${KEYMAN_ROOT}/android/upload/${KEYMAN_VERSION}"
   KEYMAN_ENGINE_ANDROID_ZIP="keyman-engine-android-${KEYMAN_VERSION}.zip"
   KEYMAN_APK="keyman-${KEYMAN_VERSION}.apk"
   FIRSTVOICES_APK="firstvoices-${KEYMAN_VERSION}.apk"
-  ZIP_FILE="${UPLOAD_PATH}/${KEYMAN_ENGINE_ANDROID_ZIP}"
-  ZIP_FLAGS=("-q" "-r") # quiet, recursive
 
+  rm -rf "${UPLOAD_PATH}"
   mkdir -p "${UPLOAD_PATH}"
 
   # Create Keyman Engine for Android archive
-  builder_echo "Copying Keyman Engine for Android into ${UPLOAD_PATH}..."
-  cd "${UPLOAD_PATH}"
-  cp "${KEYMAN_ROOT}/android/KMAPro/kMAPro/libs/keyman-engine.aar" ./
-  add_zip_files "${ZIP_FILE}" "${ZIP_FLAGS[@]}" "keyman-engine.aar"
-  rm -f "keyman-engine.aar"
+  builder_echo "Adding Keyman Engine for Android to zip..."
+  (
+    # shellcheck disable=SC2164
+    cd "${KEYMAN_ROOT}/android/KMAPro/kMAPro/libs"
+    add_zip_files -q -r "${UPLOAD_PATH}/${KEYMAN_ENGINE_ANDROID_ZIP}" keyman-engine.aar
+  )
 
-  builder_echo "Copying Keyman Engine for Android Sample projects into ${UPLOAD_PATH}..."
-  cp -rf "${KEYMAN_ROOT}/android/Samples" ./
-  add_zip_files "${ZIP_FILE}" "-x@../../zip-excludes" "${ZIP_FLAGS[@]}" "Samples"
-  rm -rf "Samples"
+  builder_echo "Adding Keyman Engine for Android Sample projects to zip..."
+  (
+    # shellcheck disable=SC2164
+    cd "${KEYMAN_ROOT}/android"
+    add_zip_files -q -r -xr!build.sh "${UPLOAD_PATH}/${KEYMAN_ENGINE_ANDROID_ZIP}" Samples
+  )
 
   # Copy release APK
-  cp "${KEYMAN_ROOT}/android/KMAPro/kMAPro/build/outputs/apk/release/${KEYMAN_APK}" ./
+  cp "${KEYMAN_ROOT}/android/KMAPro/kMAPro/build/outputs/apk/release/${KEYMAN_APK}" "${UPLOAD_PATH}"
 
   # FirstVoices app
 
-  if [ "${RELEASE_OEM_FIRSTVOICES-false}" = true ]; then
-    cp "${KEYMAN_ROOT}/oem/firstvoices/android/app/build/outputs/apk/release/${FIRSTVOICES_APK}" ./
+  if [[ "${RELEASE_OEM_FIRSTVOICES-false}" = true ]]; then
+    cp "${KEYMAN_ROOT}/oem/firstvoices/android/app/build/outputs/apk/release/${FIRSTVOICES_APK}" "${UPLOAD_PATH}"
   fi
 
   #
   # Write download info files
   #
 
-  cd "${UPLOAD_PATH}"
-  write_download_info "Keyman Engine for Android" "${KEYMAN_ENGINE_ANDROID_ZIP}" "${KEYMAN_VERSION}" "${KEYMAN_TIER}" "android"
-  write_download_info "Keyman for Android" "${KEYMAN_APK}" "${KEYMAN_VERSION}" "${KEYMAN_TIER}" "android"
+  write_download_info "${UPLOAD_PATH}" "${KEYMAN_ENGINE_ANDROID_ZIP}" "Keyman Engine for Android" zip android
+  write_download_info "${UPLOAD_PATH}" "${KEYMAN_APK}" "Keyman for Android" apk android
 
-  if [ "${RELEASE_OEM_FIRSTVOICES-false}" = true ]; then
-    write_download_info "FirstVoices Keyboards" "${FIRSTVOICES_APK}" "${KEYMAN_VERSION}" "${KEYMAN_TIER}" "android"
+  if [[ "${RELEASE_OEM_FIRSTVOICES-false}" = true ]]; then
+    write_download_info "${UPLOAD_PATH}" "${FIRSTVOICES_APK}" "FirstVoices Keyboards" apk android
   fi
+}
 
-  builder_finish_action success archive
-fi
+
+# For CI compatibility of building Keyman for Android 18.0 with OpenJDK 11,
+# this overrides JAVA_HOME for the builder script to use OpenJDK 21.
+android_set_java_home() {
+  if [[ ! -z ${JAVA_HOME_21+x} ]]; then
+    builder_echo "Setting JAVA_HOME to JAVA_HOME_21 (${JAVA_HOME_21})"
+    export JAVA_HOME="${JAVA_HOME_21}"
+  fi
+}
+
+# Override JAVA_HOME
+android_set_java_home
+
+# This script also responsible for cleaning up /android/upload
+builder_run_child_actions clean
+
+builder_run_action        clean     do_clean
+
+builder_run_child_actions configure build test
+
+builder_run_action        test:help  do_test_help
+
+builder_run_child_actions publish
+
+builder_run_action        archive    archive_artifacts
diff --git a/android/docs/help/about/system-requirements.md b/android/docs/help/about/system-requirements.md
index 16efbf28af..ae43794793 100644
--- a/android/docs/help/about/system-requirements.md
+++ b/android/docs/help/about/system-requirements.md
@@ -9,7 +9,7 @@ Keyman for Android will run on Android phones and tablets that have a minimum ve
 [Android 5.0 (Lollipop)](https://developer.android.com/about/versions/lollipop).
 
 ### Minimum Chrome Version
-Keyman for Android requires a minimum version 53.0 of [Google
+Keyman for Android requires a minimum version 95.0 of [Google
 Chrome](https://play.google.com/store/apps/details?id=com.android.chrome).
 If you have an older device, you may need to upgrade Chrome before you can use
 Keyman, e.g. through the Play Store.
diff --git a/android/utility/i18n-check-unused-strings.sh b/android/utility/i18n-check-unused-strings.sh
index 062ff8cff4..9e3a0a21c3 100755
--- a/android/utility/i18n-check-unused-strings.sh
+++ b/android/utility/i18n-check-unused-strings.sh
@@ -25,7 +25,7 @@ set -u # die on undefined variables
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # Preparation
diff --git a/build.sh b/build.sh
index a455d3307f..2589a162b1 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman -- all projects" \
diff --git a/common/build.sh b/common/build.sh
index 5119bca8ac..a066cf15d3 100755
--- a/common/build.sh
+++ b/common/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman common and resources modules" \
diff --git a/common/include/build.sh b/common/include/build.sh
index 9115bd661a..962d13d5c7 100755
--- a/common/include/build.sh
+++ b/common/include/build.sh
@@ -5,7 +5,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Build keymanversion_build.h" configure build clean
diff --git a/common/linux/build.sh b/common/linux/build.sh
index 756826cc2d..2df05e03ba 100755
--- a/common/linux/build.sh
+++ b/common/linux/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 #
@@ -18,7 +18,7 @@ builder_describe "Keyman common Linux modules" \
 
 builder_parse "$@"
 
-if [[ $BUILDER_OS != linux ]]; then
+if ! builder_is_linux; then
   builder_echo grey "Platform is not linux; skipping common/linux"
   exit 0
 fi
diff --git a/common/mac/build.sh b/common/mac/build.sh
index 392966d84c..1acf2f3ccd 100755
--- a/common/mac/build.sh
+++ b/common/mac/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 #
@@ -18,7 +18,7 @@ builder_describe "Keyman common mac modules" \
 
 builder_parse "$@"
 
-if [[ $BUILDER_OS != mac ]]; then
+if ! builder_is_macos; then
   builder_echo grey "Platform is not macOS; skipping common/mac"
   exit 0
 fi
diff --git a/common/test/keyboards/baseline/build.sh b/common/test/keyboards/baseline/build.sh
index 065e2593c5..1428b5e0c4 100755
--- a/common/test/keyboards/baseline/build.sh
+++ b/common/test/keyboards/baseline/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Baseline keyboards tests -- built with 16.0 compiler" \
diff --git a/common/test/keyboards/build.sh b/common/test/keyboards/build.sh
index 2d6a986b87..489bf17543 100755
--- a/common/test/keyboards/build.sh
+++ b/common/test/keyboards/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/zip.inc.sh"
diff --git a/common/test/keyboards/issue/6254-invalid-version-99/build.sh b/common/test/keyboards/issue/6254-invalid-version-99/build.sh
index 7bf37f54e4..80c5e575e6 100755
--- a/common/test/keyboards/issue/6254-invalid-version-99/build.sh
+++ b/common/test/keyboards/issue/6254-invalid-version-99/build.sh
@@ -3,8 +3,8 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/build-utils.sh"
-# . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-basic.inc.sh"
+# . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 THIS_DIR="$(dirname "$THIS_SCRIPT")"
 
diff --git a/common/test/resources/model-helpers.mjs b/common/test/resources/model-helpers.mjs
index a3f141cd54..6ea3620c9d 100644
--- a/common/test/resources/model-helpers.mjs
+++ b/common/test/resources/model-helpers.mjs
@@ -19,7 +19,9 @@ import { fileURLToPath } from 'url';
 /**
  * Creates a MessageEvent (for inter-worker communication), with the given data payload.
  *
- * @param {*} data
+ * @template {T}
+ * @param {T} data
+ * @returns {T}
  */
 export function createMessageEventWithData(data) {
   return { data };
diff --git a/common/test/resources/test_kill_browserstack.sh b/common/test/resources/test_kill_browserstack.sh
index 82e40f85cd..cbca52da45 100755
--- a/common/test/resources/test_kill_browserstack.sh
+++ b/common/test/resources/test_kill_browserstack.sh
@@ -8,11 +8,11 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 
-if [[ $BUILDER_OS == win ]]; then
+if builder_is_windows; then
   # BrowserStackLocal may not exist, so always pass
   taskkill //f //im BrowserStackLocal.exe || true
 fi
diff --git a/common/tools/hextobin/build.sh b/common/tools/hextobin/build.sh
index 073b008bf2..45706c35b4 100755
--- a/common/tools/hextobin/build.sh
+++ b/common/tools/hextobin/build.sh
@@ -2,10 +2,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -17,5 +18,5 @@ builder_describe_outputs \
 builder_parse "$@"
 
 builder_run_action clean      rm -rf build/ node_modules/
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
diff --git a/common/tools/sourcemap-path-remapper/build.sh b/common/tools/sourcemap-path-remapper/build.sh
index 3d50eccf83..871de4c546 100755
--- a/common/tools/sourcemap-path-remapper/build.sh
+++ b/common/tools/sourcemap-path-remapper/build.sh
@@ -6,10 +6,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -34,7 +35,7 @@ fi
 ### CONFIGURE ACTIONS
 
 if builder_start_action configure; then
-  verify_npm_setup
+  node_select_version_and_npm_ci
   builder_finish_action success configure
 fi
 
diff --git a/common/web/build.sh b/common/web/build.sh
index 2370e3ecf4..182de85d62 100755
--- a/common/web/build.sh
+++ b/common/web/build.sh
@@ -5,7 +5,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman common web modules" \
diff --git a/common/web/keyman-version/build.sh b/common/web/keyman-version/build.sh
index 9de3da3f8f..0c9657f74b 100755
--- a/common/web/keyman-version/build.sh
+++ b/common/web/keyman-version/build.sh
@@ -2,10 +2,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 ################################ Main script ################################
@@ -53,6 +54,6 @@ export default KEYMAN_VERSION;
 }
 
 builder_run_action clean        rm -rf version.inc.ts keyman-version.mts build/
-builder_run_action configure    verify_npm_setup
+builder_run_action configure    node_select_version_and_npm_ci
 builder_run_action build        do_build
 builder_run_action publish      builder_publish_npm
diff --git a/common/web/langtags/build.sh b/common/web/langtags/build.sh
index f125448d4a..d1b951b624 100755
--- a/common/web/langtags/build.sh
+++ b/common/web/langtags/build.sh
@@ -2,10 +2,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Build Keyman langtags.js common module" \
@@ -32,7 +33,7 @@ function compile_langtags() {
 }
 
 function do_configure() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
   compile_langtags
 }
 
diff --git a/common/web/types/build.sh b/common/web/types/build.sh
index 5a9243e6cd..1ece69f2af 100755
--- a/common/web/types/build.sh
+++ b/common/web/types/build.sh
@@ -2,10 +2,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Build Keyman common file types module" \
@@ -76,7 +77,7 @@ function compile_schemas() {
 
 function do_configure() {
   compile_schemas
-  verify_npm_setup
+  node_select_version_and_npm_ci
 }
 
 function do_test() {
diff --git a/common/web/types/src/kmx/kmx-plus/element-string.ts b/common/web/types/src/kmx/kmx-plus/element-string.ts
index e65d996f34..af17145427 100644
--- a/common/web/types/src/kmx/kmx-plus/element-string.ts
+++ b/common/web/types/src/kmx/kmx-plus/element-string.ts
@@ -81,11 +81,11 @@ export class ElementString extends Array<ElemElement> {
           // error. So we can just exit here.
           return null; // UnicodeSet error
         }
-        const uset = sections.usetparser.parseUnicodeSet(item.segment, needRanges, options?.x);
+        const uset = sections.usetparser.parseUnicodeSet(item.segment, needRanges, options?.compileContext);
         if (!uset) {
           return null; // UnicodeSet error already added to callback
         }
-        elem.uset = sections.uset.allocUset(uset, sections, options?.x);
+        elem.uset = sections.uset.allocUset(uset, sections, options?.compileContext);
         elem.value = sections.strs.allocString('', {...options, singleOk: true}); // no string
       } else if (item.type === ElementType.codepoint || item.type === ElementType.escaped || item.type === ElementType.string) {
         // some kind of a string
diff --git a/common/web/types/src/kmx/kmx-plus/kmx-plus.ts b/common/web/types/src/kmx/kmx-plus/kmx-plus.ts
index 373cc57b27..4fd5dcd632 100644
--- a/common/web/types/src/kmx/kmx-plus/kmx-plus.ts
+++ b/common/web/types/src/kmx/kmx-plus/kmx-plus.ts
@@ -141,7 +141,7 @@ export class StrsItem {
   /** add any context from the options to this strsitem */
   setContext(opts?: StrsOptions) {
     // At present, there's only a single piece of context available
-    this._context = this._context || opts?.x;
+    this._context = this._context || opts?.compileContext;
   }
 
   get context() : any {
@@ -174,7 +174,7 @@ export interface StrsOptions {
   /** string can be stored as a single CharStrsItem, not in strs table. */
   singleOk?: boolean;
   /** optional context */
-  x?: any;
+  compileContext?: any;
 };
 
 export class Strs extends Section {
@@ -374,13 +374,13 @@ export class Vars extends Section {
 export class VarsItem extends Section {
   id: StrsItem;
   value: StrsItem;
-  x?: any;
+  compileContext?: any;
 
-  constructor(id: string, value: string, sections: DependencySections, x?: any) {
+  constructor(id: string, value: string, sections: DependencySections, compileContext?: any) {
     super();
     this.id = sections.strs.allocString(id);
-    this.value = sections.strs.allocString(value, {unescape: true});
-    this.x = x;
+    this.value = sections.strs.allocString(value, { unescape: true });
+    this.compileContext = compileContext;
   }
 
   valid() : boolean {
@@ -389,11 +389,11 @@ export class VarsItem extends Section {
 };
 
 export class UnicodeSetItem extends VarsItem {
-  constructor(id: string, value: string, sections: DependencySections, usetparser: UnicodeSetParser, x?: any) {
-    super(id, value, sections, x);
+  constructor(id: string, value: string, sections: DependencySections, usetparser: UnicodeSetParser, compileContext?: any) {
+    super(id, value, sections, compileContext);
     const needRanges = sections.usetparser.sizeUnicodeSet(value);
     if (needRanges >= 0) {
-      this.unicodeSet = sections.usetparser.parseUnicodeSet(value, needRanges);
+      this.unicodeSet = sections.usetparser.parseUnicodeSet(value, needRanges, compileContext);
     } // otherwise: error (was recorded via callback)
   }
   unicodeSet?: UnicodeSet;
@@ -403,9 +403,9 @@ export class UnicodeSetItem extends VarsItem {
 };
 
 export class SetVarItem extends VarsItem {
-  constructor(id: string, value: string[], sections: DependencySections, x?: any) {
-    super(id, value.join(' '), sections, x);
-    this.items = sections.elem.allocElementString(sections, {x}, value);
+  constructor(id: string, value: string[], sections: DependencySections, compileContext?: any) {
+    super(id, value.join(' '), sections, compileContext);
+    this.items = sections.elem.allocElementString(sections, { compileContext }, value);
   }
   items: ElementString;  // element string array
   valid() : boolean {
@@ -414,8 +414,8 @@ export class SetVarItem extends VarsItem {
 };
 
 export class StringVarItem extends VarsItem {
-  constructor(id: string, value: string, sections: DependencySections, x?: any) {
-    super(id, value, sections, x);
+  constructor(id: string, value: string, sections: DependencySections, compileContext?: any) {
+    super(id, value, sections, compileContext);
   }
   // no added fields
 };
@@ -453,7 +453,7 @@ export class Tran extends Section {
 };
 
 export class UsetItem {
-  constructor(public uset: UnicodeSet, public str: StrsItem, public x?: any) {
+  constructor(public uset: UnicodeSet, public str: StrsItem, public compileContext?: any) {
   }
   compareTo(other: UsetItem) : number {
     return this.str.compareTo(other.str);
@@ -462,11 +462,11 @@ export class UsetItem {
 
 export class Uset extends Section {
   usets: UsetItem[] = [];
-  allocUset(set: UnicodeSet, sections: DependencySections, x?: any) : UsetItem {
+  allocUset(set: UnicodeSet, sections: DependencySections, compileContext?: any) : UsetItem {
     // match the same pattern
     let result = this.usets.find(s => set.pattern == s.uset.pattern);
     if (result === undefined) {
-      result = new UsetItem(set, sections.strs.allocString(set.pattern), x);
+      result = new UsetItem(set, sections.strs.allocString(set.pattern), compileContext);
       this.usets.push(result);
     }
     return result;
diff --git a/common/web/types/src/ldml-keyboard/unicodeset-parser-api.ts b/common/web/types/src/ldml-keyboard/unicodeset-parser-api.ts
index 797a5415b9..6ad16cd4ee 100644
--- a/common/web/types/src/ldml-keyboard/unicodeset-parser-api.ts
+++ b/common/web/types/src/ldml-keyboard/unicodeset-parser-api.ts
@@ -8,13 +8,13 @@ export interface UnicodeSetParser {
    * @param pattern string to parse such as `[a-z]`
    * @param rangeCount number of ranges to allow for
    */
-  parseUnicodeSet(pattern: string, rangeCount: number, x?: any) : UnicodeSet | null;
+  parseUnicodeSet(pattern: string, rangeCount: number, compileContext?: any) : UnicodeSet | null;
   /**
    * Calculate the number of ranges in a UnicodeSet
    * @param pattern string to parse such as `[a-z]`
    * @returns number of ranges, or -1 (with callback-reported err) on err
    */
-  sizeUnicodeSet(pattern: string, x?: any) : number;
+  sizeUnicodeSet(pattern: string, compileContext?: any) : number;
 }
 
 /**
diff --git a/common/web/types/src/lexical-model-types.ts b/common/web/types/src/lexical-model-types.ts
index 1b02b413d1..9938abec5a 100644
--- a/common/web/types/src/lexical-model-types.ts
+++ b/common/web/types/src/lexical-model-types.ts
@@ -424,13 +424,24 @@ export interface ProbabilityMass<T> {
 export type Distribution<T> = ProbabilityMass<T>[];
 
 /**
- * A type augmented with an optional probability.
+ * A type augmented with optional probability data.
  */
 export type Outcome<T> = T & {
   /**
-   * [optional] probability of this outcome.
+   * [optional] the modeled likelihood associated with this outcome.
    */
   p?: number;
+
+  /**
+   * The likelihood of the suggestion itself based solely on the lexical model
+   */
+  ['lexical-p']?: number
+
+  /**
+   * The likelihood associated with the keystroke sequence and/or associated
+   * text corrections best matching the suggestion.
+   */
+  ['correction-p']?: number
 };
 
 /**
@@ -441,6 +452,21 @@ export type WithOutcome<T> = T & {
    * Probability of this outcome.
    */
   p: number;
+
+  /**
+   * The likelihood of the suggestion itself based solely on the lexical model
+   *
+   * Only emitted for verbose mode.
+   */
+  ['lexical-p']?: number
+
+  /**
+   * The likelihood associated with the keystroke sequence and/or associated
+   * text corrections best matching the suggestion.
+   *
+   * Only omitted for verbose mode.
+   */
+  ['correction-p']?: number
 };
 
 
diff --git a/common/web/types/src/main.ts b/common/web/types/src/main.ts
index 071c931e9e..779af42ba5 100644
--- a/common/web/types/src/main.ts
+++ b/common/web/types/src/main.ts
@@ -19,6 +19,8 @@ export * as KmpJsonFile from './package/kmp-json-file.js';
 export { Uni_IsSurrogate1, Uni_IsSurrogate2 } from './util/util.js';
 export * as util from './util/util.js';
 
+export { ObjectWithCompileContext } from './util/types.js';
+
 export * as KeymanFileTypes from './util/file-types.js';
 
 export * as Schemas from './schemas.js';
diff --git a/common/web/types/src/util/types.ts b/common/web/types/src/util/types.ts
new file mode 100644
index 0000000000..3ed1dda4f9
--- /dev/null
+++ b/common/web/types/src/util/types.ts
@@ -0,0 +1,6 @@
+/**
+ * Any object with metadata, for example for line number errs.
+ * Defined as 'any' here to reduce noise on the client side.
+ * @see {@link KeymanXMLReader.getMetaData()}
+ */
+export type ObjectWithCompileContext = any;
diff --git a/common/web/types/src/util/util.ts b/common/web/types/src/util/util.ts
index 70e1077cc5..06cb91dd5d 100644
--- a/common/web/types/src/util/util.ts
+++ b/common/web/types/src/util/util.ts
@@ -3,7 +3,7 @@ export { MATCH_HEX_ESCAPE, CONTAINS_QUAD_ESCAPE, MATCH_QUAD_ESCAPE };
 
 /**
  * xml2js will not place single-entry objects into arrays. Easiest way to fix
- * this is to box them ourselves as needed. Ensures that o.x is an array.
+ * this is to box them ourselves as needed. Ensures that o[x] is always an array.
  *
  * @param o Object with property to box
  * @param x Name of element to box
diff --git a/common/windows/build.sh b/common/windows/build.sh
index 06f5dd0201..45941b668d 100755
--- a/common/windows/build.sh
+++ b/common/windows/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 #
@@ -18,7 +18,7 @@ builder_describe "Keyman common Windows modules" \
 
 builder_parse "$@"
 
-if [[ $BUILDER_OS != win ]]; then
+if ! builder_is_windows; then
   builder_echo grey "Platform is not Windows; skipping common/windows"
   exit 0
 fi
diff --git a/common/windows/cef-checkout.sh b/common/windows/cef-checkout.sh
index b8326561b8..c669961328 100755
--- a/common/windows/cef-checkout.sh
+++ b/common/windows/cef-checkout.sh
@@ -13,8 +13,8 @@ set -u
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
-# . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
+# . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 pushd $KEYMAN_CEF4DELPHI_ROOT > /dev/null
diff --git a/common/windows/data/build.sh b/common/windows/data/build.sh
index ac559612bb..2b70c426ed 100755
--- a/common/windows/data/build.sh
+++ b/common/windows/data/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/common/windows/delphi/build.sh b/common/windows/delphi/build.sh
index b3e0ddfc1f..81042422fd 100755
--- a/common/windows/delphi/build.sh
+++ b/common/windows/delphi/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/common/windows/delphi/components/build.sh b/common/windows/delphi/components/build.sh
index 86bad135e0..6fe3dfa9ec 100755
--- a/common/windows/delphi/components/build.sh
+++ b/common/windows/delphi/components/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Common Delphi components" clean configure build test edit
diff --git a/common/windows/delphi/ext/build.sh b/common/windows/delphi/ext/build.sh
index 3fb17d98b3..05dffca69d 100755
--- a/common/windows/delphi/ext/build.sh
+++ b/common/windows/delphi/ext/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/common/windows/delphi/ext/cef4delphi/build.sh b/common/windows/delphi/ext/cef4delphi/build.sh
index 340cfbf9b1..856694dd27 100755
--- a/common/windows/delphi/ext/cef4delphi/build.sh
+++ b/common/windows/delphi/ext/cef4delphi/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "cef4delphi component" clean configure build test
diff --git a/common/windows/delphi/ext/dcpcrypt/build.sh b/common/windows/delphi/ext/dcpcrypt/build.sh
index cbda46a94d..eceaf361b0 100755
--- a/common/windows/delphi/ext/dcpcrypt/build.sh
+++ b/common/windows/delphi/ext/dcpcrypt/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "dcpcrypt component" clean configure build test
diff --git a/common/windows/delphi/ext/jwa/build.sh b/common/windows/delphi/ext/jwa/build.sh
index 12b27dfe81..30cbbeb919 100755
--- a/common/windows/delphi/ext/jwa/build.sh
+++ b/common/windows/delphi/ext/jwa/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "jwa component" clean configure build test
diff --git a/common/windows/delphi/ext/sentry/build.sh b/common/windows/delphi/ext/sentry/build.sh
index b25d9c3253..c0b0cc9147 100755
--- a/common/windows/delphi/ext/sentry/build.sh
+++ b/common/windows/delphi/ext/sentry/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Sentry component for Delphi" clean configure build test
diff --git a/common/windows/delphi/ext/tds2dbg/build.sh b/common/windows/delphi/ext/tds2dbg/build.sh
index a8fc83989d..805f957ea1 100755
--- a/common/windows/delphi/ext/tds2dbg/build.sh
+++ b/common/windows/delphi/ext/tds2dbg/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # TODO: move this out of ext and into tools
diff --git a/common/windows/delphi/general/KeymanVersionInfo.inc b/common/windows/delphi/general/KeymanVersionInfo.inc
index 4991b42385..41e316e051 100644
--- a/common/windows/delphi/general/KeymanVersionInfo.inc
+++ b/common/windows/delphi/general/KeymanVersionInfo.inc
@@ -1,6 +1,6 @@
 type
   TKeymanVersionInfo = record
-    // These fields match fields in /resources/build/build-utils.sh
+    // These fields match fields in /resources/build/builder-basic.inc.sh
     Version: string;        // 14.0.2
     VersionWin: string;     // 14.0.2.0
     VersionRelease: string; // 14.0
diff --git a/common/windows/delphi/general/keymanversion_build.in b/common/windows/delphi/general/keymanversion_build.in
index edd55572a6..a5ada65e15 100644
--- a/common/windows/delphi/general/keymanversion_build.in
+++ b/common/windows/delphi/general/keymanversion_build.in
@@ -6,7 +6,7 @@
   // Keyman Version Information
 
   CKeymanVersionInfo: TKeymanVersionInfo = (
-    // These fields match fields in /resources/build/build-utils.sh
+    // These fields match fields in /resources/build/builder-basic.inc.sh
     Version: '$Version';
     VersionWin: '$VersionWin';
     VersionRelease: '$VersionRelease';
diff --git a/common/windows/delphi/tools/build.sh b/common/windows/delphi/tools/build.sh
index 6fad40a4d6..220463620b 100755
--- a/common/windows/delphi/tools/build.sh
+++ b/common/windows/delphi/tools/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/common/windows/delphi/tools/build_standards_data/build.sh b/common/windows/delphi/tools/build_standards_data/build.sh
index 3d39aefe9d..239bde79f0 100755
--- a/common/windows/delphi/tools/build_standards_data/build.sh
+++ b/common/windows/delphi/tools/build_standards_data/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Build build_standards_data tool" clean configure build test edit
diff --git a/common/windows/delphi/tools/buildunidata/build.sh b/common/windows/delphi/tools/buildunidata/build.sh
index b4e13c264d..36b069351b 100755
--- a/common/windows/delphi/tools/buildunidata/build.sh
+++ b/common/windows/delphi/tools/buildunidata/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Unicode character database build tool" \
diff --git a/common/windows/delphi/tools/certificates/build.sh b/common/windows/delphi/tools/certificates/build.sh
index 10ab4c75ce..dfe4911f18 100755
--- a/common/windows/delphi/tools/certificates/build.sh
+++ b/common/windows/delphi/tools/certificates/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Build and install test certificates" clean configure build test \
diff --git a/common/windows/delphi/tools/devtools/build.sh b/common/windows/delphi/tools/devtools/build.sh
index f514ea7578..f7b9dd52d4 100755
--- a/common/windows/delphi/tools/devtools/build.sh
+++ b/common/windows/delphi/tools/devtools/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/common/windows/delphi/tools/sentrytool/build.sh b/common/windows/delphi/tools/sentrytool/build.sh
index ca4e427c39..c1672b0aeb 100755
--- a/common/windows/delphi/tools/sentrytool/build.sh
+++ b/common/windows/delphi/tools/sentrytool/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Sentrytool for converting Delphi symbols into sentry-readable format" \
diff --git a/common/windows/delphi/tools/test-klog/build.sh b/common/windows/delphi/tools/test-klog/build.sh
index b271565cae..acdd90cd53 100755
--- a/common/windows/delphi/tools/test-klog/build.sh
+++ b/common/windows/delphi/tools/test-klog/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Tool for validating klog is disabled for release builds" \
diff --git a/common/windows/delphi/tools/verify_signatures/build.sh b/common/windows/delphi/tools/verify_signatures/build.sh
index f53883c70e..d1b29e89cb 100755
--- a/common/windows/delphi/tools/verify_signatures/build.sh
+++ b/common/windows/delphi/tools/verify_signatures/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Tool to verify all Windows executable signatures and manifests" \
diff --git a/common/windows/mkver.sh b/common/windows/mkver.sh
index 8ddb9e34ed..84886666bd 100755
--- a/common/windows/mkver.sh
+++ b/common/windows/mkver.sh
@@ -9,7 +9,7 @@ set -u
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 display_usage() {
diff --git a/core/build.sh b/core/build.sh
index 94e8ae4e38..1c1d337b1c 100755
--- a/core/build.sh
+++ b/core/build.sh
@@ -3,11 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$THIS_SCRIPT_PATH/commands.inc.sh"
 
 ################################ Main script ################################
diff --git a/core/commands.inc.sh b/core/commands.inc.sh
index 761be3db4d..73ad033a8e 100644
--- a/core/commands.inc.sh
+++ b/core/commands.inc.sh
@@ -91,7 +91,7 @@ do_test() {
   if [[ $target =~ ^(x86|x64)$ ]]; then
     cmd //C build.bat $target $BUILDER_CONFIGURATION test $testparams
   else
-    if [[ $target == wasm ]] && [[ $BUILDER_OS == mac ]]; then
+    if [[ $target == wasm ]] && builder_is_macos; then
       # 11794 -- parallel tests failing on some mac build agents; temporary
       # mitigation until we diagnose root cause
       meson test -j 1 -C "$MESON_PATH" $testparams
@@ -136,7 +136,7 @@ do_uninstall() {
 # ----------------------------------------------------------------------------
 
 build_meson_cross_file_for_wasm() {
-  if [ $BUILDER_OS == win ]; then
+  if builder_is_windows; then
     local R=$(cygpath -w $(echo $EMSCRIPTEN_BASE) | sed 's_\\_\\\\_g')
   else
     local R=$(echo $EMSCRIPTEN_BASE | sed 's_/_\\/_g')
diff --git a/core/include/ldml/build.sh b/core/include/ldml/build.sh
index 17902411d3..f2633ed348 100755
--- a/core/include/ldml/build.sh
+++ b/core/include/ldml/build.sh
@@ -5,10 +5,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Keyman ldml-keyboard-constants package" \
@@ -30,7 +31,7 @@ builder_parse "$@"
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_action clean      rm -rf ./build/
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
 # builder_run_action test       # no tests at this time
 builder_run_action publish    builder_publish_npm
diff --git a/core/tests/unit/ldml/keyboards/meson.build b/core/tests/unit/ldml/keyboards/meson.build
index 8e9539a3dd..0fe3980681 100644
--- a/core/tests/unit/ldml/keyboards/meson.build
+++ b/core/tests/unit/ldml/keyboards/meson.build
@@ -65,6 +65,7 @@ kmc_cmd = [node, '--enable-source-maps', kmc_root]
 # Build all keyboards in output folder
 
 foreach kbd : tests_needing_copy
+  # This will output a (wrong) deprecation warning with meson < 1.5 - see #13250
   configure_file(input: kbd + '.xml', output: kbd + '.xml', copy: true)
 endforeach
 
@@ -77,6 +78,7 @@ foreach kbd : tests_with_testdata
 endforeach
 
 foreach kbd : tests_from_cldr
+  # This will output a (wrong) deprecation warning with meson < 1.5 - see #13250
   configure_file(input: ldml_data / kbd + '.xml', output: kbd + '.xml', copy: true)
   configure_file(
     command: kmc_cmd + ['build', 'ldml-test-data', '@INPUT@', '--out-file', '@OUTPUT@'],
diff --git a/core/tools/api-header-extractor/build.sh b/core/tools/api-header-extractor/build.sh
index fe048ce48b..bf26598ce2 100755
--- a/core/tools/api-header-extractor/build.sh
+++ b/core/tools/api-header-extractor/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 CORE_ROOT="$KEYMAN_ROOT/core"
diff --git a/core/tools/ldml-const-builder/build.sh b/core/tools/ldml-const-builder/build.sh
index 26c7c0a60e..8c8bc364b5 100755
--- a/core/tools/ldml-const-builder/build.sh
+++ b/core/tools/ldml-const-builder/build.sh
@@ -5,10 +5,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 CORE_LDML_H_FILE="../../include/ldml/keyman_core_ldml.h"
 
diff --git a/developer/build.sh b/developer/build.sh
index b75967a4ce..74269abcc3 100755
--- a/developer/build.sh
+++ b/developer/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD UTILITY SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
 ## END STANDARD UTILITY SCRIPT INCLUDE
 
 # This is not a builder script but calls a builder script
diff --git a/developer/docs/help/context/keyboard-editor.md b/developer/docs/help/context/keyboard-editor.md
index fb0be6d34c..577640fc65 100644
--- a/developer/docs/help/context/keyboard-editor.md
+++ b/developer/docs/help/context/keyboard-editor.md
@@ -13,13 +13,10 @@ multiple source files, which are all managed within this one editor.
 The following image shows the first tab of the editor, the Details tab,
 for a brand new keyboard, with those three initial tabs.
 
-![Keyboard Editor - New file, Details tab](../images/ui/frmKeymanWizard_New.png)
+<img src="../images/ui/frmKeymanWizard_New.png" style="width:100%" alt="Keyboard Editor - New file, Details tab"/>
 
-> ### Note
-Users of earlier versions of Keyman Developer may initially have trouble
-finding tabs such as the Icon tab or the On-Screen tab, as they are not
-initially visible. The Features grid on the Details tab allows you to
-add these extra features into the keyboard.
+> [!Note]
+> Users of earlier versions of Keyman Developer may initially have trouble finding tabs such as the Icon tab or the On-Screen tab, as they are not initially visible. The Features grid on the Details tab allows you to add these extra features into the keyboard.
 
 ## Keyboard component files
 
@@ -47,7 +44,7 @@ because that reflects both the Details and the Layout tab.
 
 ## Details tab
 
-![Keyboard Editor - Details tab](../images/ui/frmKeymanWizard_Details.png)
+<img src="../images/ui/frmKeymanWizard_Details.png" style="width:100%" alt="Keyboard Editor - Details tab"/>
 
 The Details tab grows as you add more options to a keyboard. The fields
 here are:
@@ -102,7 +99,7 @@ Features
 
 ## Layout tab
 
-![Keyboard Editor - Layout tab, Design view](../images/ui/frmKeymanWizard_Layout_Design.png)
+<img src="../images/ui/frmKeymanWizard_Layout_Design.png" style="width:100%" alt="Keyboard Editor - Layout tab, Design view"/>
 
 The Layout tab gives you a simple interface to quickly create a keyboard
 using a visual representation of a desktop/laptop computer keyboard. You
@@ -124,13 +121,11 @@ There are two ways to assign characters to the keys:
     onto the appropriate key. This will set the key to output that
     character.
 
->    ### Hint
-    To add the character to a key with existing characters, hold
-<kbd>Ctrl</kbd> while dropping it onto the key.
+> [!TIP]
+> To add the character to a key with existing characters, hold <kbd>Ctrl</kbd> while dropping it onto the key.
 
-<!-- Saperator -->
->   ### Note
-    Any key that does not have a character assigned to it will output what the selected Windows layout specifies.
+> [!Note]
+> Any key that does not have a character assigned to it will output what the selected Windows layout specifies.
 
 Distinguish between left and right Ctrl/Alt
 :   A Keyman keyboard can treat left and right Ctrl and Alt identically,
@@ -151,9 +146,7 @@ Display 102nd Key (as on European keyboards)
 You can press and release <kbd>Ctrl</kbd> to select
 another key on the keyboard using your keyboard.
 
-<br/>
-
-![Keyboard Editor - Layout tab, Code view](../images/ui/frmKeymanWizard_Layout_Code.png)
+<img src="../images/ui/frmKeymanWizard_Layout_Code.png" style="width:100%" alt="Keyboard Editor - Layout tab, Code view"/>
 
 The Code view shows the source code of the keyboard file. This is where
 all the information in the Details and Layout tab is stored, and
@@ -165,7 +158,7 @@ editor shown within this view.
 
 ## On-Screen tab
 
-![Keyboard Editor - On-Screen tab](../images/ui/OnScreenKeyboard.png)
+<img src="../images/ui/OnScreenKeyboard.png" style="width:100%" alt="Keyboard Editor - On-Screen tab"/>
 
 This tab allows you to edit the visual representation of your keyboard
 layout. The content on this tab is stored in the .kvks file associated
@@ -213,17 +206,28 @@ Distinguish between left and right Ctrl/Alt
 :   If checked, treats the left and right Ctrl/Alt as separate layers
 
 Display 102nd Key (as on European keyboards)
-:   European keyboards have one extra key that is not on US keyboards.
+:   European keyboards (ISO layout) have one extra key that is not on US keyboards (ANSI layout).
     This key is positioned to the right of the left shift key. Some
     other keyboards have additional keys; these are not shown on the
-    layout designer. If you have a European layout selected as your
+    layout designer. 
+    
+    If you have a European layout selected as your
     Windows layout, the 102nd key will always be visible in the
     designer; ensure you select this checkbox if you want the 102nd key
     to always be visible to end users of the layout, irrespective of
-    their selected base layout. When a European layout is selected as
+    their selected base layout. 
+    
+    When a European layout is selected as
     your Windows layout, the shape of the Enter key will also change to
     take two rows, and the backslash key will move down one row, but not
-    otherwise change in behaviour.
+    otherwise change in behaviour. 
+
+    <img src="../images/ui/OnScreenKeyboard_ISO.png" style="width:100%" alt="Keyboard Editor - On-Screen tab with ISO layout"/>
+    *See the difference between the two layouts in Keyman Developer.*
+
+    > [!NOTE]
+    > The "Display 102nd Key (as on European keyboards)" checkbox can be left unchecked. 
+    > To ensure compatibility, the extra key shouldn't be assigned since it won't be accessible on an ANSI physical keyboard.
 
 Auto-fill underlying layout
 :   When the Fill from layout button is clicked, if this option is
@@ -232,7 +236,7 @@ Auto-fill underlying layout
 
 ## Touch Layout tab
 
-![Keyboard Editor - Touch Layout tab, Design view](../images/ui/TouchLayout_Design.png)
+<img src="../images/ui/TouchLayout_Design.png" style="width:100%" alt="Keyboard Editor - Touch Layout tab, Design view"/>
 
 The Touch Layout tab is used to create the visible representation of the
 keyboard layout for touch devices. It works similarly to the On Screen
@@ -251,7 +255,7 @@ including iPhone and iPad, in different orientations, to allow you to
 visualize the keyboard layout before you load it onto a device. The
 following image shows all aspects of the touch design view.
 
-![Keyboard Editor - Touch Layout tab, Design view closeup](../images/ui/TouchLayout_Design_2.png)
+<img src="../images/ui/TouchLayout_Design_2.png" style="width:100%" alt="Keyboard Editor - Touch Layout tab, Design view closeup"/>
 
 ### Left sidebar controls
 
@@ -266,6 +270,20 @@ Template...
     be lost. Therefore, selecting an appropriate template early in the
     development process is suggested.
 
+    - template-basic: has only a phone layout (4 rows of keys), with three layers: default (K_A through K_Z 
+    plus some punctuation), shift (Shift K_A through Shift K_Z, plus some punctuation), numeric (K_0 through 
+    K_9 unshifted and shifted, plus other non-alphanumerice keys).
+
+    - template-latin: has both phone and tablet layouts (which are identical except for some key spacing, 
+    each with 4 rows of keys), with four layers: default, shift, numeric, symbol. The first three layers 
+    are similar to those of template-basic, with the addition of longpress keys for accented characters. 
+    The symbol layer has many symbols not usually seen on a physical keyboard.
+
+    - template-traditional: has both phone (4 rows of keys) and tablet (5 rows of keys) layouts. The phone 
+    layout is similar to the template-basic layout. The tablet layout has eight layers: default, shift, ctrl, 
+    shift-ctrl, alt, shift-alt, ctrl-alt, shift-ctrl-alt. The default layer has the keys from the default layer 
+    of the desktop layout, the shift layer has the keys from the shift layer of the desktop layout, and so on.
+    
 Import from On Screen
 :   If you have an existing On-Screen Keyboard for your keyboard layout,
     importing the design from the On-Screen Keyboard can reduce the
@@ -454,7 +472,7 @@ dragged between the main keyboard area and the long press area. The bar
 below the long press area contains the corresponding controls for the
 long press keys.
 
-![Keyboard Editor - Touch Layout tab, Code view](../images/ui/frmKeymanWizard_TouchLayout_Code.png)
+<img src="../images/ui/frmKeymanWizard_TouchLayout_Code.png" style="width:100%" alt="Keyboard Editor - Touch Layout tab, Code view"/>
 
 The Code view allows you to edit the JSON source of the touch layout
 file. This makes certain operations simpler, such as batched rearranging
@@ -467,7 +485,7 @@ The format of the layout file is described in [Creating a touch keyboard layout
 
 Underneath the keyboard area is the Long-press, Flicks, and Multitaps controls.
 
-![Long-press, Flicks, and Multitaps layout](../images/ui/LongPress_Flicks_Multitaps.png)
+<img src="../images/ui/LongPress_Flicks_Multitaps.png" style="width:100%" alt="Long-press, Flicks, and Multitaps layout"/>
 
 Red circle with an X
 :   This button to the top right of the key will delete the key from the
@@ -494,7 +512,7 @@ the selected key for different Gesture Type. The only difference between this co
 
 ## Icon tab
 
-![Keyboard Editor - Icon tab](../images/ui/frmKeymanWizard_Icon.png)
+<img src="../images/ui/frmKeymanWizard_Icon.png" style="width:100%" alt="Keyboard Editor - Icon tab"/>
 
 The icon tab allows you to edit the icon associated with the keyboard. An external icon editor will allow you to create more sophisticated icons with alpha transparency and multiple resolutions, but this will cover the standard 16x16 256 colour icon, which is all that many keyboards require. The controls at the top left are:
 
@@ -560,7 +578,7 @@ This tab allows you to edit the [named constants](/developer/language/guide/cons
 
 ## Build tab
 
-![Keyboard Editor - Build tab](../images/ui/BuildTab.png)
+<img src="../images/ui/BuildTab.png" style="width:100%" alt="Keyboard Editor - Build tab"/>
 
 A set of common controls is across the top of this tab:
 
diff --git a/developer/docs/help/context/package-editor.md b/developer/docs/help/context/package-editor.md
index 38026732bc..85335a2c1b 100644
--- a/developer/docs/help/context/package-editor.md
+++ b/developer/docs/help/context/package-editor.md
@@ -129,6 +129,12 @@ are optional.
 A web site is encouraged and should be filled in the web site field, including
 the initial "http://" or "https://".
 
+The Description is the keyboard summary that users will see on the keyboard’s 
+overview page at the keyman.com web site. 
+[GitHub style Markdown](https://docs.github.com/en/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax)
+can be used in the description text.  However, HTML tags are not supported.
+
+
 A package can optionally include a 140x250 JPEG or PNG image file to be shown
 during installation. This image file must be added to the Files list in step 1,
 then selected from the list here.
@@ -191,4 +197,4 @@ keyboard to the [Keyman Cloud Keyboards Repository](/developer/keyboards/).
 ## Package Installers
 
 As of Keyman Developer 17, bundled executable package installers for Keyman for
-Windows can be created using [kmc](kmc), but cannot be created within the IDE.
\ No newline at end of file
+Windows can be created using [kmc](kmc), but cannot be created within the IDE.
diff --git a/developer/docs/help/guides/develop/touch-keyboard-tutorial/gestures.md b/developer/docs/help/guides/develop/touch-keyboard-tutorial/gestures.md
new file mode 100644
index 0000000000..b09d5919cf
--- /dev/null
+++ b/developer/docs/help/guides/develop/touch-keyboard-tutorial/gestures.md
@@ -0,0 +1,26 @@
+---
+title: Using Gestures in Keyman Developer
+---
+
+Keyman Developer offers **Longpress** keys, **Flicks**, and **Multitaps** for touch keyboard layout. To allow gestures onto your keyboard, go to the Touch layout tab and define the keys as follows:
+
+<img src="../../../images/touch-keyboard-tutorial/touch-layout-gestures.jpg" alt="Keyman Developer touch layout gestures" width="70%"/>
+
+## Tips
+
+***Flicks** and **long presses** can both be used in a single keyboard. In this scenario, it is recommended to use flicks in only one direction—south (down). Long presses work well alongside this pattern. See, for example, [sil_euro_latin](https://help.keyman.com/keyboard/sil_euro_latin/3.0.3/sil_euro_latin#toc-mobile-keyboard-layout). 
+    * Another helpful tip seen in the sil_euro_latin keyboard is using south-flicks on the base and shift layers corresponding to the numeric/symbol layer, this aids in both memorization and discovery.
+* **Flicks** in multiple directions are possible, but currently Keyman does not support hints for multiple directions, so they are not very discoverable.
+* **Long presses** are more discoverable, but **flicks** are faster. We suggest using south flicks along with long presses, and including the flick output in the long press for maximum discoverability and optimum ergonomics.
+
+## Caution
+
+* **Flicks** near screen edges tend to be problematic--once you drag off the screen, then Keyman can no longer tell that you are flicking (or you may end up activating system controls on the bottom edge):
+  * On the bottom row, south flicks are not recommended.
+  * On the top row, we have the banner space reserved in order to be able to support flicks and long presses up into that region of the screen.
+  * Left/right screen edges, horizontal flicks are not the best practice.
+
+## See also
+
+* The [Winchus keyboard](https://help.keyman.com/keyboard/winchus/1.4/winchus#guia-rapida-celular)
+* The [GFF Amharic keyboard](https://help.keyman.com/keyboard/gff_amharic/3.2.1/gff_amharic#toc-using-this-keyboard)
\ No newline at end of file
diff --git a/developer/docs/help/guides/develop/touch-keyboard-tutorial/index.md b/developer/docs/help/guides/develop/touch-keyboard-tutorial/index.md
index bc7c8e792f..acfe3efcec 100644
--- a/developer/docs/help/guides/develop/touch-keyboard-tutorial/index.md
+++ b/developer/docs/help/guides/develop/touch-keyboard-tutorial/index.md
@@ -38,17 +38,23 @@ ago) used the <kbd>/</kbd> key as the deadkey.
 <kbd>/</kbd><kbd>d</kbd> gave ɗ, and so on.
 
 It would be possible to use that desktop keyboard logic on touch
-screens.  But your mobile device users will find these rules annoying.
+screens. But your mobile device users will find these rules annoying.
+
 Instead of two keys they would probably have to press four, since the
 standard alphabetical keyboard on most touch devices does not have the
 slash key. So they would have to press the key to switch to the numeric
-keyboard, then press slash, then press the key to go back to the
-alphabetical keyboard, then the letter. What touch screen users would
+keyboard, then press slash, then press the key to switch back to the
+alphabetical keyboard, and then the letter. What touch screen users would
 appreciate is something that uses the great feature of touch screens,
 the long press or press and hold on a letter, to see analogous letters.
-So we’ll set up a touch screen keyboard that lets you press and hold ‘d’
-to see the two hooked d characters, press and hold ‘b’ to see the hooked
-b characters, and so on.
+
+So we’ll set up a touch screen keyboard that lets you
+* press and hold ‘d’ to see the two hooked d characters
+* press and hold ‘b’ to see the hooked b characters, and so on.
 
 [Next: Making, testing and distributing the touch
 keyboard](making-touch-keyboard)
+
+## See also
+
+* Tips for using [gestures](gestures) in Keyman Developer
diff --git a/developer/docs/help/images/touch-keyboard-tutorial/touch-layout-gestures.jpg b/developer/docs/help/images/touch-keyboard-tutorial/touch-layout-gestures.jpg
new file mode 100644
index 0000000000..1d407cc22a
Binary files /dev/null and b/developer/docs/help/images/touch-keyboard-tutorial/touch-layout-gestures.jpg differ
diff --git a/developer/docs/help/images/ui/OnScreenKeyboard_ISO.png b/developer/docs/help/images/ui/OnScreenKeyboard_ISO.png
new file mode 100644
index 0000000000..64e3f6ef7e
Binary files /dev/null and b/developer/docs/help/images/ui/OnScreenKeyboard_ISO.png differ
diff --git a/developer/docs/help/main/credits.md b/developer/docs/help/main/credits.md
index f2c8a027c5..a4c2124870 100644
--- a/developer/docs/help/main/credits.md
+++ b/developer/docs/help/main/credits.md
@@ -2,6 +2,6 @@
 title: Additional Credits
 ---
 
-## <span id="id536439"></span>Code2000, Code2001 and Code2002 fonts
+## Code2000, Code2001 and Code2002 fonts
 
 © 2006 James Kass.
diff --git a/developer/docs/help/main/license.md b/developer/docs/help/main/license.md
index 73b788f900..83f45978e9 100644
--- a/developer/docs/help/main/license.md
+++ b/developer/docs/help/main/license.md
@@ -4,7 +4,7 @@ title: Keyman® Developer License
 
 MIT License
 
-Copyright (c) 1994-2018 SIL International
+Copyright (c) 1994-2025 SIL Global
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the
diff --git a/developer/docs/help/reference/bcp-47.md b/developer/docs/help/reference/bcp-47.md
index f5c8a49539..0d087911e2 100644
--- a/developer/docs/help/reference/bcp-47.md
+++ b/developer/docs/help/reference/bcp-47.md
@@ -30,26 +30,30 @@ The following are all examples of valid BCP 47 tags:
 * `en-US`: English, in United States
 * `km-Khmr-KH`: Khmer, written in the Khmer script, in Cambodia
 * `km-fonipa`: Khmer, transcribed in IPA
+* `und-cpmn`: Undetermined (Cypro-Minoan)
+* `tok-Zzzz`: Toki Pona (Code for uncoded script)
+
+> [!NOTE]
+> `Zzzz` is an uncoded script of ISO 15924 and one of the Special codes of the Script subtag.
 
 ### The language subtag
 
-The only required option is the Language subtag, which is an [ISO 639-1][2] or
-[ISO 639-3][3] code.
+The only required option is the Language subtag, which is an [ISO 639][4] code. If a two-letter code[ISO 639-1][2] is available, it is used instead of the three-letter code [ISO 639-3][3].   
 
-ISO 639-1 tags are a two-letter code. ISO 639-3 tags are a three-letter code.
 First, try to find your language on the list of two-letter ISO 639-1 codes.
-[This Wikipedia page][4] lists all of the two-letter codes.
+[This Wikipedia page][5] lists all of the two-letter codes.
 
 If you can't find a two-letter code, you'll need to find the closest
-three-letter code. You can use [Glottolog][5] to search for your language, and
+three-letter code. You can use [Glottolog][6] to search for your language, and
 it will give you an appropriate code. In this example, I searched Glottolog for
-“[Saanich][6]” (name of the First Nations that speak SENĆOŦEN) and found `str`
+“[Saanich][7]” (name of the First Nations that speak SENĆOŦEN) and found `str`
 as the code for all Straits Salish languages.
 
-The Language subtag is conventionally written in lower case.
+> [!IMPORTANT] 
+> The Language subtag is conventionally written in lower case.
 
-The next two subtags are **optional**, however, they allow you to be more
-specific about your language.
+> [!NOTE]
+>  The next two subtags are **optional**, however, they allow you to be more specific about your language.
 
 ### The script subtag
 
@@ -58,7 +62,7 @@ model or keyboard. If your language only uses one writing system, omit the
 Script subtag.
 
 Otherwise, in cases where a language can be written in many different writing
-systems, you can choose the four letter [ISO 15924][7] script tag that your
+systems, you can choose the four letter [ISO 15924][8] script tag that your
 keyboard or lexical model produces.
 
 For example, Plains Cree can either be written in _standard Roman orthography_,
@@ -67,8 +71,8 @@ of the **Canadian Aboriginal syllabics** family of writing systems. If I wrote a
 keyboard or lexical model that produced syllabics, I would choose `Cans`, as
 that is the **ISO 15924** tag for Canadian Aboriginal syllabics.
 
-The Script subtag is conventionally written in title case - first letter
-capitalized.
+> [!IMPORTANT] 
+> The Script subtag is conventionally written in title case - first letter capitalized.
 
 ### The region subtag
 
@@ -88,11 +92,11 @@ Latin America. Additionally, regions may have vocabulary that doesn't exist in
 the other regions where the language is spoken.
 
 If I were working with a language specific to one country, I would use the [ISO
-3166-1 alpha-2][8] country code for the region subtag. For example, `ES` for
+3166-1 alpha-2][9] country code for the region subtag. For example, `ES` for
 Spain or `MX` for Mexico.
 
 However, if I were working with Latin American Spanish (a group of countries), I
-would need to specify Latin America's [UN M49][9] region code. For Latin
+would need to specify Latin America's [UN M49][10] region code. For Latin
 America, its code is `419`. My lexical model would not suggest words that are
 common in Spain, but vulgar in Latin America, however it would predict words
 like "pupupsas" and "chuchitos", which are words that are uncommon in both Spain
@@ -100,14 +104,16 @@ and Mexico.
 
 Another common UN M49 region code is `001` for the whole world.
 
-Alphabetic region subtags are conventionally written in upper case.
+> [!IMPORTANT] 
+> Alphabetic region subtags are conventionally written in upper case.
 
 [1]: https://en.wikipedia.org/wiki/IETF_language_tag
 [2]: https://en.wikipedia.org/wiki/ISO_639-1
 [3]: https://en.wikipedia.org/wiki/ISO_639-3
-[4]: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
-[5]: https://glottolog.org/glottolog/language
-[6]: https://glottolog.org/resource/languoid/id/saan1246
-[7]: https://en.wikipedia.org/wiki/ISO_15924
-[8]: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
-[9]: https://en.wikipedia.org/wiki/UN_M49
+[4]: https://en.wikipedia.org/wiki/ISO_639
+[5]: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
+[6]: https://glottolog.org/glottolog/language
+[7]: https://glottolog.org/resource/languoid/id/saan1246
+[8]: https://en.wikipedia.org/wiki/ISO_15924
+[9]: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+[10]: https://en.wikipedia.org/wiki/UN_M49
diff --git a/developer/docs/internal/developer-messaging.md b/developer/docs/internal/developer-messaging.md
index d7fe3bb9d4..453230a733 100644
--- a/developer/docs/internal/developer-messaging.md
+++ b/developer/docs/internal/developer-messaging.md
@@ -102,7 +102,7 @@ Example: keys.ts  \- compiler \- call site for error
 
 ```js
 static ERROR_InvalidScanCode = SevError | 0x0009;
-static Error_InvalidScanCode = (o:{id: string, invalidCodeList: string}, x: ObjectWithMetadata) => mx(
+static Error_InvalidScanCode = (o:{id: string, invalidCodeList: string}, compileContext:ObjectWithCompileContext) => mx(
   this.ERROR_InvalidScanCode, context,
 Form '${def(o.id)}' has invalid/unknown scancodes '${def(o.codes)}',
   `…additional markdown detail…`
@@ -126,7 +126,7 @@ The `mx()` function does the following (note that `m()` is called first).
 
 ```js
 let evt = m(code, message, detail);        // raw message
-evt = LdmlCompilerMessages.offset(evt, x); // with offset
+evt = LdmlCompilerMessages.offset(evt, compileContext); // with offset
 ```
 
 Note: We could have:    `ml(e:CompilerEvent, lineNumber?: number)` so that  compilers with a line number could pass that in directly.
diff --git a/developer/src/build.sh b/developer/src/build.sh
index d01c6caeb8..6e23dc8c0a 100755
--- a/developer/src/build.sh
+++ b/developer/src/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$KEYMAN_ROOT/developer/src/packages.inc.sh"
 
@@ -66,7 +66,7 @@ builder_parse "$@"
 
 #-------------------------------------------------------------------------------------------------------------------
 
-if [[ $BUILDER_OS == win ]]; then
+if builder_is_windows; then
   source "$KEYMAN_ROOT/resources/build/win/environment.inc.sh"
 fi
 
diff --git a/developer/src/common/build.sh b/developer/src/common/build.sh
index b37c2bc948..8ef5a4a1f2 100755
--- a/developer/src/common/build.sh
+++ b/developer/src/common/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/developer/src/common/delphi/build.sh b/developer/src/common/delphi/build.sh
index 63680a5624..907621194f 100755
--- a/developer/src/common/delphi/build.sh
+++ b/developer/src/common/delphi/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/developer/src/common/web/build.sh b/developer/src/common/web/build.sh
index 7ca90bd986..9be3a521fa 100755
--- a/developer/src/common/web/build.sh
+++ b/developer/src/common/web/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/developer/src/common/web/test-helpers/build.sh b/developer/src/common/web/test-helpers/build.sh
index c1664cfddd..98b8e0b184 100755
--- a/developer/src/common/web/test-helpers/build.sh
+++ b/developer/src/common/web/test-helpers/build.sh
@@ -2,10 +2,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 builder_describe "Keyman Developer unit test helpers" \
   "@/developer/src/common/web/utils" \
@@ -20,6 +21,6 @@ builder_parse "$@"
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_action clean       rm -rf ./build/
-builder_run_action configure   verify_npm_setup
+builder_run_action configure   node_select_version_and_npm_ci
 builder_run_action build       tsc --build
 # builder_run_action test        # no tests at this time
diff --git a/developer/src/common/web/utils/build.sh b/developer/src/common/web/utils/build.sh
index 251588e2f6..7c0f8f0ed9 100755
--- a/developer/src/common/web/utils/build.sh
+++ b/developer/src/common/web/utils/build.sh
@@ -2,10 +2,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Build Keyman Developer web utility module" \
@@ -47,7 +49,7 @@ function do_build() {
 }
 
 builder_run_action clean       rm -rf ./build/
-builder_run_action configure   verify_npm_setup
+builder_run_action configure   node_select_version_and_npm_ci
 builder_run_action build       do_build
-builder_run_action test        builder_do_typescript_tests 45
+builder_run_action test        typescript_run_eslint_mocha_tests 45
 builder_run_action publish     builder_publish_npm
diff --git a/developer/src/common/web/utils/src/compiler-interfaces.ts b/developer/src/common/web/utils/src/compiler-interfaces.ts
index 3cce4e75ef..74231aaf2b 100644
--- a/developer/src/common/web/utils/src/compiler-interfaces.ts
+++ b/developer/src/common/web/utils/src/compiler-interfaces.ts
@@ -1,5 +1,5 @@
 import { CompilerCallbacks } from "./compiler-callbacks.js";
-import { ObjectWithMetadata } from "./symbol-utils.js";
+import { ObjectWithCompileContext } from '@keymanapp/common-types';
 import { KeymanXMLReader, XML_FILENAME_SYMBOL } from "./xml-utils.js";
 
 /**
@@ -215,9 +215,9 @@ export class CompilerError {
    * @param x any object parsed from XML or with the XML_META_DATA_SYMBOL symbol copied over
    * @returns modified event object
    */
-  public static setFromMetadata(event: CompilerEvent, x?: ObjectWithMetadata): CompilerEvent {
-    if(x) {
-      const metadata = KeymanXMLReader.getMetaData(x) || {};
+  public static setFromMetadata(event: CompilerEvent, compileContext?: ObjectWithCompileContext): CompilerEvent {
+    if (compileContext) {
+      const metadata = KeymanXMLReader.getMetaData(compileContext) || {};
       const offset = metadata?.startIndex;
       if (offset) {
         event.offset = offset;
@@ -458,8 +458,8 @@ export function dedentCompilerMessageDetail(event: CompilerEvent) {
  *  //      it contains redundant info.
  *  //   2. No code execution within the arrow function other than the 'mx' call, string interpolation,
  *  //      with `${def(o.property)}` as the max complexity of interpolation.
- *  static Error_InvalidScanCode = (o:{id: string, invalidCodeList: string}, x: ObjectWithMetadata) => mx(
- *    this.ERROR_InvalidScanCode, x,
+ *  static Error_InvalidScanCode = (o:{id: string, invalidCodeList: string}, compileContext: ObjectWithCompileContext) => mx(
+ *    this.ERROR_InvalidScanCode, compileContext,
  *  `Form '${def(o.id)}' has invalid/unknown scancodes '${def(o.codes)}'`,
  *  // Note: If detail is omitted, leave the trailing comma on the prior line to leave room for it
  *  `…additional markdown detail…`
@@ -474,7 +474,7 @@ export function dedentCompilerMessageDetail(event: CompilerEvent) {
  * @see CompilerMessageSpec
  * @returns the event
  */
-export function CompilerMessageObjectSpec(code: number, context: ObjectWithMetadata, message: string, detail?: string): CompilerEvent {
+export function CompilerMessageObjectSpec(code: number, context: ObjectWithCompileContext, message: string, detail?: string): CompilerEvent {
   let evt = CompilerMessageSpec(code, message, detail); // constructs raw message
   evt = CompilerError.setFromMetadata(evt, context); // updates with offset from context
   return evt;
diff --git a/developer/src/common/web/utils/src/developer-utils-messages.ts b/developer/src/common/web/utils/src/developer-utils-messages.ts
index 6fd328802b..917af99e70 100644
--- a/developer/src/common/web/utils/src/developer-utils-messages.ts
+++ b/developer/src/common/web/utils/src/developer-utils-messages.ts
@@ -1,8 +1,9 @@
 /*
  * Keyman is copyright (C) SIL Global. MIT License.
  */
-import { CompilerErrorNamespace, CompilerErrorSeverity,  CompilerMessageDef as def, CompilerMessageSpec as m } from './compiler-interfaces.js';
+import { CompilerErrorNamespace, CompilerErrorSeverity,  CompilerMessageDef as def, CompilerMessageSpec as m, CompilerMessageObjectSpec as mx } from './compiler-interfaces.js';
 import { constants } from '@keymanapp/ldml-keyboard-constants';
+import { ObjectWithCompileContext } from '@keymanapp/common-types';
 
 const DeveloperUtilsErrMask   = CompilerErrorNamespace.DeveloperUtils;
 // const SevInfo = CompilerErrorSeverity.Info   | DeveloperUtilsErrMask;
@@ -14,8 +15,10 @@ const SevError = CompilerErrorSeverity.Error | DeveloperUtilsErrMask;
 export class DeveloperUtilsMessages {
   // structured Ajv validation error
   static ERROR_SchemaValidationError = SevError | 0x0001;
-  static Error_SchemaValidationError = (o:{instancePath:string, keyword:string, message: string, params: string}) => m(this.ERROR_SchemaValidationError,
-    `Error validating LDML XML file: ${def(o.instancePath)}: ${def(o.keyword)}: ${def(o.message)} ${def(o.params)}`);
+  static Error_SchemaValidationError = (o:{instancePath:string, keyword:string, message: string, params: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_SchemaValidationError, compileContext,
+    `Error validating LDML XML file: ${def(o.instancePath)}: ${def(o.keyword)}: ${def(o.message)} ${def(o.params)}`,
+  );
 
   static ERROR_ImportInvalidBase = SevError | 0x0002;
   static Error_ImportInvalidBase = (o: { base: string, path: string, subtag: string }) =>
diff --git a/developer/src/common/web/utils/src/index.ts b/developer/src/common/web/utils/src/index.ts
index c39afa8bff..a414139584 100644
--- a/developer/src/common/web/utils/src/index.ts
+++ b/developer/src/common/web/utils/src/index.ts
@@ -67,8 +67,8 @@ export { UrlSubpathCompilerCallback } from './utils/UrlSubpathCompilerCallback.j
 
 export { DeveloperUtilsMessages } from './developer-utils-messages.js';
 export * as SourceFilenamePatterns from './source-filename-patterns.js';
-export { KeymanXMLType, KeymanXMLWriter, KeymanXMLReader, KeymanXMLMetadata, XML_FILENAME_SYMBOL } from './xml-utils.js';
-export { SymbolUtils, ObjectWithMetadata } from './symbol-utils.js';
+export { KeymanXMLType, KeymanXMLWriter, KeymanXMLReader, KeymanXMLMetadata, XML_FILENAME_SYMBOL, withOffset } from './xml-utils.js';
+export { SymbolUtils } from './symbol-utils.js';
 export * as LineUtils from './line-utils.js';
 export * as GitHubUrls from './github-urls.js';
 export * as CloudUrls from './cloud-urls.js';
diff --git a/developer/src/common/web/utils/src/symbol-utils.ts b/developer/src/common/web/utils/src/symbol-utils.ts
index 9404b404d8..a340344c9c 100644
--- a/developer/src/common/web/utils/src/symbol-utils.ts
+++ b/developer/src/common/web/utils/src/symbol-utils.ts
@@ -6,13 +6,7 @@
  * Utilities for manipulating Symbol properties
  */
 
-
-/**
- * Any object with metadata, for example for line number errs.
- * Defined as 'any' here to reduce noise on the client side.
- * @see {@link KeymanXMLReader.getMetaData()}
- */
-export type ObjectWithMetadata = any;
+import { ObjectWithCompileContext } from '@keymanapp/common-types';
 
 export class SymbolUtils {
   /**
@@ -21,8 +15,8 @@ export class SymbolUtils {
    * @param from source for symbols
    * @returns the onto object
    */
-  public static copySymbols<T>(onto: T, from: ObjectWithMetadata): T {
-    const o = onto as ObjectWithMetadata;
+  public static copySymbols<T>(onto: T, from: ObjectWithCompileContext): T {
+    const o = onto as ObjectWithCompileContext;
     for (const sym of Object.getOwnPropertySymbols(from)) {
       o[sym] = from[sym];
     }
diff --git a/developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-xml-reader.ts b/developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-xml-reader.ts
index 0a31bc051b..f25b03582d 100644
--- a/developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-xml-reader.ts
+++ b/developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-xml-reader.ts
@@ -12,7 +12,7 @@ import { constants } from '@keymanapp/ldml-keyboard-constants';
 import { LDMLKeyboardTestDataXMLSourceFile, LKTTest, LKTTests } from './ldml-keyboard-testdata-xml.js';
 import boxXmlArray = util.boxXmlArray;
 import { LineFinderEventResolver } from '../../line-utils.js';
-import { XML_FILENAME_SYMBOL, KeymanXMLReader } from '../../xml-utils.js';
+import { XML_FILENAME_SYMBOL, KeymanXMLReader, findInstanceObject } from '../../xml-utils.js';
 
 interface NameAndProps  {
   '$'?: any; // content
@@ -310,12 +310,13 @@ export class LDMLKeyboardXMLSourceFileReader implements EventResolver {
   public validate(source: LDMLKeyboardXMLSourceFile | LDMLKeyboardTestDataXMLSourceFile): boolean {
     if(!SchemaValidators.default.ldmlKeyboard3(source)) {
       for (const err of (<any>SchemaValidators.default.ldmlKeyboard3).errors) {
+        const context = findInstanceObject(source, err?.instancePath?.split('/'));
         this.callbacks.reportMessage(DeveloperUtilsMessages.Error_SchemaValidationError({
           instancePath: err.instancePath,
           keyword: err.keyword,
           message: err.message || 'Unknown AJV Error', // docs say 'message' is optional if 'messages:false' in options
           params: Object.entries(err.params || {}).sort().map(([k,v])=>`${k}="${v}"`).join(' '),
-        }));
+        }, context));
       }
       return false;
     }
diff --git a/developer/src/common/web/utils/src/xml-utils.ts b/developer/src/common/web/utils/src/xml-utils.ts
index f83ca75dc7..9da6c00071 100644
--- a/developer/src/common/web/utils/src/xml-utils.ts
+++ b/developer/src/common/web/utils/src/xml-utils.ts
@@ -360,3 +360,40 @@ export class KeymanXMLWriter {
   }
 }
 
+/**
+ * traverse an AJV instancePath and map to an object if possible
+ * @param source object tree root (contains the root object)
+ * @param path ajv split instancePath, such as '/keyboard3/layers/0'.split('/')
+ * @returns undefined if the path was not present, null if path went to something that wasn't an object, otherwise the compileContext object is returned.
+ */
+export function findInstanceObject(source: any, path: string[]) : any {
+  if(!path || !source || path.length == 0) {
+    return source;
+  } else if(path[0] == '') {
+    return findInstanceObject(source, path.slice(1));
+  } else if(Array.isArray(source) || typeof source == 'object') {
+    const child = source[path[0]];
+    if (child == undefined) return child; // nothing here
+    if (!child || typeof child == 'string') {
+      return source; // return the *parent* object if the child is empty (could be a property)
+    }
+    return findInstanceObject(child, path.slice(1));
+  } else {
+    return null;
+  }
+}
+
+/**
+ * Return an object simulating an XML object with an offset number
+ * For use in calling message functions
+ * @param c number for the offset setting
+ * @param x if set, this object will be used as the base object instead of {}
+ */
+export function withOffset(c: number, compileContext?: any) : KeymanXMLMetadata {
+  // set metadata on an empty object
+  const o = Object.assign({}, compileContext);
+  KeymanXMLReader.setMetaData(o, {
+    startIndex: c
+  });
+  return o;
+}
diff --git a/developer/src/common/web/utils/test/ldml/ldml-keyboard-xml-reader.tests.ts b/developer/src/common/web/utils/test/ldml/ldml-keyboard-xml-reader.tests.ts
index d09c1dfc41..286edd7958 100644
--- a/developer/src/common/web/utils/test/ldml/ldml-keyboard-xml-reader.tests.ts
+++ b/developer/src/common/web/utils/test/ldml/ldml-keyboard-xml-reader.tests.ts
@@ -8,7 +8,7 @@ import { testReaderCases } from '../helpers/reader-callback-test.js';
 import CLDRScanToVkey = Constants.CLDRScanToVkey;
 import CLDRScanToKeyMap = Constants.CLDRScanToKeyMap;
 import USVirtualKeyCodes = Constants.USVirtualKeyCodes;
-import { KeymanXMLReader, XML_FILENAME_SYMBOL } from '../../src/xml-utils.js';
+import { KeymanXMLReader, withOffset, XML_FILENAME_SYMBOL } from '../../src/xml-utils.js';
 
 function pluckKeysFromKeybag(keys: LKKey[], ids: string[]) {
   return keys.filter(({id}) => ids.indexOf(id) !== -1);
@@ -25,7 +25,7 @@ describe('ldml keyboard xml reader tests', function () {
         keyword: 'required',
         message: `must have required property 'info'`,
         params: 'missingProperty="info"',
-      })],
+      }, withOffset(39))],
     },
     {
       subpath: 'invalid-conforms-to.xml',
@@ -34,7 +34,7 @@ describe('ldml keyboard xml reader tests', function () {
         keyword: 'enum',
         message: `must be equal to one of the allowed values`,
         params: 'allowedValues="45,46"', // this has to be kept in sync with the DTD
-      })],
+      }, withOffset(39))],
     },
     {
       subpath: 'import-minimal.xml',
diff --git a/developer/src/common/web/utils/test/xml-utils.tests.ts b/developer/src/common/web/utils/test/xml-utils.tests.ts
index 4b3df736b6..ec4f1ae80c 100644
--- a/developer/src/common/web/utils/test/xml-utils.tests.ts
+++ b/developer/src/common/web/utils/test/xml-utils.tests.ts
@@ -12,7 +12,7 @@ import { env } from 'node:process';
 import { readFileSync, writeFileSync } from 'node:fs';
 
 
-import { KeymanXMLType, KeymanXMLReader, KeymanXMLWriter } from '../src/xml-utils.js';
+import { KeymanXMLType, KeymanXMLReader, KeymanXMLWriter, findInstanceObject } from '../src/xml-utils.js';
 import { LineFinder } from '../src/line-utils.js';
 import { makePathToFixture } from './helpers/index.js';
 import { SymbolUtils } from '../src/symbol-utils.js';
@@ -198,5 +198,36 @@ describe(`XML Reader line number test`, () => {
       LineFinder.offsetToLineColumn(
         getMetaData(actual.keyboard3.transforms).startIndex, lines), { line: 8, column: 2 });
   });
+  describe('findInstanceObject test', () => {
+    const path0 = '/keyboard3/layers/0';
+    const TARGET = Symbol("Looking for this!");
+    it(`Should be able to parse ${path0}`, () => {
+      const o = {
+        keyboard3: {
+          layers: [
+            TARGET,
+          ]
+        }
+      };
+      assert.equal(findInstanceObject(o, path0.split('/')), TARGET);
+    });
+    // path to property
+    const path1 = '/keyboard3/conformsTo';
+    it(`Should be able to parse ${path1}`, () => {
+      const keyboard3 = { conformsTo: "1234"};
+      const o = {
+        keyboard3,
+      };
+      assert.equal(findInstanceObject(o, path1.split('/')), keyboard3);
+    });
+    const path2 = '/keyboard3/bad/path';
+    it(`Should be able to handle ${path2}`, () => {
+      const keyboard3 = { conformsTo: "1234"};
+      const o = {
+        keyboard3,
+      };
+      assert.equal(findInstanceObject(o, path2.split('/')), undefined);
+    });
+  });
 });
 
diff --git a/developer/src/ext/browse4folder/build.sh b/developer/src/ext/browse4folder/build.sh
index d59e17ee71..cc86bd3427 100755
--- a/developer/src/ext/browse4folder/build.sh
+++ b/developer/src/ext/browse4folder/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "browse4folder component" clean configure build test
diff --git a/developer/src/ext/build.sh b/developer/src/ext/build.sh
index 6dd7a576a1..fda45cef67 100755
--- a/developer/src/ext/build.sh
+++ b/developer/src/ext/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/developer/src/ext/jedi/build.sh b/developer/src/ext/jedi/build.sh
index d43ad7e1fb..226819d268 100755
--- a/developer/src/ext/jedi/build.sh
+++ b/developer/src/ext/jedi/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$THIS_SCRIPT_PATH"
diff --git a/developer/src/ext/mbcolor/build.sh b/developer/src/ext/mbcolor/build.sh
index 7d1a2d174a..bbfc3a6fdc 100755
--- a/developer/src/ext/mbcolor/build.sh
+++ b/developer/src/ext/mbcolor/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "mbcolor component" clean configure build test
diff --git a/developer/src/ext/scfontcombobox/build.sh b/developer/src/ext/scfontcombobox/build.sh
index 332f043875..72d0aec3fb 100755
--- a/developer/src/ext/scfontcombobox/build.sh
+++ b/developer/src/ext/scfontcombobox/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "scfontcombobox component" clean configure build test
diff --git a/developer/src/inst/build.sh b/developer/src/inst/build.sh
index 8f5b722506..8b37048e1e 100755
--- a/developer/src/inst/build.sh
+++ b/developer/src/inst/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-source "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+source "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 source "$KEYMAN_ROOT/resources/build/jq.inc.sh"
 
 builder_describe "Installation files for Keyman Developer" \
@@ -20,9 +20,9 @@ builder_describe_outputs \
 
 builder_parse "$@"
 
-. "$KEYMAN_ROOT/resources/build/win/environment.inc.sh"
-. "$KEYMAN_ROOT/resources/build/win/wix.inc.sh"
-. "$KEYMAN_ROOT/resources/build/win/zip.inc.sh"
+. "${KEYMAN_ROOT}/resources/build/win/environment.inc.sh"
+. "${KEYMAN_ROOT}/resources/build/win/wix.inc.sh"
+. "${KEYMAN_ROOT}/resources/build/zip.inc.sh"
 
 # In dev environments, we'll hack the tier to alpha; CI sets this for us in real builds.
 if [[ -z ${KEYMAN_TIER+x} ]]; then
@@ -51,7 +51,7 @@ function do_clean() {
 #-------------------------------------------------------------------------------------------------------------------
 
 function do_publish() {
-  verify-program-signatures
+  builder_if_release_build_level verify-program-signatures
   verify-node-installer-version
 
   "$KEYMAN_ROOT/common/windows/cef-checkout.sh"
@@ -80,7 +80,7 @@ function do_publish() {
 
   copy-kmdev
 
-  verify-installer-signatures
+  builder_if_release_build_level verify-installer-signatures
 }
 
 function do_test() {
@@ -233,7 +233,7 @@ function make-installer() {
   echo "Version=$KEYMAN_VERSION" >> setup.inf
   echo "MSIFileName=keymandeveloper.msi" >> setup.inf
   echo "Title=Keyman Developer ${KEYMAN_VERSION_WITH_TAG}" >>setup.inf
-  wzzip setup.zip keymandeveloper.msi setup.inf
+  add_zip_files setup.zip keymandeveloper.msi setup.inf
   cat "$DEVELOPER_PROGRAM/setup.exe" setup.zip > "keymandeveloper-$KEYMAN_VERSION.exe"
   wrap-signcode //d "Keyman Developer" "keymandeveloper-$KEYMAN_VERSION.exe"
 
@@ -242,27 +242,24 @@ function make-installer() {
   #
 }
 
-# TODO: rename this to keyman-developer-cli-$Version.zip
-KMC_ZIP="$DEVELOPER_ROOT/release/$KEYMAN_VERSION/kmcomp-$KEYMAN_VERSION.zip"
-
 function make-kmc-install-zip() {
   builder_heading make-kmc-install-zip
 
   copy-schemas
-  cd "$DEVELOPER_ROOT/bin"
+  (
+    # shellcheck disable=2164
+    cd "${DEVELOPER_ROOT}/bin"
 
-  wzzip -bd -bb0 "$KMC_ZIP" \
-    kmconvert.exe \
-    sentry.dll sentry.x64.dll \
-    kmdecomp.exe \
-    keyboard_info.schema.json \
-    kmp.schema.json \
-    keyman-touch-layout.spec.json keyman-touch-layout.clean.spec.json \
-    xml/layoutbuilder/*.keyman-touch-layout \
-    projects/* \
-    server/*
+    # TODO: rename this to keyman-developer-cli-$Version.zip
+    local KMCOMP_ZIP="${DEVELOPER_ROOT}/release/${KEYMAN_VERSION}/kmcomp-${KEYMAN_VERSION}.zip"
 
-  cd "$THIS_SCRIPT_PATH"
+    add_zip_files "${KMCOMP_ZIP}" -q -r \
+      kmconvert.exe \
+      keyboard_info.schema.json \
+      xml/layoutbuilder/*.keyman-touch-layout \
+      projects/ \
+      server/
+  )
 }
 
 # TODO: are these required?
diff --git a/developer/src/kmanalyze/build.sh b/developer/src/kmanalyze/build.sh
index 0e07044ffc..a72381557f 100755
--- a/developer/src/kmanalyze/build.sh
+++ b/developer/src/kmanalyze/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Legacy keyboard source analysis tool" \
@@ -32,7 +32,7 @@ function do_build() {
   build_version.res
   vs_msbuild kmanalyze.vcxproj //t:Build "//p:Platform=Win32"
   cp "$WIN32_TARGET" "$DEVELOPER_PROGRAM"
-  cp "$WIN32_TARGET_PATH/kmanalyze.pdb" "$DEVELOPER_DEBUGPATH"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/kmanalyze.pdb" "$DEVELOPER_DEBUGPATH"
 }
 
 function do_publish() {
diff --git a/developer/src/kmc-analyze/build.sh b/developer/src/kmc-analyze/build.sh
index ace83ffbbe..d54ed8927f 100755
--- a/developer/src/kmc-analyze/build.sh
+++ b/developer/src/kmc-analyze/build.sh
@@ -2,10 +2,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Keyman Developer Compiler Analysis Tools" \
@@ -26,8 +28,8 @@ builder_parse "$@"
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_action clean      rm -rf ./build/
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
 builder_run_action api        api-extractor run --local --verbose
-builder_run_action test       builder_do_typescript_tests 70
+builder_run_action test       typescript_run_eslint_mocha_tests 70
 builder_run_action publish    builder_publish_npm
diff --git a/developer/src/kmc-copy/build.sh b/developer/src/kmc-copy/build.sh
index b681757be2..eb52215ec9 100755
--- a/developer/src/kmc-copy/build.sh
+++ b/developer/src/kmc-copy/build.sh
@@ -5,10 +5,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Build Keyman kmc-copy module" \
@@ -32,13 +34,13 @@ builder_parse "$@"
 
 
 builder_run_action clean      rm -rf ./build/
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
 builder_run_action api        api-extractor run --local --verbose
 
 # note: `export TEST_SAVE_ARTIFACTS=1` to save a copy of artifacts to temp path
 # note: `export TEST_SAVE_FIXTURES=1` to get a copy of cloud-based fixtures saved to online/
 # TODO: -skip-full
-builder_run_action test       builder_do_typescript_tests 75
+builder_run_action test       typescript_run_eslint_mocha_tests 75
 
 builder_run_action publish    builder_publish_npm
diff --git a/developer/src/kmc-generate/build.sh b/developer/src/kmc-generate/build.sh
index 7db46acd56..f1762f4ccf 100755
--- a/developer/src/kmc-generate/build.sh
+++ b/developer/src/kmc-generate/build.sh
@@ -5,10 +5,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Build Keyman kmc-generate module" \
@@ -38,8 +40,8 @@ do_build() {
 }
 
 builder_run_action clean      rm -rf ./build/ ./tsconfig.tsbuildinfo
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      do_build
 builder_run_action api        api-extractor run --local --verbose
-builder_run_action test       builder_do_typescript_tests
+builder_run_action test       typescript_run_eslint_mocha_tests
 builder_run_action publish    builder_publish_npm
diff --git a/developer/src/kmc-keyboard-info/build.sh b/developer/src/kmc-keyboard-info/build.sh
index 87902b6876..b22d973636 100755
--- a/developer/src/kmc-keyboard-info/build.sh
+++ b/developer/src/kmc-keyboard-info/build.sh
@@ -2,10 +2,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 
 builder_describe "Build Keyman kmc keyboard-info Compiler module" \
   "@/common/web/langtags" \
@@ -31,10 +33,10 @@ builder_parse "$@"
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_action clean       rm -rf ./build/ ./tsconfig.tsbuildinfo
-builder_run_action configure   verify_npm_setup
+builder_run_action configure   node_select_version_and_npm_ci
 builder_run_action build       tsc --build
 builder_run_action api         api-extractor run --local --verbose
-builder_run_action test        builder_do_typescript_tests
+builder_run_action test        typescript_run_eslint_mocha_tests
 
 #-------------------------------------------------------------------------------------------------------------------
 
diff --git a/developer/src/kmc-kmn/build.sh b/developer/src/kmc-kmn/build.sh
index c6ed29b6f9..867f791bf9 100755
--- a/developer/src/kmc-kmn/build.sh
+++ b/developer/src/kmc-kmn/build.sh
@@ -5,10 +5,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Keyman Developer Compiler Module for .kmn to .kmx" \
@@ -43,7 +45,7 @@ fi
 #-------------------------------------------------------------------------------------------------------------------
 
 if builder_start_action configure; then
-  verify_npm_setup
+  node_select_version_and_npm_ci
   builder_finish_action success configure
 fi
 
@@ -63,7 +65,7 @@ function do_build() {
 
 function do_test() {
   copy_deps
-  builder_do_typescript_tests 80
+  typescript_run_eslint_mocha_tests 80
 }
 
 builder_run_action build      do_build
diff --git a/developer/src/kmc-kmn/src/compiler/compiler.ts b/developer/src/kmc-kmn/src/compiler/compiler.ts
index 21985ad09a..403f721f90 100644
--- a/developer/src/kmc-kmn/src/compiler/compiler.ts
+++ b/developer/src/kmc-kmn/src/compiler/compiler.ts
@@ -6,7 +6,7 @@ TODO: implement additional interfaces:
 */
 
 // TODO: rename wasm-host?
-import { VisualKeyboard, KvkFileReader, LdmlKeyboardTypes, KeymanFileTypes, KvkFileWriter } from '@keymanapp/common-types';
+import { VisualKeyboard, KvkFileReader, LdmlKeyboardTypes, KeymanFileTypes, KvkFileWriter, ObjectWithCompileContext } from '@keymanapp/common-types';
 import {
   CompilerCallbacks, CompilerEvent, CompilerOptions, KeymanCompiler, KeymanCompilerArtifacts,
   KeymanCompilerArtifactOptional, KeymanCompilerResult, KeymanCompilerArtifact, KvksFileReader,
@@ -530,7 +530,7 @@ export class KmnCompiler implements KeymanCompiler, LdmlKeyboardTypes.UnicodeSet
    * @param rangeCount - number of ranges to allocate
    * @returns            UnicodeSet accessor object, or null on failure
    */
-  public parseUnicodeSet(pattern: string, rangeCount: number, x?: any) : LdmlKeyboardTypes.UnicodeSet | null {
+  public parseUnicodeSet(pattern: string, rangeCount: number, compileContext?: any) : LdmlKeyboardTypes.UnicodeSet | null {
     if(!this.verifyInitialized()) {
       /* c8 ignore next 2 */
       // verifyInitialized will set a callback if needed
@@ -563,7 +563,7 @@ export class KmnCompiler implements KeymanCompiler, LdmlKeyboardTypes.UnicodeSet
       // rc is negative: it's an error code.
       this.wasmExports.free(buf);
       // translate error code into callback
-      this.callbacks.reportMessage(getUnicodeSetError(rc, x));
+      this.callbacks.reportMessage(getUnicodeSetError(rc, compileContext));
       return null;
     }
   }
@@ -571,7 +571,7 @@ export class KmnCompiler implements KeymanCompiler, LdmlKeyboardTypes.UnicodeSet
   /**
    * @internal
    */
-  public sizeUnicodeSet(pattern: string, x?: any) : number {
+  public sizeUnicodeSet(pattern: string, compileContext?: any) : number {
     if(!this.verifyInitialized()) {
       /* c8 ignore next 2 */
       return null;
@@ -583,7 +583,7 @@ export class KmnCompiler implements KeymanCompiler, LdmlKeyboardTypes.UnicodeSet
     if (rc >= 0) {
       return rc;
     } else {
-      this.callbacks.reportMessage(getUnicodeSetError(rc, x));
+      this.callbacks.reportMessage(getUnicodeSetError(rc, compileContext));
       return -1;
     }
   }
@@ -594,7 +594,7 @@ export class KmnCompiler implements KeymanCompiler, LdmlKeyboardTypes.UnicodeSet
  * @param rc parseUnicodeSet error code
  * @returns the compiler event
  */
-function getUnicodeSetError(rc: number, x?: any) : CompilerEvent {
+function getUnicodeSetError(rc: number, compileContext?: ObjectWithCompileContext) : CompilerEvent {
   // from kmcmplib.h
   const KMCMP_ERROR_SYNTAX_ERR = -1;
   const KMCMP_ERROR_HAS_STRINGS = -2;
@@ -602,16 +602,16 @@ function getUnicodeSetError(rc: number, x?: any) : CompilerEvent {
   const KMCMP_FATAL_OUT_OF_RANGE = -4;
   switch(rc) {
     case KMCMP_ERROR_SYNTAX_ERR:
-       return KmnCompilerMessages.Error_UnicodeSetSyntaxError(x);
+       return KmnCompilerMessages.Error_UnicodeSetSyntaxError(compileContext);
     case KMCMP_ERROR_HAS_STRINGS:
-    return KmnCompilerMessages.Error_UnicodeSetHasStrings(x);
+    return KmnCompilerMessages.Error_UnicodeSetHasStrings(compileContext);
     case KMCMP_ERROR_UNSUPPORTED_PROPERTY:
-       return KmnCompilerMessages.Error_UnicodeSetHasProperties(x);
+       return KmnCompilerMessages.Error_UnicodeSetHasProperties(compileContext);
     case KMCMP_FATAL_OUT_OF_RANGE:
-      return KmnCompilerMessages.Fatal_UnicodeSetOutOfRange(x);
+      return KmnCompilerMessages.Fatal_UnicodeSetOutOfRange(compileContext);
     default:
       /* c8 ignore next */
-      return CompilerError.setFromMetadata(KmnCompilerMessages.Fatal_UnexpectedException({e: `Unexpected UnicodeSet error code ${rc}`}), x);
+      return CompilerError.setFromMetadata(KmnCompilerMessages.Fatal_UnexpectedException({e: `Unexpected UnicodeSet error code ${rc}`}), compileContext);
   }
 }
 
diff --git a/developer/src/kmc-kmn/src/compiler/kmn-compiler-messages.ts b/developer/src/kmc-kmn/src/compiler/kmn-compiler-messages.ts
index 3274a62ca1..46f573f253 100644
--- a/developer/src/kmc-kmn/src/compiler/kmn-compiler-messages.ts
+++ b/developer/src/kmc-kmn/src/compiler/kmn-compiler-messages.ts
@@ -1,7 +1,7 @@
 import { KeyAddress } from "../kmw-compiler/validate-layout-file.js";
 import { kmnfile } from "../kmw-compiler/compiler-globals.js";
-import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerEvent, CompilerMessageSpec as m, CompilerMessageObjectSpec as mx, CompilerMessageDef as def, CompilerMessageSpecWithException, KeymanUrls, ObjectWithMetadata } from "@keymanapp/developer-utils";
-
+import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerEvent, CompilerMessageSpec as m, CompilerMessageObjectSpec as mx, CompilerMessageDef as def, CompilerMessageSpecWithException, KeymanUrls } from "@keymanapp/developer-utils";
+import { ObjectWithCompileContext } from "@keymanapp/common-types";
 const Namespace = CompilerErrorNamespace.KmnCompiler;
 const SevInfo = CompilerErrorSeverity.Info | Namespace;
 const SevHint = CompilerErrorSeverity.Hint | Namespace;
@@ -107,8 +107,8 @@ export class KmnCompilerMessages {
   );
 
   static FATAL_UnicodeSetOutOfRange = SevFatal | 0x904;
-  static Fatal_UnicodeSetOutOfRange = (x?: ObjectWithMetadata) => mx(
-    this.FATAL_UnicodeSetOutOfRange, x,
+  static Fatal_UnicodeSetOutOfRange = (compileContext?: ObjectWithCompileContext) => mx(
+    this.FATAL_UnicodeSetOutOfRange, compileContext,
     `UnicodeSet buffer was too small`,
     `Raised when caller to UnicodeSet functions provides an invalid buffer. If
     you experience this error, it should be reported to the Keyman team for
@@ -118,8 +118,8 @@ export class KmnCompilerMessages {
   // TODO: rename the following functions to Error_UsetHasStrings etc
 
   static ERROR_UnicodeSetHasStrings = SevError | 0x905;
-  static Error_UnicodeSetHasStrings = (x?: ObjectWithMetadata) => mx(
-    this.ERROR_UnicodeSetHasStrings, x,
+  static Error_UnicodeSetHasStrings = (compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_UnicodeSetHasStrings, compileContext,
     `uset contains strings, not allowed`,
     `The provided uset uses multi-character strings, (\`{}\` notation, e.g.
     \`[żġħ{ie}{għ}]\`. ). Although full UnicodeSets support strings, LDML
@@ -130,8 +130,8 @@ export class KmnCompilerMessages {
   );
 
   static ERROR_UnicodeSetHasProperties = SevError | 0x906;
-  static Error_UnicodeSetHasProperties = (x?: ObjectWithMetadata) => mx(
-    this.ERROR_UnicodeSetHasProperties, x,
+  static Error_UnicodeSetHasProperties = (compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_UnicodeSetHasProperties, compileContext,
     `uset contains properties, not allowed`,
     `The provided uset uses property notation (\`\\p{…}\` or \`[:…:]\`). LDML
     keyboards do not support Unicode properties in usets, because that would
@@ -142,8 +142,8 @@ export class KmnCompilerMessages {
   );
 
   static ERROR_UnicodeSetSyntaxError = SevError | 0x907;
-  static Error_UnicodeSetSyntaxError = (x?: ObjectWithMetadata) => mx(
-    this.ERROR_UnicodeSetSyntaxError, x,
+  static Error_UnicodeSetSyntaxError = (compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_UnicodeSetSyntaxError, compileContext,
     `uset had a Syntax Error while parsing`,
     `The provided uset has a syntax error and could not be parsed. Verify the
     format of the uset against the specification.
diff --git a/developer/src/kmc-ldml/build.sh b/developer/src/kmc-ldml/build.sh
index 689291b247..73763be4d5 100755
--- a/developer/src/kmc-ldml/build.sh
+++ b/developer/src/kmc-ldml/build.sh
@@ -5,10 +5,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 
 builder_describe "Keyman kmc Keyboard Compiler module" \
   "@/common/web/keyman-version" \
@@ -38,7 +40,7 @@ function do_clean() {
 }
 
 function do_configure() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
   do_build_abnf
 }
 
@@ -87,7 +89,7 @@ builder_run_action configure       do_configure
 builder_run_action build           do_build
 builder_run_action build-fixtures  do_build_fixtures
 builder_run_action api             api-extractor run --local --verbose
-builder_run_action test            builder_do_typescript_tests  90
+builder_run_action test            typescript_run_eslint_mocha_tests  90
 
 #-------------------------------------------------------------------------------------------------------------------
 
diff --git a/developer/src/kmc-ldml/src/compiler/disp.ts b/developer/src/kmc-ldml/src/compiler/disp.ts
index fd15c8ace7..b38ef72531 100644
--- a/developer/src/kmc-ldml/src/compiler/disp.ts
+++ b/developer/src/kmc-ldml/src/compiler/disp.ts
@@ -62,7 +62,7 @@ export class DispCompiler extends SectionCompiler {
     const result = new Disp();
 
     // displayOptions
-    result.baseCharacter = sections.strs.allocString(this.keyboard3.displays?.displayOptions?.baseCharacter, { unescape: true, x: this.keyboard3?.displays?.displayOptions });
+    result.baseCharacter = sections.strs.allocString(this.keyboard3.displays?.displayOptions?.baseCharacter, { unescape: true, compileContext:this.keyboard3?.displays?.displayOptions });
 
     // displays
     result.disps = this.keyboard3.displays?.display.map(display => ({
@@ -70,13 +70,13 @@ export class DispCompiler extends SectionCompiler {
         stringVariables: true,
         markers: true,
         unescape: true,
-        x: display,
+        compileContext: display,
       }, sections),
-      id: sections.strs.allocString(display.keyId, { x: display }), // not escaped, not substituted
+      id: sections.strs.allocString(display.keyId, { compileContext: display }), // not escaped, not substituted
       display: sections.strs.allocString(display.display, {
         stringVariables: true,
         unescape: true,
-        x: display,
+        compileContext: display,
       }, sections),
     })) || []; // TODO-LDML: need coverage for the []
 
diff --git a/developer/src/kmc-ldml/src/compiler/empty-compiler.ts b/developer/src/kmc-ldml/src/compiler/empty-compiler.ts
index 79015dca6b..a88e861f58 100644
--- a/developer/src/kmc-ldml/src/compiler/empty-compiler.ts
+++ b/developer/src/kmc-ldml/src/compiler/empty-compiler.ts
@@ -1,7 +1,8 @@
 import { SectionIdent, constants } from '@keymanapp/ldml-keyboard-constants';
 import { SectionCompiler } from "./section-compiler.js";
 import { util, KMXPlus, LdmlKeyboardTypes } from "@keymanapp/common-types";
-import { CompilerCallbacks, LDMLKeyboard, ObjectWithMetadata } from "@keymanapp/developer-utils";
+import { CompilerCallbacks, LDMLKeyboard } from "@keymanapp/developer-utils";
+import { ObjectWithCompileContext } from "@keymanapp/common-types";
 import { VarsCompiler } from './vars.js';
 import { LdmlCompilerMessages } from './ldml-compiler-messages.js';
 
@@ -34,7 +35,7 @@ export class StrsCompiler extends EmptyCompiler {
     const strs = <KMXPlus.Strs>section;
 
     /** attempt to find a context object for the string */
-    function findContextForString(s: string): ObjectWithMetadata {
+    function findContextForString(s: string): ObjectWithCompileContext {
       // try exact match
       for(const str of strs.strings) {
         if (str.value == s) return str.context;
diff --git a/developer/src/kmc-ldml/src/compiler/keys.ts b/developer/src/kmc-ldml/src/compiler/keys.ts
index 3c890a5067..8656e7fbf2 100644
--- a/developer/src/kmc-ldml/src/compiler/keys.ts
+++ b/developer/src/kmc-ldml/src/compiler/keys.ts
@@ -324,16 +324,16 @@ export class KeysCompiler extends SectionCompiler {
 
       // allocate the in-memory <flick id=…>
       const flicks: KeysFlicks = new KeysFlicks(
-        sections.strs.allocString(flickId, { x: flick })
+        sections.strs.allocString(flickId, { compileContext: flick })
       );
 
       // add data from each segment
       for (const flickSegment of flick.flickSegment) {
         const { keyId, directions } = flickSegment;
-        const keyIdStr = sections.strs.allocString(keyId, { x: flickSegment });
+        const keyIdStr = sections.strs.allocString(keyId, { compileContext: flickSegment });
         const directionsList: ListItem = sections.list.allocListFromSpaces(
           directions,
-          { x: flickSegment },
+          { compileContext: flickSegment },
           sections);
         flicks.flicks.push({
           directions: directionsList,
@@ -370,20 +370,20 @@ export class KeysCompiler extends SectionCompiler {
       if (!!gap) {
         flags |= constants.keys_key_flags_gap;
       }
-      const id = sections.strs.allocString(key.id, { x: key });
+      const id = sections.strs.allocString(key.id, { compileContext: key });
       const longPress: ListItem = sections.list.allocListFromSpaces(
-        longPressKeyIds, { x: key },
+        longPressKeyIds, { compileContext: key },
         sections);
 
       const longPressDefault = sections.strs.allocString(longPressDefaultKeyId,
-        { x: key },
+        { compileContext: key },
         sections);
 
       const multiTap: ListItem = sections.list.allocListFromSpaces(
         multiTapKeyIds,
-        { x: key },
+        { compileContext: key },
         sections);
-      const keySwitch = sections.strs.allocString(layerId, { x: key }); // 'switch' is a reserved word
+      const keySwitch = sections.strs.allocString(layerId, { compileContext: key }); // 'switch' is a reserved word
 
       const toRaw = output;
 
@@ -396,7 +396,7 @@ export class KeysCompiler extends SectionCompiler {
           unescape: true,
           singleOk: true,
           nfd: true,
-          x: key,
+          compileContext: key,
         },
         sections);
       if (!to.isOneChar) {
diff --git a/developer/src/kmc-ldml/src/compiler/layr.ts b/developer/src/kmc-ldml/src/compiler/layr.ts
index 9dff22a5bf..baaf9282b5 100644
--- a/developer/src/kmc-ldml/src/compiler/layr.ts
+++ b/developer/src/kmc-ldml/src/compiler/layr.ts
@@ -60,7 +60,7 @@ export class LayrCompiler extends SectionCompiler {
     if (totalLayerCount === 0) { // TODO-LDML: does not validate touch layers yet
       // no layers seen anywhere
       valid = false;
-      this.callbacks.reportMessage(LdmlCompilerMessages.Error_MustBeAtLeastOneLayerElement(this.keyboard3?.layers[0]));
+      this.callbacks.reportMessage(LdmlCompilerMessages.Error_MustBeAtLeastOneLayerElement(this.keyboard3));
     }
     return valid;
   }
@@ -69,13 +69,13 @@ export class LayrCompiler extends SectionCompiler {
     const sect = new Layr();
 
     sect.lists = this.keyboard3.layers.map((layers) => {
-      const hardware = sections.strs.allocString(layers.formId, {x:layers});
+      const hardware = sections.strs.allocString(layers.formId, {compileContext: layers});
       // Already validated in validate
       const layerEntries = [];
       for (const layer of layers.layer) {
         const rows = layer.row.map((row) => {
           const erow: LayrRow = {
-            keys: row.keys.trim().split(/[ \t]+/).map((id) => sections.strs.allocString(id, { x: row })),
+            keys: row.keys.trim().split(/[ \t]+/).map((id) => sections.strs.allocString(id, { compileContext: row })),
           };
           // include linenumber info for row
           return SectionCompiler.copySymbols(erow, row);
@@ -84,7 +84,7 @@ export class LayrCompiler extends SectionCompiler {
         // push a layer entry for each modifier set
         for (const mod of mods) {
           layerEntries.push({
-            id: sections.strs.allocString(layer.id, {x:layer}),
+            id: sections.strs.allocString(layer.id, {compileContext: layer}),
             mod,
             rows,
           });
diff --git a/developer/src/kmc-ldml/src/compiler/ldml-compiler-messages.ts b/developer/src/kmc-ldml/src/compiler/ldml-compiler-messages.ts
index f76e0d3b3a..1f879f475b 100644
--- a/developer/src/kmc-ldml/src/compiler/ldml-compiler-messages.ts
+++ b/developer/src/kmc-ldml/src/compiler/ldml-compiler-messages.ts
@@ -1,4 +1,5 @@
-import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageObjectSpec as mx, CompilerMessageSpec as m, CompilerMessageDef as def, ObjectWithMetadata } from '@keymanapp/developer-utils';
+import { ObjectWithCompileContext } from "@keymanapp/common-types";
+import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageObjectSpec as mx, CompilerMessageSpec as m, CompilerMessageDef as def } from '@keymanapp/developer-utils';
 // const SevInfo = CompilerErrorSeverity.Info | CompilerErrorNamespace.LdmlKeyboardCompiler;
 const SevHint = CompilerErrorSeverity.Hint | CompilerErrorNamespace.LdmlKeyboardCompiler;
 const SevWarn = CompilerErrorSeverity.Warn | CompilerErrorNamespace.LdmlKeyboardCompiler;
@@ -13,38 +14,38 @@ const SevErrorTransform = SevError | 0xF00;
  */
 export class LdmlCompilerMessages {
   static HINT_NormalizationDisabled = SevHint | 0x0001;
-  static Hint_NormalizationDisabled = (x?: ObjectWithMetadata) => mx(
-    this.HINT_NormalizationDisabled, x,
+  static Hint_NormalizationDisabled = (compileContext?: ObjectWithCompileContext) => mx(
+    this.HINT_NormalizationDisabled, compileContext,
     `normalization=disabled is not recommended.`,
   );
 
   static ERROR_InvalidLocale = SevError | 0x0002;
-  static Error_InvalidLocale = (o:{tag: string}, x?: ObjectWithMetadata) => mx(
-    this.ERROR_InvalidLocale, x,
+  static Error_InvalidLocale = (o:{tag: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_InvalidLocale, compileContext,
     `Invalid BCP 47 locale form '${def(o.tag)}'`,
   );
 
   static ERROR_HardwareLayerHasTooManyRows = SevError | 0x0003;
-  static Error_HardwareLayerHasTooManyRows = (x?: ObjectWithMetadata) => mx(
-    this.ERROR_HardwareLayerHasTooManyRows, x,
+  static Error_HardwareLayerHasTooManyRows = (compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_HardwareLayerHasTooManyRows, compileContext,
     `'hardware' layer has too many rows`,
   );
 
   static ERROR_RowOnHardwareLayerHasTooManyKeys = SevError | 0x0004;
-  static Error_RowOnHardwareLayerHasTooManyKeys = (o: { row: number, hardware: string, modifiers: string }, x?: ObjectWithMetadata) => mx(
-    this.ERROR_RowOnHardwareLayerHasTooManyKeys, x,
+  static Error_RowOnHardwareLayerHasTooManyKeys = (o: { row: number, hardware: string, modifiers: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_RowOnHardwareLayerHasTooManyKeys, compileContext,
     `Row #${def(o.row)} on 'hardware' ${def(o.hardware)} layer for modifier ${def(o.modifiers)} has too many keys`,
   );
 
   static ERROR_KeyNotFoundInKeyBag = SevError | 0x0005;
-  static Error_KeyNotFoundInKeyBag = (o: { keyId: string, col: number, row: number, layer: string, form: string }, x?: ObjectWithMetadata) => mx(
-    this.ERROR_KeyNotFoundInKeyBag, x,
+  static Error_KeyNotFoundInKeyBag = (o: { keyId: string, col: number, row: number, layer: string, form: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_KeyNotFoundInKeyBag, compileContext,
     `Key '${def(o.keyId)}' in position #${def(o.col)} on row #${def(o.row)} of layer ${def(o.layer)}, form '${def(o.form)}' not found in key bag`,
   );
 
   static HINT_OneOrMoreRepeatedLocales = SevHint | 0x0006;
-  static Hint_OneOrMoreRepeatedLocales = (x?: ObjectWithMetadata) => mx(
-    this.HINT_OneOrMoreRepeatedLocales, x,
+  static Hint_OneOrMoreRepeatedLocales = (compileContext?: ObjectWithCompileContext) => mx(
+    this.HINT_OneOrMoreRepeatedLocales, compileContext,
     `After minimization, one or more locales is repeated and has been removed`,
   );
 
@@ -54,38 +55,38 @@ export class LdmlCompilerMessages {
   m(this.ERROR_InvalidFile, `The source file has an invalid structure: ${def(o.errorText)}`);
 
   static HINT_LocaleIsNotMinimalAndClean = SevHint | 0x0008;
-  static Hint_LocaleIsNotMinimalAndClean = (o:{sourceLocale: string, locale: string}, x?: ObjectWithMetadata) => mx(
-    this.HINT_LocaleIsNotMinimalAndClean, x,
+  static Hint_LocaleIsNotMinimalAndClean = (o:{sourceLocale: string, locale: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.HINT_LocaleIsNotMinimalAndClean, compileContext,
     `Locale '${def(o.sourceLocale)}' is not minimal or correctly formatted and should be '${def(o.locale)}'`,
   );
 
   static ERROR_InvalidScanCode = SevError | 0x0009;
-  static Error_InvalidScanCode = (o: { codes: string, id: string }, x?: ObjectWithMetadata) => mx(
-    this.ERROR_InvalidScanCode, x,
+  static Error_InvalidScanCode = (o: { codes: string, id: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_InvalidScanCode, compileContext,
     `Form '${def(o.id)}' has invalid/unknown scancodes '${def(o.codes)}'`,
   );
 
   static WARN_CustomForm = SevWarn | 0x000A;
-  static Warn_CustomForm = (o: { id: string }, x?: ObjectWithMetadata) => mx(
-    this.WARN_CustomForm, x,
+  static Warn_CustomForm = (o: { id: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.WARN_CustomForm, compileContext,
     `Custom <form id="${def(o.id)}"> element. Key layout may not be as expected.`,
   );
 
   static ERROR_GestureKeyNotFoundInKeyBag = SevError | 0x000B;
-  static Error_GestureKeyNotFoundInKeyBag = (o:{keyId: string, parentKeyId: string, attribute: string}, x?: ObjectWithMetadata) => mx(
-    this.ERROR_GestureKeyNotFoundInKeyBag, x,
+  static Error_GestureKeyNotFoundInKeyBag = (o:{keyId: string, parentKeyId: string, attribute: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_GestureKeyNotFoundInKeyBag, compileContext,
     `Key '${def(o.keyId)}' not found in key bag, referenced from other '${def(o.parentKeyId)}' in ${def(o.attribute)}`,
   );
 
   static HINT_NoDisplayForMarker = SevHint | 0x000C;
-  static Hint_NoDisplayForMarker = (o: { id: string }, x?: ObjectWithMetadata) => mx(
-    this.HINT_NoDisplayForMarker, x,
+  static Hint_NoDisplayForMarker = (o: { id: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.HINT_NoDisplayForMarker, compileContext,
     `Key element with id "${def(o.id)}" has only marker output, but there is no matching display element by output or keyId. Keycap may be blank.`,
   );
 
   static ERROR_InvalidVersion = SevError | 0x000D;
-  static Error_InvalidVersion = (o: { version: string; }, x?: ObjectWithMetadata) => mx(
-    this.ERROR_InvalidVersion, x,
+  static Error_InvalidVersion = (o: { version: string; }, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_InvalidVersion, compileContext,
     `Version number '${def(o.version)}' must be a semantic version format string with 'major.minor.patch' components.`,
     `The version number in the LDML keyboard file must be a [semantic
     version](https://semver.org) (semver) string. This string has a format of three
@@ -98,186 +99,186 @@ export class LdmlCompilerMessages {
   );
 
   static ERROR_MustBeAtLeastOneLayerElement = SevError | 0x000E;
-  static Error_MustBeAtLeastOneLayerElement = (x?: ObjectWithMetadata) => mx(
-    this.ERROR_MustBeAtLeastOneLayerElement, x,
+  static Error_MustBeAtLeastOneLayerElement = (compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_MustBeAtLeastOneLayerElement, compileContext,
     `The source file must contain at least one layer element.`,
   );
 
   static HINT_NoDisplayForSwitch = SevHint | 0x000F;
-  static Hint_NoDisplayForSwitch = (o: { id: string }, x?: ObjectWithMetadata) => mx(
-    this.HINT_NoDisplayForSwitch, x,
+  static Hint_NoDisplayForSwitch = (o: { id: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.HINT_NoDisplayForSwitch, compileContext,
     `Key element with id "${def(o.id)}" is a layer switch key, but there is no matching display element by keyId. Keycap may be blank.`,
   );
 
   static ERROR_DisplayIsRepeated = SevError | 0x0010;
-  static Error_DisplayIsRepeated = (o:{display?: string}, x?: ObjectWithMetadata) => mx(
-    this.ERROR_DisplayIsRepeated, x,
+  static Error_DisplayIsRepeated = (o:{display?: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_DisplayIsRepeated, compileContext,
     `display display='${def(o.display)}' refers to the same keyId or output as another entry.`,
   );
 
   static ERROR_KeyMissingToGapOrSwitch = SevError | 0x0011;
-  static Error_KeyMissingToGapOrSwitch = (o:{keyId: string}, x?: ObjectWithMetadata) => mx(
-    this.ERROR_KeyMissingToGapOrSwitch, x,
+  static Error_KeyMissingToGapOrSwitch = (o:{keyId: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_KeyMissingToGapOrSwitch, compileContext,
     `key id='${def(o.keyId)}' must have either output=, gap=, or layerId=.`,
   );
 
   static ERROR_ExcessHardware = SevError | 0x0012;
-  static Error_ExcessHardware = (o:{formId: string}, x?: ObjectWithMetadata) => mx(
-    this.ERROR_ExcessHardware, x,
+  static Error_ExcessHardware = (o:{formId: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_ExcessHardware, compileContext,
     `layers formId=${def(o.formId)}: Can only have one non-'touch' element`,
   );
 
   static ERROR_InvalidHardware = SevError | 0x0013;
-  static Error_InvalidHardware = (o: { formId: string }, x?: ObjectWithMetadata) => mx(
-    this.ERROR_InvalidHardware, x,
+  static Error_InvalidHardware = (o: { formId: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_InvalidHardware, compileContext,
     `layers has invalid value formId=${def(o.formId)}`,
   );
 
   static ERROR_InvalidModifier = SevError | 0x0014;
-  static Error_InvalidModifier = (o:{modifiers: string}, x?: ObjectWithMetadata) => mx(
-    this.ERROR_InvalidModifier, x,
+  static Error_InvalidModifier = (o:{modifiers: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_InvalidModifier, compileContext,
     `layer has invalid modifiers='${def(o.modifiers)}'`,
   );
 
   static ERROR_MissingFlicks = SevError | 0x0015;
-  static Error_MissingFlicks = (o: {id: string, flickId: string}, x?: ObjectWithMetadata) => mx(
-    this.ERROR_MissingFlicks, x,
+  static Error_MissingFlicks = (o: {id: string, flickId: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_MissingFlicks, compileContext,
     `key id=${def(o.id)} refers to missing flickId=${def(o.flickId)}`,
   );
 
   static ERROR_DuplicateVariable = SevError | 0x0016;
-  static Error_DuplicateVariable = (o:{id: string}, x?: ObjectWithMetadata) => mx(
-    this.ERROR_DuplicateVariable, x,
+  static Error_DuplicateVariable = (o:{id: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_DuplicateVariable, compileContext,
     `duplicate variable: id=${def(o.id)}`,
   );
 
   // Not hit due to XML parsing
   static ERROR_InvalidTransformsType = SevError | 0x0018;
-  static Error_InvalidTransformsType = (o:{type: string}, x?: ObjectWithMetadata) => mx(
-    this.ERROR_InvalidTransformsType, x,
+  static Error_InvalidTransformsType = (o:{type: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_InvalidTransformsType, compileContext,
     `Invalid transforms type: '${def(o.type)}'`,
   );
 
   static ERROR_DuplicateTransformsType = SevError | 0x0019;
-  static Error_DuplicateTransformsType = (o:{type: string}, x?: ObjectWithMetadata) => mx(
-    this.ERROR_DuplicateTransformsType, x,
+  static Error_DuplicateTransformsType = (o:{type: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_DuplicateTransformsType, compileContext,
     `Duplicate transforms type: '${def(o.type)}'`,
   );
 
   static ERROR_MixedTransformGroup = SevError | 0x001A;
-  static Error_MixedTransformGroup = (x?: ObjectWithMetadata) => mx(
-    this.ERROR_MixedTransformGroup, x,
+  static Error_MixedTransformGroup = (compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_MixedTransformGroup, compileContext,
     `transformGroup cannot contain both reorder and transform elements`,
   );
 
   static ERROR_EmptyTransformGroup = SevError | 0x001B;
-  static Error_EmptyTransformGroup = (x?: ObjectWithMetadata) => mx(
-    this.ERROR_EmptyTransformGroup, x,
+  static Error_EmptyTransformGroup = (compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_EmptyTransformGroup, compileContext,
     `transformGroup must have either reorder or transform elements`,
   );
 
   static ERROR_MissingStringVariable = SevError | 0x001C;
-  static Error_MissingStringVariable = (o:{id: string}, x?: ObjectWithMetadata) => mx(
-    this.ERROR_MissingStringVariable, x,
+  static Error_MissingStringVariable = (o:{id: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_MissingStringVariable, compileContext,
     `Reference to undefined string variable: \${${def(o.id)}}`,
   );
 
   static ERROR_MissingSetVariable = SevError | 0x001D;
-  static Error_MissingSetVariable = (o:{id: string}, x?: ObjectWithMetadata) => mx(
-    this.ERROR_MissingSetVariable, x,
+  static Error_MissingSetVariable = (o:{id: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_MissingSetVariable, compileContext,
     `Reference to undefined set variable: \$[${def(o.id)}]`,
   );
 
   static ERROR_MissingUnicodeSetVariable = SevError | 0x001E;
-  static Error_MissingUnicodeSetVariable = (o:{id: string}, x?: ObjectWithMetadata) => mx(
-    this.ERROR_MissingUnicodeSetVariable, x,
+  static Error_MissingUnicodeSetVariable = (o:{id: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_MissingUnicodeSetVariable, compileContext,
     `Reference to undefined UnicodeSet variable: \$[${def(o.id)}]`,
   );
 
   static ERROR_NeedSpacesBetweenSetVariables = SevError | 0x001F;
-  static Error_NeedSpacesBetweenSetVariables = (o:{item: string}, x?: ObjectWithMetadata) => mx(
-    this.ERROR_NeedSpacesBetweenSetVariables, x,
+  static Error_NeedSpacesBetweenSetVariables = (o:{item: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_NeedSpacesBetweenSetVariables, compileContext,
     `Need spaces between set variables: ${def(o.item)}`,
   );
 
   static ERROR_CantReferenceSetFromUnicodeSet = SevError | 0x0020;
-  static Error_CantReferenceSetFromUnicodeSet = (o:{id: string}, x?: ObjectWithMetadata) => mx(
-    this.ERROR_CantReferenceSetFromUnicodeSet, x,
+  static Error_CantReferenceSetFromUnicodeSet = (o:{id: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_CantReferenceSetFromUnicodeSet, compileContext,
     `Illegal use of set variable from within UnicodeSet: \$[${def(o.id)}]`
   );
 
   static ERROR_MissingMarkers = SevError | 0x0021;
-  static Error_MissingMarkers = (o: { ids: string }, x?: ObjectWithMetadata) => mx(
-    this.ERROR_MissingMarkers, x,
+  static Error_MissingMarkers = (o: { ids: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_MissingMarkers, compileContext,
     `Markers used for matching but not defined: ${def(o.ids)}`
   );
 
   static ERROR_DisplayNeedsToOrId = SevError | 0x0022;
-  static Error_DisplayNeedsToOrId = (o:{display?: string}, x?: ObjectWithMetadata) => mx(
-    this.ERROR_DisplayNeedsToOrId, x,
+  static Error_DisplayNeedsToOrId = (o:{display?: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_DisplayNeedsToOrId, compileContext,
     `display display='${def(o.display)}' needs output= or keyId=, but not both`,
   );
 
   static HINT_PUACharacters = SevHint | 0x0023;
-  static Hint_PUACharacters = (o: { count: number, lowestCh: string }, x?: ObjectWithMetadata) => mx(
-    this.HINT_PUACharacters, x,
+  static Hint_PUACharacters = (o: { count: number, lowestCh: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.HINT_PUACharacters, compileContext,
     `File contains ${def(o.count)} PUA character(s), including ${def(o.lowestCh)}`,
   );
 
   static WARN_UnassignedCharacters = SevWarn | 0x0024;
-  static Warn_UnassignedCharacters = (o: { count: number, lowestCh: string }, x?: ObjectWithMetadata) => mx(
-    this.WARN_UnassignedCharacters, x,
+  static Warn_UnassignedCharacters = (o: { count: number, lowestCh: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.WARN_UnassignedCharacters, compileContext,
     `File contains ${def(o.count)} unassigned character(s), including ${def(o.lowestCh)}`,
   );
 
   static ERROR_IllegalCharacters = SevError | 0x0025;
-  static Error_IllegalCharacters = (o: { count: number, lowestCh: string }, x?: ObjectWithMetadata) => mx(
-    this.ERROR_IllegalCharacters, x,
+  static Error_IllegalCharacters = (o: { count: number, lowestCh: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_IllegalCharacters, compileContext,
     `File contains ${def(o.count)} illegal character(s), including ${def(o.lowestCh) }`,
   );
 
   static HINT_CharClassImplicitDenorm = SevHint | 0x0026;
-  static Hint_CharClassImplicitDenorm = (o: { lowestCh: number }, x?: ObjectWithMetadata) => mx(
-    this.HINT_CharClassImplicitDenorm, x,
+  static Hint_CharClassImplicitDenorm = (o: { lowestCh: number }, compileContext?: ObjectWithCompileContext) => mx(
+    this.HINT_CharClassImplicitDenorm, compileContext,
     `File has character classes which span non-NFD character(s), including ${def(o.lowestCh)}. These will not match any text.`,
   );
 
   static WARN_CharClassExplicitDenorm = SevWarn | 0x0027;
-  static Warn_CharClassExplicitDenorm = (o: { lowestCh: number }, x?: ObjectWithMetadata) => mx(
-    this.WARN_CharClassExplicitDenorm, x,
+  static Warn_CharClassExplicitDenorm = (o: { lowestCh: number }, compileContext?: ObjectWithCompileContext) => mx(
+    this.WARN_CharClassExplicitDenorm, compileContext,
     `File has character classes which include non-NFD characters(s), including ${def(o.lowestCh)}. These will not match any text.`,
   );
 
   // Available: 0x0028
 
   static ERROR_InvalidVariableIdentifier = SevError | 0x0029;
-  static Error_InvalidVariableIdentifier = (o: { id: string }, x?: ObjectWithMetadata) => mx(
-    this.ERROR_InvalidVariableIdentifier, x,
+  static Error_InvalidVariableIdentifier = (o: { id: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_InvalidVariableIdentifier, compileContext,
     `Invalid variable identifier "${def(o.id)}". Identifiers must be between 1 and 32 characters, and can use A-Z, a-z, 0-9, and _.`,
   );
 
   static ERROR_InvalidMarkerIdentifier = SevError | 0x002A;
-  static Error_InvalidMarkerIdentifier = (o: { id: string }, x?: ObjectWithMetadata) => mx(
-    this.ERROR_InvalidMarkerIdentifier, x,
+  static Error_InvalidMarkerIdentifier = (o: { id: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_InvalidMarkerIdentifier, compileContext,
     `Invalid marker identifier "\m{${def(o.id)}}". Identifiers must be between 1 and 32 characters, and can use A-Z, a-z, 0-9, and _.`,
   );
 
   static WARN_StringDenorm = SevWarn | 0x002B;
-  static Warn_StringDenorm = (o: { s: string }, x?: ObjectWithMetadata) => mx(
-    this.WARN_StringDenorm, x,
+  static Warn_StringDenorm = (o: { s: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.WARN_StringDenorm, compileContext,
     `File contains string "${def(o.s)}" that is neither NFC nor NFD.`,
   );
 
   static ERROR_DuplicateLayerWidth = SevError | 0x002C;
-  static Error_DuplicateLayerWidth = (o: { minDeviceWidth: number }, x?: ObjectWithMetadata) => mx(
-    this.ERROR_DuplicateLayerWidth, x,
+  static Error_DuplicateLayerWidth = (o: { minDeviceWidth: number }, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_DuplicateLayerWidth, compileContext,
     `Two or more layers have minDeviceWidth=${def(o.minDeviceWidth)}`,
     `Touch layers must have distinct widths.`
   );
 
   static ERROR_InvalidLayerWidth = SevError | 0x002D;
-  static Error_InvalidLayerWidth = (o: { minDeviceWidth: number }, x?: ObjectWithMetadata) => mx(
-    this.ERROR_InvalidLayerWidth, x,
+  static Error_InvalidLayerWidth = (o: { minDeviceWidth: number }, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_InvalidLayerWidth, compileContext,
     `Invalid Layers minDeviceWidth=${def(o.minDeviceWidth)}`,
     `Width must be between 1-999 (millimeters), inclusive.` // sync with layr_max_minDeviceWidth / layr_max_maxDeviceWidth (from spec)
   );
@@ -285,8 +286,8 @@ export class LdmlCompilerMessages {
   // Available: 0x02E-0x2F
 
   static ERROR_InvalidQuadEscape = SevError | 0x0030;
-  static Error_InvalidQuadEscape = (o: { cp: string, recommended: string }, x?: ObjectWithMetadata) => mx(
-    this.ERROR_InvalidQuadEscape, x,
+  static Error_InvalidQuadEscape = (o: { cp: string, recommended: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_InvalidQuadEscape, compileContext,
     `Invalid escape "${def(o.cp)}"`,
     `**Hint**: Use "${def(o.recommended)}"`,
   );
@@ -296,8 +297,8 @@ export class LdmlCompilerMessages {
 
   // This is a bit of a catch-all and represents messages bubbling up from the underlying regex engine
   static ERROR_UnparseableTransformFrom   = SevErrorTransform | 0x00;
-  static Error_UnparseableTransformFrom   = (o: { from: string, message: string }, x?: ObjectWithMetadata) => mx(
-    this.ERROR_UnparseableTransformFrom, x,
+  static Error_UnparseableTransformFrom   = (o: { from: string, message: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_UnparseableTransformFrom, compileContext,
     `Invalid transform from="${def(o.from)}": "${def(o.message)}"`,
   );
 
@@ -306,8 +307,8 @@ export class LdmlCompilerMessages {
   //------------------------------------------------------------------------------|
 
   static ERROR_IllegalTransformDollarsign = SevErrorTransform | 0x01;
-  static Error_IllegalTransformDollarsign = (o: { from: string }, x?: ObjectWithMetadata) => mx(
-    this.ERROR_IllegalTransformDollarsign, x,
+  static Error_IllegalTransformDollarsign = (o: { from: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_IllegalTransformDollarsign, compileContext,
     `Invalid transform from="${def(o.from)}": Unescaped dollar-sign ($) is not valid transform syntax.`, `
     **Hint**: Use \`\\$\` to match a literal dollar-sign. If this precedes a
     variable name, the variable name may not be valid (A-Z, a-z, 0-9, _, 32
@@ -315,36 +316,36 @@ export class LdmlCompilerMessages {
   `);
 
   static ERROR_TransformFromMatchesNothing = SevErrorTransform | 0x02;
-  static Error_TransformFromMatchesNothing = (o: { from: string }, x?: ObjectWithMetadata) => mx(
-    this.ERROR_TransformFromMatchesNothing, x,
+  static Error_TransformFromMatchesNothing = (o: { from: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_TransformFromMatchesNothing, compileContext,
     `Invalid transfom from="${def(o.from)}": Matches an empty string.`
   );
 
   static ERROR_IllegalTransformPlus = SevErrorTransform | 0x03;
-  static Error_IllegalTransformPlus = (o: { from: string }, x?: ObjectWithMetadata) => mx(
-    this.ERROR_IllegalTransformPlus, x,
+  static Error_IllegalTransformPlus = (o: { from: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_IllegalTransformPlus, compileContext,
     `Invalid transform from="${def(o.from)}": Unescaped plus (+) is not valid transform syntax.`, `
     **Hint**: Use \`\\+\` to match a literal plus.
   `);
 
   static ERROR_IllegalTransformAsterisk = SevErrorTransform | 0x04;
-  static Error_IllegalTransformAsterisk = (o: { from: string }, x?: ObjectWithMetadata) =>mx(
-    this.ERROR_IllegalTransformAsterisk, x,
+  static Error_IllegalTransformAsterisk = (o: { from: string }, compileContext?: ObjectWithCompileContext) =>mx(
+    this.ERROR_IllegalTransformAsterisk, compileContext,
     `Invalid transform from="${def(o.from)}": Unescaped asterisk (*) is not valid transform syntax.`, `
     **Hint**: Use \`\\*\` to match a literal asterisk.
   `);
 
   static ERROR_IllegalTransformToUset = SevErrorTransform | 0x05;
-  static Error_IllegalTransformToUset = (o: { to: string }, x?: ObjectWithMetadata) => mx(
-    this.ERROR_IllegalTransformToUset, x,
+  static Error_IllegalTransformToUset = (o: { to: string }, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_IllegalTransformToUset, compileContext,
     `Invalid transform to="${def(o.to)}": Set variable (\\$[…]) cannot be used in 'to=' unless part of a map.`, `
     **Hint**: If a map was meant, must use the form
     \`<transform from="($[fromSet])" to="$[1:toSet]"/>\`.
   `);
 
   static ERROR_UnparseableTransformTo = SevErrorTransform | 0x06;
-  static Error_UnparseableTransformTo = (o: {to: string, message: string}, x?: ObjectWithMetadata) => mx(
-    this.ERROR_UnparseableTransformTo, x,
+  static Error_UnparseableTransformTo = (o: {to: string, message: string}, compileContext?: ObjectWithCompileContext) => mx(
+    this.ERROR_UnparseableTransformTo, compileContext,
     `Invalid transform to="${def(o.to)}": "${def(o.message)}"`,
   );
 }
diff --git a/developer/src/kmc-ldml/src/compiler/loca.ts b/developer/src/kmc-ldml/src/compiler/loca.ts
index 3cc222e613..d624dbaff1 100644
--- a/developer/src/kmc-ldml/src/compiler/loca.ts
+++ b/developer/src/kmc-ldml/src/compiler/loca.ts
@@ -1,6 +1,7 @@
 import { constants } from "@keymanapp/ldml-keyboard-constants";
 import { KMXPlus } from '@keymanapp/common-types';
-import { LDMLKeyboard, ObjectWithMetadata } from '@keymanapp/developer-utils';
+import { LDMLKeyboard } from '@keymanapp/developer-utils';
+import { ObjectWithCompileContext } from "@keymanapp/common-types";
 import { SectionCompiler } from "./section-compiler.js";
 import { LdmlCompilerMessages } from "./ldml-compiler-messages.js";
 
@@ -28,7 +29,7 @@ export class LocaCompiler extends SectionCompiler {
    * @param loc locale tag
    * @returns context metadata or null
    */
-  private contextForLocale(loc: string) : ObjectWithMetadata {
+  private contextForLocale(loc: string) : ObjectWithCompileContext {
     if (loc == this.keyboard3.locale) return this.keyboard3;
     return this.keyboard3?.locales;
   }
@@ -71,7 +72,7 @@ export class LocaCompiler extends SectionCompiler {
     // yet include `getCanonicalLocales` but node 16 does include it so we can
     // safely use it. Also well supported in modern browsers.
     const canonicalLocales = (Intl as any).getCanonicalLocales(locales) as string[];
-    result.locales = canonicalLocales.map(locale => sections.strs.allocString(locale, {x: this.contextForLocale(locale)}));
+    result.locales = canonicalLocales.map(locale => sections.strs.allocString(locale, {compileContext: this.contextForLocale(locale)}));
 
     if(result.locales.length < locales.length) {
       this.callbacks.reportMessage(LdmlCompilerMessages.Hint_OneOrMoreRepeatedLocales(this.keyboard3?.locales));
diff --git a/developer/src/kmc-ldml/src/compiler/meta.ts b/developer/src/kmc-ldml/src/compiler/meta.ts
index e6cd6371ee..eeb7f4f46c 100644
--- a/developer/src/kmc-ldml/src/compiler/meta.ts
+++ b/developer/src/kmc-ldml/src/compiler/meta.ts
@@ -54,17 +54,17 @@ export class MetaCompiler extends SectionCompiler {
   public compile(sections: DependencySections): Meta {
     const result = new Meta();
     result.author        = sections.strs.allocString(this.keyboard3.info?.author,
-                                                 {x: this.keyboard3.info});
+                                                 {compileContext: this.keyboard3.info});
     result.conform       = sections.strs.allocString(this.keyboard3.conformsTo,
-                                                 {x: this.keyboard3});
+                                                 {compileContext: this.keyboard3});
     result.layout        = sections.strs.allocString(this.keyboard3.info?.layout,
-                                                 {x: this.keyboard3.info});
+                                                 {compileContext: this.keyboard3.info});
     result.name          = sections.strs.allocString(this.keyboard3.info?.name,
-                                                 {x: this.keyboard3.info});
+                                                 {compileContext: this.keyboard3.info});
     result.indicator     = sections.strs.allocString(this.keyboard3.info?.indicator,
-                                                 {x: this.keyboard3.info});
+                                                 {compileContext: this.keyboard3.info});
     result.version       = sections.strs.allocString(this.keyboard3.version?.number ?? "0.0.0",
-                                                 {x: this.keyboard3.version});
+                                                 {compileContext: this.keyboard3.version});
     result.settings =
       (this.keyboard3.settings?.normalization == "disabled" ? KeyboardSettings.normalizationDisabled : 0);
     return result;
diff --git a/developer/src/kmc-ldml/src/compiler/substitution-tracker.ts b/developer/src/kmc-ldml/src/compiler/substitution-tracker.ts
index 61daefa0cf..9282655a64 100644
--- a/developer/src/kmc-ldml/src/compiler/substitution-tracker.ts
+++ b/developer/src/kmc-ldml/src/compiler/substitution-tracker.ts
@@ -1,5 +1,5 @@
 import { LdmlKeyboardTypes } from "@keymanapp/common-types";
-import { ObjectWithMetadata } from "@keymanapp/developer-utils";
+import { ObjectWithCompileContext } from '@keymanapp/common-types';
 
 /**
  * Verb for SubstitutionTracker.add()
@@ -15,7 +15,7 @@ export enum SubstitutionUse {
   variable,
 }
 
-type SubstitutionSet = Map<string, ObjectWithMetadata>;
+type SubstitutionSet = Map<string, ObjectWithCompileContext>;
 
 /** Tracks usage of markers */
 export class SubstitutionTracker {
@@ -29,10 +29,10 @@ export class SubstitutionTracker {
   all: SubstitutionSet;
 
   constructor() {
-    this.emitted =  new Map<string, ObjectWithMetadata>();
-    this.consumed = new Map<string, ObjectWithMetadata>();
-    this.matched =  new Map<string, ObjectWithMetadata>();
-    this.all =      new Map<string, ObjectWithMetadata>();
+    this.emitted =  new Map<string, ObjectWithCompileContext>();
+    this.consumed = new Map<string, ObjectWithCompileContext>();
+    this.matched =  new Map<string, ObjectWithCompileContext>();
+    this.all =      new Map<string, ObjectWithCompileContext>();
   }
 
   /**
@@ -40,33 +40,33 @@ export class SubstitutionTracker {
    * @param verb what kind of use we are adding
    * @param markers list of substitutions to add
    */
-  add(verb: SubstitutionUse, markers: string[], x?: ObjectWithMetadata) {
+  add(verb: SubstitutionUse, markers: string[], compileContext?: ObjectWithCompileContext) {
     if (!markers.length) {
       return; // skip if empty
     }
-    x = x || {}; // need at least an empty object
+    compileContext = compileContext || {}; // need at least an empty object
     if (verb == SubstitutionUse.emit) {
       markers.forEach((m) => {
-        this.emitted.set(m, x);
-        this.all.set(m,x);
+        this.emitted.set(m, compileContext);
+        this.all.set(m, compileContext);
       });
     } else if (verb == SubstitutionUse.consume) {
       markers.forEach((m) => {
-        this.consumed.set(m,x);
-        this.all.set(m,x);
+        this.consumed.set(m, compileContext);
+        this.all.set(m, compileContext);
       });
     } else if (verb == SubstitutionUse.match) {
       markers.forEach((m) => {
-        this.matched.set(m,x);
-        this.all.set(m,x);
+        this.matched.set(m, compileContext);
+        this.all.set(m, compileContext);
       });
     } else if (verb == SubstitutionUse.variable) {
       markers.forEach((m) => {
         // we don't know, so add it to all three
-        this.matched.set(m,x);
-        this.emitted.set(m,x);
-        this.consumed.set(m,x);
-        this.all.set(m,x);
+        this.matched.set(m, compileContext);
+        this.emitted.set(m, compileContext);
+        this.consumed.set(m, compileContext);
+        this.all.set(m, compileContext);
       });
       /* c8 skip next 3 */
     } else {
@@ -77,22 +77,22 @@ export class SubstitutionTracker {
 
 /** rollup of several substitution types */
 export class Substitutions {
-  addSetAndStringSubtitution(verb: SubstitutionUse, str?: string, x?: ObjectWithMetadata) {
-    this.set.add(verb, LdmlKeyboardTypes.VariableParser.allSetReferences(str), x);
-    this.addStringAndMarkerSubstitution(verb, str, x);
+  addSetAndStringSubtitution(verb: SubstitutionUse, str?: string, compileContext?: ObjectWithCompileContext) {
+    this.set.add(verb, LdmlKeyboardTypes.VariableParser.allSetReferences(str), compileContext);
+    this.addStringAndMarkerSubstitution(verb, str, compileContext);
   }
   /** add a string that can have string var substitutions or markers */
-  addStringAndMarkerSubstitution(verb: SubstitutionUse, str?: string, x?: ObjectWithMetadata) {
-    this.addMarkers(verb, str, x);
-    this.addStringSubstitution(verb, str, x);
+  addStringAndMarkerSubstitution(verb: SubstitutionUse, str?: string, compileContext?: ObjectWithCompileContext) {
+    this.addMarkers(verb, str, compileContext);
+    this.addStringSubstitution(verb, str, compileContext);
   }
-  addStringSubstitution(verb: SubstitutionUse, str?: string, x?: ObjectWithMetadata) {
-    this.string.add(verb, LdmlKeyboardTypes.VariableParser.allStringReferences(str), x);
+  addStringSubstitution(verb: SubstitutionUse, str?: string, compileContext?: ObjectWithCompileContext) {
+    this.string.add(verb, LdmlKeyboardTypes.VariableParser.allStringReferences(str), compileContext);
   }
   /** add a string that's just markers */
-  addMarkers(verb: SubstitutionUse, str?: string, x?: ObjectWithMetadata) {
-    this.markers.add(verb, LdmlKeyboardTypes.MarkerParser.allReferences(str), x);
-    LdmlKeyboardTypes.MarkerParser.allBrokenReferences(str).forEach(m => this.badMarkers.set(m, x));
+  addMarkers(verb: SubstitutionUse, str?: string, compileContext?: ObjectWithCompileContext) {
+    this.markers.add(verb, LdmlKeyboardTypes.MarkerParser.allReferences(str), compileContext);
+    LdmlKeyboardTypes.MarkerParser.allBrokenReferences(str).forEach(m => this.badMarkers.set(m, compileContext));
   }
   // all valid markers
   markers: SubstitutionTracker;
@@ -110,6 +110,6 @@ export class Substitutions {
     this.set = new SubstitutionTracker();
     this.string = new SubstitutionTracker();
     this.uset = new SubstitutionTracker();
-    this.badMarkers = new Map<string, ObjectWithMetadata>();
+    this.badMarkers = new Map<string, ObjectWithCompileContext>();
   }
 }
diff --git a/developer/src/kmc-ldml/src/compiler/tran.ts b/developer/src/kmc-ldml/src/compiler/tran.ts
index 1cc9bd0289..0a3a781f6f 100644
--- a/developer/src/kmc-ldml/src/compiler/tran.ts
+++ b/developer/src/kmc-ldml/src/compiler/tran.ts
@@ -1,6 +1,7 @@
 import { constants, SectionIdent } from "@keymanapp/ldml-keyboard-constants";
 import { KMXPlus, LdmlKeyboardTypes, util } from '@keymanapp/common-types';
-import { CompilerCallbacks, LDMLKeyboard, ObjectWithMetadata } from "@keymanapp/developer-utils";
+import { CompilerCallbacks, LDMLKeyboard } from "@keymanapp/developer-utils";
+import { ObjectWithCompileContext } from "@keymanapp/common-types";
 import { SectionCompiler } from "./section-compiler.js";
 
 import Bksp = KMXPlus.Bksp;
@@ -142,7 +143,7 @@ export abstract class TransformCompiler<T extends TransformCompilerType, TranBas
 
   private compileTransform(sections: DependencySections, transform: LKTransform) : TranTransform {
     // we have lots of strings to allocate, that will all have these options
-    const stropts : StrsOptions = { x: transform };
+    const stropts : StrsOptions = { compileContext: transform };
     const result = new TranTransform();
     // setup for serializing
     result._from = transform.from;
@@ -219,7 +220,7 @@ export abstract class TransformCompiler<T extends TransformCompilerType, TranBas
     // cookedFrom is cooked above, since there's some special treatment
     result.from = sections.strs.allocString(cookedFrom, {
       unescape: false,
-      x: transform,
+      compileContext: transform,
     }, sections);
     // 'to' is handled via allocString
     result.to = sections.strs.allocString(transform.to, {
@@ -227,7 +228,7 @@ export abstract class TransformCompiler<T extends TransformCompilerType, TranBas
       markers: true,
       unescape: true,
       nfd: true,
-      x: transform,
+      compileContext: transform,
     }, sections);
     return result;
   }
@@ -237,9 +238,9 @@ export abstract class TransformCompiler<T extends TransformCompilerType, TranBas
    * We have already checked that it's not a mapTo,
    * so there should not be any illegal substitutions.
    */
-  private isValidTo(to: string, x?: ObjectWithMetadata) : boolean {
+  private isValidTo(to: string, compileContext?: ObjectWithCompileContext) : boolean {
     if (/(?<!\\)(?:\\\\)*\$\[/.test(to)) {
-      this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformToUset({ to }, x));
+      this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformToUset({ to }, compileContext));
       return false;
     }
     return true;
@@ -251,18 +252,18 @@ export abstract class TransformCompiler<T extends TransformCompilerType, TranBas
    * @param from the original from - for error reporting
    * @returns true if OK
    */
-  private isValidRegex(cookedFrom: string, from: string, x?: ObjectWithMetadata) : boolean {
+  private isValidRegex(cookedFrom: string, from: string, compileContext?: ObjectWithCompileContext) : boolean {
     // check for any unescaped dollar sign here
     if (/(?<!\\)(?:\\\\)*\$/.test(cookedFrom)) {
-      this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformDollarsign({ from }, x));
+      this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformDollarsign({ from }, compileContext));
       return false;
     }
     if (/(?<!\\)(?:\\\\)*\*/.test(cookedFrom)) {
-      this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformAsterisk({ from }, x));
+      this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformAsterisk({ from }, compileContext));
       return false;
     }
     if (/(?<!\\)(?:\\\\)*\+/.test(cookedFrom)) {
-      this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformPlus({ from }, x));
+      this.callbacks.reportMessage(LdmlCompilerMessages.Error_IllegalTransformPlus({ from }, compileContext));
       return false;
     }
     // Verify that the regex is syntactically valid
@@ -272,14 +273,14 @@ export abstract class TransformCompiler<T extends TransformCompilerType, TranBas
 
       // does it match an empty string?
       if (rg.test('')) {
-        this.callbacks.reportMessage(LdmlCompilerMessages.Error_TransformFromMatchesNothing({ from }, x));
+        this.callbacks.reportMessage(LdmlCompilerMessages.Error_TransformFromMatchesNothing({ from }, compileContext));
         return false;
       }
     } catch (e) {
       // We're exposing the internal regex error message here.
       // In the future, CLDR plans to expose the EBNF for the transform,
       // at which point we would have more precise validation prior to getting to this point.
-      this.callbacks.reportMessage(LdmlCompilerMessages.Error_UnparseableTransformFrom({ from, message: e.message }, x));
+      this.callbacks.reportMessage(LdmlCompilerMessages.Error_UnparseableTransformFrom({ from, message: e.message }, compileContext));
       return false;
     }
     return true;
@@ -307,8 +308,8 @@ export abstract class TransformCompiler<T extends TransformCompilerType, TranBas
     if (reorder.before && this.checkEscapes(reorder.before, reorder) === null) {
       return null; // error'ed
     }
-    result.elements = sections.elem.allocElementString(sections, {x:reorder}, reorder.from, reorder.order, reorder.tertiary, reorder.tertiaryBase, reorder.preBase);
-    result.before = sections.elem.allocElementString(sections, {x:reorder}, reorder.before);
+    result.elements = sections.elem.allocElementString(sections, {compileContext: reorder}, reorder.from, reorder.order, reorder.tertiary, reorder.tertiaryBase, reorder.preBase);
+    result.before = sections.elem.allocElementString(sections, {compileContext: reorder}, reorder.before);
     if (!result.elements || !result.before) {
       return null; // already error'ed
     } else {
@@ -344,7 +345,7 @@ export abstract class TransformCompiler<T extends TransformCompilerType, TranBas
    * @param cookedFrom the original string
    * @returns the original string, or null if an error was reported
    */
-  private checkEscapes(cookedFrom: string, transform?: ObjectWithMetadata): string | null {
+  private checkEscapes(cookedFrom: string, transform?: ObjectWithCompileContext): string | null {
     if (!cookedFrom) return cookedFrom;
 
     // should not follow marker prefix, nor marker prefix with range
diff --git a/developer/src/kmc-ldml/src/compiler/vars.ts b/developer/src/kmc-ldml/src/compiler/vars.ts
index 2a0538732a..ed27393312 100644
--- a/developer/src/kmc-ldml/src/compiler/vars.ts
+++ b/developer/src/kmc-ldml/src/compiler/vars.ts
@@ -1,6 +1,7 @@
 import { SectionIdent, constants } from "@keymanapp/ldml-keyboard-constants";
 import { KMXPlus, LdmlKeyboardTypes } from '@keymanapp/common-types';
-import { LDMLKeyboard, CompilerCallbacks, ObjectWithMetadata } from '@keymanapp/developer-utils';
+import { ObjectWithCompileContext } from "@keymanapp/common-types";
+import { LDMLKeyboard, CompilerCallbacks } from '@keymanapp/developer-utils';
 import { SectionCompiler } from "./section-compiler.js";
 import Vars = KMXPlus.Vars;
 import StringVarItem = KMXPlus.StringVarItem;
@@ -40,9 +41,9 @@ export class VarsCompiler extends SectionCompiler {
     return valid;
   }
 
-  private validateIdentifier(id: string, x?: ObjectWithMetadata) {
+  private validateIdentifier(id: string, compileContext?: ObjectWithCompileContext) {
     if(!id.match(LdmlKeyboardTypes.VariableParser.ID)) { // From <string> DTD
-      this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidVariableIdentifier({id}, x));
+      this.callbacks.reportMessage(LdmlCompilerMessages.Error_InvalidVariableIdentifier({id}, compileContext));
       return false;
     }
     return true;
@@ -65,11 +66,11 @@ export class VarsCompiler extends SectionCompiler {
      * @param id id
      * @param x context
      */
-    function addId(id: string, x: LDMLKeyboard.Variable): void {
+    function addId(id: string, compileContext: LDMLKeyboard.Variable): void {
       if (allIds.has(id)) {
         dups.add(id);
       } else {
-        allIds.set(id, x);
+        allIds.set(id, compileContext);
       }
     }
 
@@ -97,7 +98,7 @@ export class VarsCompiler extends SectionCompiler {
       // Sets
       for (const e of variables.set) {
         const { id, value } = e;
-        if(!this.validateIdentifier(id)) {
+        if(!this.validateIdentifier(id, e)) {
           valid = false;
           continue;
         }
@@ -124,7 +125,7 @@ export class VarsCompiler extends SectionCompiler {
       // UnicodeSets
       for (const e of variables.uset) {
         const { id, value } = e;
-        if(!this.validateIdentifier(id)) {
+        if(!this.validateIdentifier(id, e)) {
           valid = false;
           continue;
         }
@@ -270,7 +271,7 @@ export class VarsCompiler extends SectionCompiler {
     const allMarkers : string[] = Array.from(mt.all.keys()).filter(m => m !== LdmlKeyboardTypes.MarkerParser.ANY_MARKER_ID).sort();
     result.markers = sections.list.allocList(allMarkers, {
       // pass the first object in the listr
-      x: mt.all.get(allMarkers[0]||'')
+      compileContext: mt.all.get(allMarkers[0]||'')
       // however, this is the string with the marker *id*. So, from the StrsCompiler
       // point of view, the value of this context would be if the marker ID had, say,
       // invalid Unicode in it for ERROR_IllegalCharacters - but, that wouldn't be a
@@ -291,7 +292,7 @@ export class VarsCompiler extends SectionCompiler {
     let { value } = e;
     // fix any variables
     value = result.substituteStrings(value, sections);
-    result.strings.push(new StringVarItem(id, value, sections));
+    result.strings.push(new StringVarItem(id, value, sections, e));
   }
   addSet(result: Vars, e: LDMLKeyboard.LKSet, sections: DependencySections): void {
     const { id } = e;
@@ -306,14 +307,14 @@ export class VarsCompiler extends SectionCompiler {
     // this is not 'forMatch', all variables are to be assumed as string literals, not regex
     // content.
     const cookedItems: string[] = rawItems.map(v => result.substituteMarkerString(v, false));
-    result.sets.push(new SetVarItem(id, cookedItems, sections));
+    result.sets.push(new SetVarItem(id, cookedItems, sections, e));
   }
   addUnicodeSet(result: Vars, e: LDMLKeyboard.LKUSet, sections: DependencySections): void {
     const { id } = e;
     let { value } = e;
     value = result.substituteStrings(value, sections);
     value = result.substituteUnicodeSets(value, sections);
-    result.usets.push(new UnicodeSetItem(id, value, sections, sections.usetparser));
+    result.usets.push(new UnicodeSetItem(id, value, sections, sections.usetparser, e));
   }
   // routines for using/substituting variables have been moved to the Vars class and its
   // properties
diff --git a/developer/src/kmc-ldml/test/disp.tests.ts b/developer/src/kmc-ldml/test/disp.tests.ts
index 3bad95e339..8b17b35c55 100644
--- a/developer/src/kmc-ldml/test/disp.tests.ts
+++ b/developer/src/kmc-ldml/test/disp.tests.ts
@@ -1,11 +1,12 @@
 import 'mocha';
 import {assert} from 'chai';
 import { DispCompiler } from '../src/compiler/disp.js';
-import { compilerTestCallbacks, loadSectionFixture, testCompilationCases, withOffset } from './helpers/index.js';
+import { compilerTestCallbacks, loadSectionFixture, testCompilationCases } from './helpers/index.js';
 import { KMXPlus } from '@keymanapp/common-types';
 import { LdmlCompilerMessages } from '../src/compiler/ldml-compiler-messages.js';
 
 import Disp = KMXPlus.Disp;
+import { withOffset } from '@keymanapp/developer-utils';
 
 describe('disp', function () {
   this.slow(500); // 0.5 sec -- json schema validation takes a while
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml
index 211961d616..4525675fe9 100644
--- a/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml
+++ b/developer/src/kmc-ldml/test/fixtures/sections/layr/invalid-missing-layer.xml
@@ -8,7 +8,7 @@
     <key id="one" output="1" />
   </keys>
 
-  <layers formId="touch">
+  <layers formId="touch" minDeviceWidth="123">
     <!-- INVALID: need at least one layer. -->
   </layers>
 </keyboard3>
diff --git a/developer/src/kmc-ldml/test/helpers/compareXml.ts b/developer/src/kmc-ldml/test/helpers/compareXml.ts
index 057986bdb2..4082a40ce2 100644
--- a/developer/src/kmc-ldml/test/helpers/compareXml.ts
+++ b/developer/src/kmc-ldml/test/helpers/compareXml.ts
@@ -1,6 +1,7 @@
 import {assert} from 'chai';
 import {readFileSync} from 'node:fs';
 import { KeymanXMLReader, SymbolUtils } from "@keymanapp/developer-utils";
+import { ObjectWithCompileContext } from '@keymanapp/common-types';
 
 /**
  *
@@ -8,10 +9,10 @@ import { KeymanXMLReader, SymbolUtils } from "@keymanapp/developer-utils";
  * @param expect path to expected XML
  * @param mutator optional function that will be applied to the parsed object
  */
-export function compareXml(actual : string, expect: string, mutator?: (input: any) => any) {
+export function compareXml(actual : string, expect: string, mutator?: (input: ObjectWithCompileContext) => ObjectWithCompileContext) {
     if (!mutator) {
         // no-op
-        mutator = (x: any) => x;
+        mutator = (compileContext: ObjectWithCompileContext) => compileContext;
     }
     const reader = new KeymanXMLReader('keyboard3');
 
diff --git a/developer/src/kmc-ldml/test/helpers/index.ts b/developer/src/kmc-ldml/test/helpers/index.ts
index 967287cf87..be6216f9c1 100644
--- a/developer/src/kmc-ldml/test/helpers/index.ts
+++ b/developer/src/kmc-ldml/test/helpers/index.ts
@@ -8,7 +8,7 @@ import * as path from 'path';
 import { fileURLToPath } from 'url';
 import { SectionCompiler, SectionCompilerNew } from '../../src/compiler/section-compiler.js';
 import { util, KMXPlus, LdmlKeyboardTypes } from '@keymanapp/common-types';
-import { CompilerEvent, compilerEventFormat, CompilerCallbacks, LDMLKeyboardXMLSourceFileReader, LDMLKeyboardTestDataXMLSourceFile, LDMLKeyboard, KeymanXMLMetadata, KeymanXMLReader, CompilerError } from "@keymanapp/developer-utils";
+import { CompilerEvent, compilerEventFormat, CompilerCallbacks, LDMLKeyboardXMLSourceFileReader, LDMLKeyboardTestDataXMLSourceFile, LDMLKeyboard, CompilerError } from "@keymanapp/developer-utils";
 import { LdmlKeyboardCompiler } from '../../src/main.js'; // make sure main.js compiles
 import { assert } from 'chai';
 import { KMXPlusMetadataCompiler } from '../../src/compiler/metadata-compiler.js';
@@ -358,17 +358,3 @@ export function hex_str(s?: string) : string {
   return [...s].map(ch => dontEscape.test(ch) ? ch : util.escapeRegexChar(ch)).join('');
 }
 
-/**
- * Return an object simulating an XML object with an offset number
- * For use in calling message functions
- * @param c number for the offset setting
- * @param x if set, this object will be used as the base object instead of {}
- */
-export function withOffset(c: number, x?: any) : KeymanXMLMetadata {
-  // set metadata on an empty object
-  const o = Object.assign({}, x);
-  KeymanXMLReader.setMetaData(o, {
-    startIndex: c
-  });
-  return o;
-}
diff --git a/developer/src/kmc-ldml/test/keys.tests.ts b/developer/src/kmc-ldml/test/keys.tests.ts
index 3c3c842810..97171cf6fc 100644
--- a/developer/src/kmc-ldml/test/keys.tests.ts
+++ b/developer/src/kmc-ldml/test/keys.tests.ts
@@ -1,7 +1,7 @@
 import 'mocha';
 import { assert } from 'chai';
 import { KeysCompiler } from '../src/compiler/keys.js';
-import { assertCodePoints, compilerTestCallbacks, loadSectionFixture, testCompilationCases, withOffset } from './helpers/index.js';
+import { assertCodePoints, compilerTestCallbacks, loadSectionFixture, testCompilationCases } from './helpers/index.js';
 import { KMXPlus, Constants, LdmlKeyboardTypes } from '@keymanapp/common-types';
 import { LdmlCompilerMessages } from '../src/compiler/ldml-compiler-messages.js';
 import { constants } from '@keymanapp/ldml-keyboard-constants';
@@ -9,7 +9,7 @@ import { MetaCompiler } from '../src/compiler/meta.js';
 const keysDependencies = [ ...BASIC_DEPENDENCIES, MetaCompiler ];
 import Keys = KMXPlus.Keys;
 import { BASIC_DEPENDENCIES } from '../src/compiler/empty-compiler.js';
-import { LDMLKeyboard } from '@keymanapp/developer-utils';
+import { LDMLKeyboard, withOffset } from '@keymanapp/developer-utils';
 const K = Constants.USVirtualKeyCodes;
 
 describe('keys', function () {
diff --git a/developer/src/kmc-ldml/test/layr.tests.ts b/developer/src/kmc-ldml/test/layr.tests.ts
index dc0334c0b1..64e4a3d373 100644
--- a/developer/src/kmc-ldml/test/layr.tests.ts
+++ b/developer/src/kmc-ldml/test/layr.tests.ts
@@ -2,12 +2,13 @@ import 'mocha';
 import { assert } from 'chai';
 import { LayrCompiler } from '../src/compiler/layr.js';
 import { LdmlCompilerMessages } from '../src/compiler/ldml-compiler-messages.js';
-import { compilerTestCallbacks, testCompilationCases, withOffset } from './helpers/index.js';
+import { compilerTestCallbacks, testCompilationCases } from './helpers/index.js';
 import { KMXPlus } from '@keymanapp/common-types';
 import { constants } from '@keymanapp/ldml-keyboard-constants';
 
 import Layr = KMXPlus.Layr;
 import LayrRow = KMXPlus.LayrRow;
+import { withOffset } from '@keymanapp/developer-utils';
 
 function allKeysOk(row : LayrRow, str : string, msg? : string) {
   const split = str.split(' ');
@@ -107,13 +108,13 @@ describe('layr', function () {
     {
       // missing layer element
       subpath: 'sections/layr/invalid-missing-layer.xml',
-      errors: [LdmlCompilerMessages.Error_MustBeAtLeastOneLayerElement(withOffset(258))],
+      errors: [LdmlCompilerMessages.Error_MustBeAtLeastOneLayerElement(withOffset(40))],
       retainOffsetInMessages: true,
     },
     {
       // missing layer element
       subpath: 'sections/layr/invalid-missing-layer2.xml',
-      errors: [LdmlCompilerMessages.Error_MustBeAtLeastOneLayerElement()],
+      errors: [LdmlCompilerMessages.Error_MustBeAtLeastOneLayerElement(withOffset(40))],
       retainOffsetInMessages: true,
     },
     {
diff --git a/developer/src/kmc-ldml/test/loca.tests.ts b/developer/src/kmc-ldml/test/loca.tests.ts
index 287ee62b00..ffe4f656c7 100644
--- a/developer/src/kmc-ldml/test/loca.tests.ts
+++ b/developer/src/kmc-ldml/test/loca.tests.ts
@@ -1,11 +1,12 @@
 import 'mocha';
 import { assert } from 'chai';
 import { LocaCompiler } from '../src/compiler/loca.js';
-import { compilerTestCallbacks, loadSectionFixture, withOffset } from './helpers/index.js';
+import { compilerTestCallbacks, loadSectionFixture } from './helpers/index.js';
 import { KMXPlus } from '@keymanapp/common-types';
 import { LdmlCompilerMessages } from '../src/compiler/ldml-compiler-messages.js';
 
 import Loca = KMXPlus.Loca;
+import { withOffset } from '@keymanapp/developer-utils';
 
 describe('loca', function () {
   this.slow(500); // 0.5 sec -- json schema validation takes a while
diff --git a/developer/src/kmc-ldml/test/messages.tests.ts b/developer/src/kmc-ldml/test/messages.tests.ts
index a7d06006cb..60df66fb09 100644
--- a/developer/src/kmc-ldml/test/messages.tests.ts
+++ b/developer/src/kmc-ldml/test/messages.tests.ts
@@ -2,8 +2,7 @@ import 'mocha';
 import {expect} from 'chai';
 import { LdmlCompilerMessages } from '../src/compiler/ldml-compiler-messages.js';
 import { verifyCompilerMessagesObject } from '@keymanapp/developer-test-helpers';
-import { CompilerErrorNamespace, CompilerEvent } from '@keymanapp/developer-utils';
-import { withOffset } from './helpers/index.js';
+import { CompilerErrorNamespace, CompilerEvent, withOffset } from '@keymanapp/developer-utils';
 
 describe('LdmlCompilerMessages', function () {
   it('should have a valid LdmlCompilerMessages object', function() {
diff --git a/developer/src/kmc-ldml/test/meta.tests.ts b/developer/src/kmc-ldml/test/meta.tests.ts
index c744b3385e..beeed50915 100644
--- a/developer/src/kmc-ldml/test/meta.tests.ts
+++ b/developer/src/kmc-ldml/test/meta.tests.ts
@@ -1,13 +1,13 @@
 import 'mocha';
 import {assert} from 'chai';
 import { MetaCompiler } from '../src/compiler/meta.js';
-import { compilerTestCallbacks, loadSectionFixture, withOffset } from './helpers/index.js';
+import { compilerTestCallbacks, loadSectionFixture } from './helpers/index.js';
 import { KMXPlus } from '@keymanapp/common-types';
 import { LdmlCompilerMessages } from '../src/compiler/ldml-compiler-messages.js';
 
 import KeyboardSettings = KMXPlus.KeyboardSettings;
 import Meta = KMXPlus.Meta;
-import { LDMLKeyboard } from '@keymanapp/developer-utils';
+import { LDMLKeyboard, withOffset } from '@keymanapp/developer-utils';
 
 describe('meta', function () {
   this.slow(500); // 0.5 sec -- json schema validation takes a while
diff --git a/developer/src/kmc-model-info/build.sh b/developer/src/kmc-model-info/build.sh
index 766c9be413..816a195e00 100755
--- a/developer/src/kmc-model-info/build.sh
+++ b/developer/src/kmc-model-info/build.sh
@@ -2,10 +2,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 
 builder_describe "Build Keyman kmc Lexical Model model-info Compiler module" \
   "@/common/web/types" \
@@ -28,10 +30,10 @@ builder_parse "$@"
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_action clean        rm -rf ./build/ ./tsconfig.tsbuildinfo
-builder_run_action configure    verify_npm_setup
+builder_run_action configure    node_select_version_and_npm_ci
 builder_run_action build        tsc --build
 builder_run_action api          api-extractor run --local --verbose
-builder_run_action test         builder_do_typescript_tests 55
+builder_run_action test         typescript_run_eslint_mocha_tests 55
 
 #-------------------------------------------------------------------------------------------------------------------
 
diff --git a/developer/src/kmc-model/build.sh b/developer/src/kmc-model/build.sh
index 9e7166f8b7..f2eef55cfc 100755
--- a/developer/src/kmc-model/build.sh
+++ b/developer/src/kmc-model/build.sh
@@ -2,10 +2,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Keyman kmc Lexical Model Compiler module" \
@@ -36,9 +38,9 @@ function do_build() {
 }
 
 builder_run_action clean        rm -rf ./build/ ./tsconfig.tsbuildinfo
-builder_run_action configure    verify_npm_setup
+builder_run_action configure    node_select_version_and_npm_ci
 builder_run_action build        do_build
 builder_run_action api          api-extractor run --local --verbose
-builder_run_action test         builder_do_typescript_tests
+builder_run_action test         typescript_run_eslint_mocha_tests
 builder_run_action publish      builder_publish_npm
 
diff --git a/developer/src/kmc-package/build.sh b/developer/src/kmc-package/build.sh
index 81f8b928c7..4b9379881a 100755
--- a/developer/src/kmc-package/build.sh
+++ b/developer/src/kmc-package/build.sh
@@ -5,10 +5,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 builder_describe "Build Keyman kmc Package Compiler module" \
@@ -33,8 +35,8 @@ builder_parse "$@"
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_action clean      rm -rf ./build/ ./tsconfig.tsbuildinfo
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
 builder_run_action api        api-extractor run --local --verbose
-builder_run_action test       builder_do_typescript_tests
+builder_run_action test       typescript_run_eslint_mocha_tests
 builder_run_action publish     builder_publish_npm
diff --git a/developer/src/kmc/build.sh b/developer/src/kmc/build.sh
index 15e8e18302..1644540651 100755
--- a/developer/src/kmc/build.sh
+++ b/developer/src/kmc/build.sh
@@ -5,11 +5,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+. "$KEYMAN_ROOT/resources/build/typescript.inc.sh"
 . "$KEYMAN_ROOT/developer/src/packages.inc.sh"
 
 builder_describe "Build Keyman Keyboard Compiler kmc" \
@@ -54,7 +56,7 @@ function do_build() {
 #-------------------------------------------------------------------------------------------------------------------
 
 function do_test() {
-  builder_do_typescript_tests 50
+  typescript_run_eslint_mocha_tests 50
   ./test/command-line-tests.sh test
 }
 
@@ -84,11 +86,14 @@ function do_bundle() {
   mkdir -p build/dist
   node build-bundler.js
 
-  sentry-cli sourcemaps inject \
-    --org keyman \
-    --project keyman-developer \
-    --release "$KEYMAN_VERSION_GIT_TAG"  \
-    build/dist/ "${SOURCEMAP_PATHS[@]}"
+  if builder_is_ci_build && builder_is_ci_build_level_release; then
+    # Only inject sourcemaps for release builds
+    sentry-cli sourcemaps inject \
+      --org keyman \
+      --project keyman-developer \
+      --release "$KEYMAN_VERSION_GIT_TAG"  \
+      build/dist/ "${SOURCEMAP_PATHS[@]}"
+  fi
 
   # Manually copy over kmcmplib module
   cp ../kmc-kmn/build/src/import/kmcmplib/wasm-host.wasm build/dist/
@@ -104,7 +109,7 @@ function do_bundle() {
 #-------------------------------------------------------------------------------------------------------------------
 
 builder_run_action clean      rm -rf ./build/ ./tsconfig.tsbuildinfo
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      do_build
 builder_run_action test       do_test
 builder_run_action api        do_api
diff --git a/developer/src/kmc/test/command-line-tests.sh b/developer/src/kmc/test/command-line-tests.sh
index 74447afd41..41652bcdfd 100755
--- a/developer/src/kmc/test/command-line-tests.sh
+++ b/developer/src/kmc/test/command-line-tests.sh
@@ -5,11 +5,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
-# . "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+# . "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 # . "$KEYMAN_ROOT/developer/src/packages.inc.sh"
 
 builder_describe "Test Keyman Keyboard Compiler kmc command line e2e" \
diff --git a/developer/src/kmcmplib/build.sh b/developer/src/kmcmplib/build.sh
index 77036cc990..952c0732b8 100755
--- a/developer/src/kmcmplib/build.sh
+++ b/developer/src/kmcmplib/build.sh
@@ -3,10 +3,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$THIS_SCRIPT_PATH/checkout-keyboards.inc.sh"
 . "$THIS_SCRIPT_PATH/commands.inc.sh"
diff --git a/developer/src/kmcmplib/commands.inc.sh b/developer/src/kmcmplib/commands.inc.sh
index 280343853c..e2a5679ed6 100644
--- a/developer/src/kmcmplib/commands.inc.sh
+++ b/developer/src/kmcmplib/commands.inc.sh
@@ -126,7 +126,7 @@ do_command() {
 # ----------------------------------------------------------------------------
 
 build_meson_cross_file_for_wasm() {
-  if [ $BUILDER_OS == win ]; then
+  if builder_is_windows; then
     local R=$(cygpath -w $(echo $EMSCRIPTEN_BASE) | sed 's_\\_\\\\_g')
   else
     local R=$(echo $EMSCRIPTEN_BASE | sed 's_/_\\/_g')
@@ -140,4 +140,4 @@ should_do_full_test() {
   fi
 
   return 1
-}
\ No newline at end of file
+}
diff --git a/developer/src/kmcmplib/meson.build b/developer/src/kmcmplib/meson.build
index 0493c504f4..935f8496f1 100644
--- a/developer/src/kmcmplib/meson.build
+++ b/developer/src/kmcmplib/meson.build
@@ -8,7 +8,7 @@ project('kmcmplib', 'cpp', 'c',
         version: files('../../../VERSION.md'),
         license: 'MIT',
         default_options : ['buildtype=release',
-                           'cpp_std=c++14',
+                           'cpp_std=c++17',
                            'b_vscrt=static_from_buildtype',
                            'default_library=static',
                            'debug=true'])
diff --git a/developer/src/kmcmplib/src/Compiler.cpp b/developer/src/kmcmplib/src/Compiler.cpp
index 3b53453dce..ab6296609b 100644
--- a/developer/src/kmcmplib/src/Compiler.cpp
+++ b/developer/src/kmcmplib/src/Compiler.cpp
@@ -3863,17 +3863,68 @@ bool hasPreamble(std::u16string result) {
   return result.size() > 0 && result[0] == 0xFEFF;
 }
 
+bool isValidUtf8(KMX_BYTE* str, int sz) {
+  int i = 0;
+  while (i < sz) {
+    int remaining = sz - i;
+    if (str[i] <= 0x7F) {
+      // ASCII
+      i++;
+    } else if ((str[i] & 0xE0) == 0xC0) {
+      // 2-byte sequence
+      if (remaining < 2 ||
+          (str[i + 1] & 0xC0) != 0x80 ||
+          str[i] == 0xC0 || // C0 and C1 are illegal values
+          str[i] == 0xC1) {
+        return false;
+      }
+      i += 2;
+    } else if ((str[i] & 0xF0) == 0xE0) {
+      // 3-byte sequence
+      if (remaining < 3 ||
+          (str[i+1] & 0xC0) != 0x80 ||
+          (str[i+2] & 0xC0) != 0x80) {
+        return false;
+      }
+      if (str[i] == 0xE0 && (str[i + 1] & 0xE0) == 0x80) {
+        return false;
+      }
+      if (str[i] == 0xED && (str[i + 1] & 0xE0) == 0xA0) {
+        return false;
+      }
+      i += 3;
+    } else if ((str[i] & 0xF8) == 0xF0) {
+      // 4-byte sequence
+      if (remaining < 4 ||
+          (str[i+1] & 0xC0) != 0x80 ||
+          (str[i+2] & 0xC0) != 0x80 ||
+          (str[i+3] & 0xC0) != 0x80) {
+        return false;
+      }
+      if (str[i] == 0xF0 && (str[i + 1] & 0xF0) == 0x80) {
+        return false;
+      }
+      if (str[i] > 0xF4 || (str[i] == 0xF4 && str[i + 1] > 0x8F)) {
+        return false;
+      }
+      i += 4;
+    } else {
+      return false;
+    }
+  }
+  return true;
+}
+
 bool UTF16TempFromUTF8(KMX_BYTE* infile, int sz, KMX_BYTE** tempfile, int *sz16) {
   if(sz == 0) {
     return FALSE;
   }
 
   std::u16string result;
-
-  try {
-    std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> converter;
-    result = converter.from_bytes((char*)infile, (char*)infile+sz);
-  } catch(std::range_error& e) {
+  if (isValidUtf8(infile, sz)) {
+    std::string infileStr(reinterpret_cast<const char*>(infile), sz);
+    result = u16string_from_string(infileStr);
+  } else {
     ReportCompilerMessage(KmnCompilerMessages::HINT_NonUnicodeFile);
     result.resize(sz);
     for(int i = 0; i < sz; i++) {
diff --git a/developer/src/kmcmplib/tests/get-test-source.sh b/developer/src/kmcmplib/tests/get-test-source.sh
index fe6cded2f1..af647ee311 100755
--- a/developer/src/kmcmplib/tests/get-test-source.sh
+++ b/developer/src/kmcmplib/tests/get-test-source.sh
@@ -3,7 +3,7 @@
 # Finds all keyboards in the keyboards repo (passed in $1) that are valid source
 # keyboards (i.e. <area>/<prefix>/<name>/source/<name>.kmn)
 #
-# Called from meson.build, so this script does not use build-utils.sh. Do not run this
+# Called from meson.build, so this script does not use builder-basic.inc.sh. Do not run this
 # script directly.
 #
 set -eu
diff --git a/developer/src/kmcmplib/tests/gtest-compiler.tests.cpp b/developer/src/kmcmplib/tests/gtest-compiler.tests.cpp
index 268d1d1f70..757767762f 100644
--- a/developer/src/kmcmplib/tests/gtest-compiler.tests.cpp
+++ b/developer/src/kmcmplib/tests/gtest-compiler.tests.cpp
@@ -24,6 +24,8 @@ KMX_DWORD GetRHS(PFILE_KEYBOARD fk, PKMX_WCHAR p, PKMX_WCHAR buf, int bufsize, i
 bool isIntegerWstring(PKMX_WCHAR p);
 bool hasPreamble(std::u16string result);
 KMX_DWORD ProcessKeyLineImpl(PFILE_KEYBOARD fk, PKMX_WCHAR str, KMX_BOOL IsUnicode, PKMX_WCHAR pklIn, PKMX_WCHAR pklKey, PKMX_WCHAR pklOut);
+extern bool UTF16TempFromUTF8(KMX_BYTE* infile, int sz, KMX_BYTE** tempfile, int* sz16);
+extern bool isValidUtf8(KMX_BYTE* str, int sz);
 
 namespace kmcmp {
     extern int nErrors;
@@ -2101,5 +2103,156 @@ TEST_F(CompilerTest, hasPreamble_test) {
     EXPECT_FALSE(hasPreamble(u"a\uFEFF"));
 }
 
-// bool UTF16TempFromUTF8(KMX_BYTE* infile, int sz, KMX_BYTE** tempfile, int *sz16)
 // PFILE_STORE FindSystemStore(PFILE_KEYBOARD fk, KMX_DWORD dwSystemID)
+
+// Helper to convert UTF-16 buffer to std::u16string
+static std::u16string buffer_to_u16string(const KMX_BYTE* buf, int sz16) {
+  std::u16string out;
+  for (int i = 0; i < sz16; i += 2) {
+    char16_t ch = buf[i] | (buf[i+1] << 8);
+    out.push_back(ch);
+  }
+  return out;
+}
+
+TEST(UTF16TempFromUTF8, HandlesValidUTF8WithoutBOM) {
+  const char* utf8 = "abc \xE2\x82\xAC"; // "abc €"
+  int sz = strlen(utf8);
+  KMX_BYTE* tempfile = nullptr;
+  int sz16 = 0;
+  ASSERT_TRUE(UTF16TempFromUTF8((KMX_BYTE*)utf8, sz, &tempfile, &sz16));
+  ASSERT_EQ(sz16, 10); // 5 UTF-16 code units * 2 bytes
+  std::u16string result = buffer_to_u16string(tempfile, sz16);
+  EXPECT_EQ(result, u"abc \u20AC");
+  delete[] tempfile;
+}
+
+TEST(UTF16TempFromUTF8, HandlesValidUTF8WithBOM) {
+  // UTF-8 BOM + "A"
+  const char utf8[] = { char(0xEF), char(0xBB), char(0xBF), 'A', 0 };
+  int sz = 4;
+  KMX_BYTE* tempfile = nullptr;
+  int sz16 = 0;
+  ASSERT_TRUE(UTF16TempFromUTF8((KMX_BYTE*)utf8, sz, &tempfile, &sz16));
+  ASSERT_EQ(sz16, 2); // Only 'A' (1 code unit) * 2 bytes
+  std::u16string result = buffer_to_u16string(tempfile, sz16);
+  EXPECT_EQ(result, u"A");
+  delete[] tempfile;
+}
+
+TEST(UTF16TempFromUTF8, HandlesInvalidUTF8FallbacksToCP1252) {
+  // 0x80 is invalid in UTF-8, should fallback to CP1252 (U+20AC)
+  const char invalid_utf8[] = { char(0x80), 0 };
+  int sz = 1;
+  KMX_BYTE* tempfile = nullptr;
+  int sz16 = 0;
+  ASSERT_TRUE(UTF16TempFromUTF8((KMX_BYTE*)invalid_utf8, sz, &tempfile, &sz16));
+  ASSERT_EQ(sz16, 2);
+  std::u16string result = buffer_to_u16string(tempfile, sz16);
+  EXPECT_EQ(result, u"\u20AC");
+  delete[] tempfile;
+}
+
+TEST(UTF16TempFromUTF8, HandlesEmptyInput) {
+  KMX_BYTE* tempfile = nullptr;
+  int sz16 = 0;
+  ASSERT_FALSE(UTF16TempFromUTF8(nullptr, 0, &tempfile, &sz16));
+  // tempfile should remain nullptr, sz16 should be 0
+  EXPECT_EQ(tempfile, nullptr);
+  EXPECT_EQ(sz16, 0);
+}
+
+TEST(IsValidUtf8Test, ValidAscii) {
+  std::vector<KMX_BYTE> v = {'h', 'e', 'l', 'l', 'o'};
+  EXPECT_TRUE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Valid2Byte) {
+  std::vector<KMX_BYTE> v = {0xC2, 0xA2};  // U+00A2: ¢
+  EXPECT_TRUE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Valid3Byte) {
+  std::vector<KMX_BYTE> v = {0xE2, 0x82, 0xAC};  // U+20AC: €
+  EXPECT_TRUE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Valid4Byte) {
+  std::vector<KMX_BYTE> v = {0xF0, 0x9F, 0x98, 0x80};  // U+1F600: 😀
+  EXPECT_TRUE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, InvalidOverlongEncoding) {
+  std::vector<KMX_BYTE> v = {0xC1, 0x81};  // Overlong encoding for ASCII
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, InvalidMissingContinuation) {
+  std::vector<KMX_BYTE> v = {0xE2, 0x82};  // Missing one continuation byte
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, InvalidLoneContinuation) {
+  std::vector<KMX_BYTE> v = {0x80};  // Continuation byte without starter
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Invalid4ByteOutOfRange) {
+  std::vector<KMX_BYTE> v = {0xF4, 0x90, 0x80, 0x80};  // > U+10FFFF
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, ValidMixedAsciiAndMultiByte) {
+  std::vector<KMX_BYTE> v = {'A', 0xC2, 0xA2, 0xE2, 0x82, 0xAC, 0xF0, 0x9F, 0x98, 0x80};
+  EXPECT_TRUE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Invalid2ByteBadSecondByte) {
+  std::vector<KMX_BYTE> v = {0xD2, 0x28};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Invalid2ByteBadSecondByteTooHigh) {
+  std::vector<KMX_BYTE> v = {0xD2, 0xC8};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Invalid3ByteBadSecondByte) {
+  std::vector<KMX_BYTE> v = {0xE2, 0x28, 0xA1};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Invalid3ByteBadThirdByte) {
+  std::vector<KMX_BYTE> v = {0xE2, 0xA8, 0xD1};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Invalid4ByteBadSecondByte) {
+  std::vector<KMX_BYTE> v = {0xF2, 0xC8, 0xB2, 0x88};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Invalid4ByteBadThirdByte) {
+  std::vector<KMX_BYTE> v = {0xF2, 0xB8, 0x02, 0x88};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, Invalid4ByteBadFourthByte) {
+  std::vector<KMX_BYTE> v = {0xF2, 0xB8, 0xA2, 0xD8};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, InvalidByteC0) {
+  std::vector<KMX_BYTE> v = {0xC1};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, InvalidByteF5) {
+  std::vector<KMX_BYTE> v = {0xF5};
+  EXPECT_FALSE(isValidUtf8(v.data(), v.size()));
+}
+
+TEST(IsValidUtf8Test, ValidEmptyInput) {
+  std::vector<KMX_BYTE> v = {};
+  EXPECT_TRUE(isValidUtf8(v.data(), v.size()));
+}
diff --git a/developer/src/kmcmplib/tests/prep.sh b/developer/src/kmcmplib/tests/prep.sh
index 8ad9b81171..e00f2fc1fd 100755
--- a/developer/src/kmcmplib/tests/prep.sh
+++ b/developer/src/kmcmplib/tests/prep.sh
@@ -11,7 +11,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$THIS_SCRIPT_PATH"
diff --git a/developer/src/kmconvert/build.sh b/developer/src/kmconvert/build.sh
index 599379565f..e18977f05b 100755
--- a/developer/src/kmconvert/build.sh
+++ b/developer/src/kmconvert/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyboard project generation and conversion tool" \
@@ -33,7 +33,7 @@ function do_build() {
   tds2dbg "$WIN32_TARGET"
 
   cp "$WIN32_TARGET" "$DEVELOPER_PROGRAM"
-  cp "$WIN32_TARGET_PATH/kmconvert.dbg" "$DEVELOPER_DEBUGPATH"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/kmconvert.dbg" "$DEVELOPER_DEBUGPATH"
 
   rm -rf "$DEVELOPER_PROGRAM/projects/templates"
   mkdir -p "$DEVELOPER_PROGRAM/projects/templates"
diff --git a/developer/src/kmdbrowserhost/build.sh b/developer/src/kmdbrowserhost/build.sh
index b00a60735a..8996b17bc4 100755
--- a/developer/src/kmdbrowserhost/build.sh
+++ b/developer/src/kmdbrowserhost/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Chromium browser host process for Keyman Developer" \
@@ -32,9 +32,7 @@ function do_build() {
   tds2dbg "$WIN32_TARGET"
 
   cp "$WIN32_TARGET" "$DEVELOPER_PROGRAM"
-  if [[ -f "$WIN32_TARGET_PATH/kmdbrowserhost.dbg" ]]; then
-    cp "$WIN32_TARGET_PATH/kmdbrowserhost.dbg" "$DEVELOPER_DEBUGPATH"
-  fi
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/kmdbrowserhost.dbg" "$DEVELOPER_DEBUGPATH"
 }
 
 function do_publish() {
diff --git a/developer/src/kmdecomp/build.sh b/developer/src/kmdecomp/build.sh
index a6b903fbc8..069e3e836a 100755
--- a/developer/src/kmdecomp/build.sh
+++ b/developer/src/kmdecomp/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
@@ -33,7 +33,7 @@ function do_build() {
   build_version.res
   vs_msbuild kmdecomp.sln //t:Build "//p:Platform=Win32"
   cp "$WIN32_TARGET" "$DEVELOPER_PROGRAM"
-  cp "$WIN32_TARGET_PATH/kmdecomp.pdb" "$DEVELOPER_DEBUGPATH"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/kmdecomp.pdb" "$DEVELOPER_DEBUGPATH"
 }
 
 function do_publish() {
diff --git a/developer/src/samples/build.sh b/developer/src/samples/build.sh
index 703a2691a8..c60602bf85 100755
--- a/developer/src/samples/build.sh
+++ b/developer/src/samples/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/developer/src/samples/imsample/build.sh b/developer/src/samples/imsample/build.sh
index 2c0c402e28..50447040ac 100755
--- a/developer/src/samples/imsample/build.sh
+++ b/developer/src/samples/imsample/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
@@ -32,11 +32,11 @@ function do_build() {
   build_version.res
   vs_msbuild imsample.sln //t:Build "//p:Platform=Win32"
   cp "$WIN32_TARGET" "$DEVELOPER_PROGRAM"
-  cp "$WIN32_TARGET_PATH/imsample.pdb" "$DEVELOPER_DEBUGPATH"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/imsample.pdb" "$DEVELOPER_DEBUGPATH"
 
   vs_msbuild imsample.sln //t:Build "//p:Platform=x64"
   cp "$X64_TARGET" "$DEVELOPER_PROGRAM"
-  cp "$X64_TARGET_PATH/imsample.x64.pdb" "$DEVELOPER_DEBUGPATH"
+  builder_if_release_build_level cp "$X64_TARGET_PATH/imsample.x64.pdb" "$DEVELOPER_DEBUGPATH"
 }
 
 # TODO
diff --git a/developer/src/server/build.sh b/developer/src/server/build.sh
index 6741bb68de..785fd496c0 100755
--- a/developer/src/server/build.sh
+++ b/developer/src/server/build.sh
@@ -3,10 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/jq.inc.sh"
 
 builder_describe "Build Keyman Developer Server" \
@@ -49,7 +50,7 @@ function clean_server() {
 }
 
 function configure_server() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
   # See https://github.com/bubenshchykov/ngrok/issues/254, https://github.com/bubenshchykov/ngrok/pull/255
   # TODO: this is horrible; is there a way we can avoid this?
   rm -f "$KEYMAN_ROOT"/node_modules/ngrok/bin/ngrok
diff --git a/developer/src/server/package.json b/developer/src/server/package.json
index 99cd6bb260..37192ca6f3 100644
--- a/developer/src/server/package.json
+++ b/developer/src/server/package.json
@@ -13,7 +13,7 @@
     "@sentry/node": "^7.57.0",
     "chalk": "^4.1.2",
     "express": "^4.20.0",
-    "multer": "^2.0.1",
+    "multer": "^2.0.2",
     "ngrok": "^5.0.0-beta.2",
     "open": "^8.4.0",
     "restructure": "^3.0.1",
diff --git a/developer/src/server/src/version-data.ts b/developer/src/server/src/version-data.ts
index 05f266c5c6..a082a65170 100644
--- a/developer/src/server/src/version-data.ts
+++ b/developer/src/server/src/version-data.ts
@@ -1,5 +1,5 @@
 /*
-  Version information from build-utils.sh:
+  Version information from builder-basic.inc.sh:
 
   #   KEYMAN_VERSION:              Full current build version, e.g. "14.0.1"
   #   [KEYMAN_VERSION_WIN:         Full current build version for Windows, e.g. "14.0.1.0"]
diff --git a/developer/src/setup/build.sh b/developer/src/setup/build.sh
index 5dfe102363..1e4ab94a68 100755
--- a/developer/src/setup/build.sh
+++ b/developer/src/setup/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
@@ -33,13 +33,8 @@ function do_build() {
   sentrytool_delphiprep "$WIN32_TARGET" setup.dpr
   tds2dbg "$WIN32_TARGET"
   cp "$WIN32_TARGET" "$DEVELOPER_PROGRAM"
-  if [[ -f "$WIN32_TARGET_PATH/setup.dbg" ]]; then
-    cp "$WIN32_TARGET_PATH/setup.dbg" "$DEVELOPER_DEBUGPATH/devsetup.dbg"
-  fi
-  rm -f "$WIN32_TARGET_PATH/devsetup.dbg"
-  if [[ -f "$WIN32_TARGET_PATH/setup.dbg" ]]; then
-    mv "$WIN32_TARGET_PATH/setup.dbg" "$WIN32_TARGET_PATH/devsetup.dbg"
-  fi
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/setup.dbg" "$DEVELOPER_DEBUGPATH/devsetup.dbg"
+  builder_if_release_build_level mv "$WIN32_TARGET_PATH/setup.dbg" "$WIN32_TARGET_PATH/devsetup.dbg"
 }
 
 function do_publish() {
diff --git a/developer/src/test/auto/build.sh b/developer/src/test/auto/build.sh
index 043711e752..a2bca0e0dd 100755
--- a/developer/src/test/auto/build.sh
+++ b/developer/src/test/auto/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/developer/src/test/auto/compile-supplementary-support/build.sh b/developer/src/test/auto/compile-supplementary-support/build.sh
index b004605b1d..4f8acf40a9 100755
--- a/developer/src/test/auto/compile-supplementary-support/build.sh
+++ b/developer/src/test/auto/compile-supplementary-support/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "test if KS=1 is in the right files, both in debug and non-debug versions" clean configure build test
diff --git a/developer/src/test/auto/keyboard-js-info/build.sh b/developer/src/test/auto/keyboard-js-info/build.sh
index 0a19929f4b..7bbf417681 100755
--- a/developer/src/test/auto/keyboard-js-info/build.sh
+++ b/developer/src/test/auto/keyboard-js-info/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test the read of basic keyboard info info from js files" clean configure build test
diff --git a/developer/src/test/auto/kmcomp/build.sh b/developer/src/test/auto/kmcomp/build.sh
index 7239010b06..8bfcd69149 100755
--- a/developer/src/test/auto/kmcomp/build.sh
+++ b/developer/src/test/auto/kmcomp/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test that kmc passes various compile tests" clean configure build test
diff --git a/developer/src/test/auto/kmx-file-languages/build.sh b/developer/src/test/auto/kmx-file-languages/build.sh
index 58ae1492ef..9bf1821450 100755
--- a/developer/src/test/auto/kmx-file-languages/build.sh
+++ b/developer/src/test/auto/kmx-file-languages/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test the read of language info from kmx files and translation from legacy ids to BCP47" clean configure build test
diff --git a/developer/src/test/auto/model-ts-parser/build.sh b/developer/src/test/auto/model-ts-parser/build.sh
index eaf5bb4819..e4e2208e56 100755
--- a/developer/src/test/auto/model-ts-parser/build.sh
+++ b/developer/src/test/auto/model-ts-parser/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test lexical model parser" clean configure build test
diff --git a/developer/src/test/auto/package-info/build.sh b/developer/src/test/auto/package-info/build.sh
index e67366b26e..32f9fbbbc4 100755
--- a/developer/src/test/auto/package-info/build.sh
+++ b/developer/src/test/auto/package-info/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test lexical model parser" clean configure build test
diff --git a/developer/src/test/build.sh b/developer/src/test/build.sh
index 48f3e69ac5..6546dbf752 100755
--- a/developer/src/test/build.sh
+++ b/developer/src/test/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/developer/src/tike/build.sh b/developer/src/tike/build.sh
index d0e5800fc3..0ba6c98642 100755
--- a/developer/src/tike/build.sh
+++ b/developer/src/tike/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Build Keyman Developer IDE" \
@@ -76,11 +76,10 @@ function do_build() {
   cp kmlmp.cmd "$DEVELOPER_PROGRAM"
   cp kmc.cmd "$DEVELOPER_PROGRAM"
   cp "$KEYMAN_ROOT/core/build/x86/$TARGET_PATH/src/$KEYMANCORE_DLL" "$DEVELOPER_PROGRAM"
-  if [[ -f "$WIN32_TARGET_PATH/tike.dbg" ]]; then
-    cp "$WIN32_TARGET_PATH/tike.dbg" "$DEVELOPER_DEBUGPATH"
-  fi
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/tike.dbg" "$DEVELOPER_DEBUGPATH"
+
   cp "$KEYMAN_ROOT/core/build/x86/$TARGET_PATH/src/$KEYMANCORE_DLL" "$WIN32_TARGET_PATH"
-  cp "$KEYMAN_ROOT/core/build/x86/$TARGET_PATH/src/$KEYMANCORE_PDB" "$WIN32_TARGET_PATH"
+  builder_if_release_build_level cp "$KEYMAN_ROOT/core/build/x86/$TARGET_PATH/src/$KEYMANCORE_PDB" "$WIN32_TARGET_PATH"
 
   cp "$KEYMAN_ROOT/common/windows/delphi/ext/sentry/sentry.dll" "$DEVELOPER_PROGRAM/"
   cp "$KEYMAN_ROOT/common/windows/delphi/ext/sentry/sentry.x64.dll" "$DEVELOPER_PROGRAM/"
diff --git a/developer/src/tools/sentry-upload-difs.sh b/developer/src/tools/sentry-upload-difs.sh
index 34ab4c60b0..b45387ec3e 100755
--- a/developer/src/tools/sentry-upload-difs.sh
+++ b/developer/src/tools/sentry-upload-difs.sh
@@ -14,7 +14,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$KEYMAN_ROOT/developer"
diff --git a/docs/build-bot.md b/docs/build-bot.md
new file mode 100644
index 0000000000..642f285894
--- /dev/null
+++ b/docs/build-bot.md
@@ -0,0 +1,229 @@
+# Controlling builds in CI with the Keyman build bot
+
+The Keyman CI test infrastructure can be controlled by use of a `Build-bot:`
+commit trailer, or a PR body `Build-bot:` trailer. This allows you to specify
+what is built for any given platform. The primary purpose of the build bot is to
+reduce the build agent load, but it can also be used to ensure that specific
+artifacts are available for the purposes of testing.
+
+The Keyman build bot is only available for test builds on pull requests. It is
+not used for any other builds, either test builds on target branches (master,
+beta, stable-x.y), or for release builds.
+
+The default set of platform builds is determined by the files touched in the
+pull request; see /resources/build/trigger-definitions.inc.sh. The default build
+level for this set is 'build' (see [Build Level] section). This is known as the
+'build set'.
+
+You may choose to increase or decrease what is built -- for example, for a
+documentation-only change, you may decide that nothing needs to be built at all,
+with:
+
+```
+Build-bot: skip
+```
+
+Or you may want to ensure that an artifact is built for Windows:
+
+```
+Build-bot: release:windows
+```
+
+## The Build-bot command
+
+The build bot is controlled through the `Build-bot` command, which can be put
+into commit trailers or the PR body (not PR comments). The format of the command
+is:
+
+```
+Build-bot: <BuildLevel>:[Platforms] ...
+```
+
+* `BuildLevel` can be `skip`, `build`, or `release`. See [Build Level] for more
+  details.
+* `Platforms` can be omitted, in which case the command applies to all
+  previously-specified platforms (which is not equivalent to specifying `all` --
+  if no platform is specified, it will only update platforms that were already
+  in the build set). If specified, it must be a comma-separated list, without
+  spaces, of one or more of the following platform identifiers:
+
+  * `all`: apply to all platforms listed below
+  * `android`
+  * `developer`
+  * `ios`
+  * `linux`
+  * `mac`
+  * `web`
+  * `windows`
+  * `common`: build common components, on all three build platforms (note:
+    `release` is equivalent to `build` buildLevel for `common`)
+  * `core`: build Keyman Core, on all three build platforms, and also WASM
+    (note: `release` is equivalent to `build` buildLevel for `core`)
+
+The list of platforms can be found in the `available_platforms` variable in
+trigger-definitions.inc.sh.
+
+## Build Level
+
+The build level specifies what we want to be run for a test build on a PR.
+
+There is a bit of nomenclature overlap with a 'release build'. A 'release'
+buildLevel for a 'test build' is roughly equivalent to what is performed in a
+'release build', however, a test build is only ever uploaded to test endpoints
+(i.e. TestFlight, Play Store 'test' streams), and never to *.keyman.com, or to
+other release distribution endpoints.
+
+The build level is controlled by the Build-bot commit trailer and PR body
+Build-bot/Test-bot trailers. The default build level will be 'build'.
+
+For target branch (master, beta, stable-x.y) builds, the build level will always
+be 'build', and Build-bot: commit trailers are ignored.
+
+### 'skip' build level
+
+Don't do a build at all. This would be appropriate for documentation PRs, for
+example, or changes only to comments in source files.
+
+### 'build' build level
+
+Build the code and run unit tests, but don't create artifacts. What this looks
+like will vary from platform to platform, but there are some common things we
+won't do:
+* we won't upload artifacts to TeamCity or *.keyman.com
+* we won't upload artifacts to any endpoint such as Play Store
+* we won't upload symbols to Sentry
+* we won't codesign
+
+However, we _will_ still build an installer (skipping codesigning), as this is
+part of the 'build' buildLevel rather than the 'release' buildLevel. The
+installer will be thrown away for 'build' build level -- it will not be
+available for download as an artifact.
+
+For a platform-specific example, on macOS we will also skip notarizing, as this
+is costly and depends on external network resources, making it fragile.
+
+### 'release' build level
+
+A full test build will be run, roughly equivalent to a release build. We will do
+the following steps:
+* codesign (many platforms) and notarization (macOS)
+* upload artifacts to TeamCity (all platforms)
+* upload builds to TestFlight / Play Store 'test' endpoints (iOS/Android)
+* upload symbols to Sentry
+
+For a 'release' build level:
+* we won't upload artifacts to *.keyman.com
+* we won't upload artifacts to any release endpoint such as Debian,
+  packages.sil.org, etc, or to the release areas for Play Store or App Store
+
+(uploading to *.keyman.com and to release endpoints happens in the release TC
+build config/GHA)
+
+## Controlling the build bot with trailers
+
+The build bot respects commit trailers and trailers in the PR body. The commands
+are cumulative and applied in order; the Build-bot trailer in the PR body is
+applied after any trailers in commit messages.
+
+If no platform is specified, then the command applies to all platforms in the
+current build set, overriding any previous Build-bot commands. Any platforms not
+in the current build set will remain 'skipped'.
+
+If a platform is specified, then the command will apply only to that platform,
+and the platform will be added to the build set if not already present (and
+thus, subsequent Build-bot commands will be applied to this new platform as
+well).
+
+It is important to note that the Build-bot trailers are read when builds are
+triggered, which happens within 2 minutes of a PR being opened or commits being
+pushed. Editing the PR body after the build trigger has run will have no effect
+on existing builds, until another commit is pushed, or the test build trigger is
+run manually from TeamCity. Thus, do not rely on editing the PR body after PR
+creation to control the build bot; either include your build bot trailers in
+commit messages, or include them in the PR body submitted when creating the PR.
+
+## Interactions with Test Bot
+
+The Build-bot has limited interactions with the Keyman test bot (aka
+keymanapp-test-bot): if a 'User Testing' section is found in the PR body, the
+default build level will be upgraded from 'build' to 'release'.
+
+Build bot trailers found in either the commits or in the PR body are applied
+after the test bot command.
+
+WARNING: The build bot does not check PR comments for Test-bot commands or a
+'User Testing' section.
+
+## Example Build-bot interactions
+
+Say we have a PR that touches `/android/build.sh`. The default build set will be
+`(android:build)`.
+
+The PR body has a User Testing section: `# User Testing`. The build set is
+upgraded to: `(android:release)`.
+
+The first commit includes a Build-bot command: `Build-bot: build:ios`. The build
+set is now `(android:release ios:build)`.
+
+In a subsequent commit, the PR author decides that nothing needs to be built,
+after all: `Build-bot: skip`. The build set is now `(android:skip ios:skip)`.
+Note that other platforms are still 'skip' but not included in the build set.
+
+Finally, the PR author pushes another commit, with `Build-bot: release:windows`.
+The build set is now: `(android:skip ios:skip windows:release)`.
+
+# FAQ
+
+* How do I specify commands for multiple platforms, e.g. building on Windows and Linux?
+
+```
+Build-bot: build:windows,linux
+```
+
+* If I modify a file that would cause a build on all platforms, does `Build-bot:
+  build android` then cause a build only on Android and skip all others? Or is
+  it only additive?
+
+The commands are additive. To skip all others, you would do:
+
+```
+Build-bot: skip
+Build-bot: build:android
+```
+
+* What happens in the following scenario: I have a PR that I only want to build
+  on Android and I add `Build-bot: build android`. Later on I merge in the
+  changes from `master` and add another commit. If I still only want to build on
+  Android, do I have to add `Build-bot: build android` on my new commit again?
+  Or what happens with merges that touch other files which would cause builds
+  for other platforms?
+
+First, you would need to specify `skip` for all other platforms in order to only
+build on Android:
+
+```
+Build-bot: skip
+Build-bot: build:android
+```
+
+Then, the build bot scans all the commits in the PR, and additively builds the
+final build set from the `Build-bot` commands from all the commits (up to 2000
+in one PR). Thus, earlier bot commands commits will continue to be honoured.
+This makes it easier to apply merge commits, for example, or small fixups,
+without needing to think about what needs to be built again.
+
+* How can I re-trigger builds after changing my build bot commands?
+
+In [TeamCity - Trigger Test Builds](https://build.palaso.org/buildConfiguration/Keyman_Test),
+select a custom Run (small button attached to right of Run button), and in the
+"Changes" tab, "Build branch" field, enter the PR number to re-run the builds.
+Any test builds currently running against that PR will be cancelled and
+restarted.
+
+Note: if you reduce the build set (with `skip`), and re-run builds in this way
+without pushing a new commit, you will end up with stale status checks on the
+latest commit in your PR for the builds that are now skipped on the new run, so
+in this scenario it is safest to push a new commit with the updated build bot
+commands.
+
+[Build Level]: #Build_Level
\ No newline at end of file
diff --git a/docs/builder.md b/docs/builder.md
index c0b889ce9f..538bf783bd 100644
--- a/docs/builder.md
+++ b/docs/builder.md
@@ -1,4 +1,7 @@
-# Using the build-utils.sh builder functions
+# Using the builder.inc.sh builder functions
+
+Note: see [resources/build/README.md](../resources/build/README.md) for
+distinction on builder-basic.inc.sh and builder-full.inc.sh.
 
 The Keyman repository is standardising on bash scripts for builds. These may
 call project-specific builders, such as `tsc` for Typescript projects, `meson`
@@ -43,7 +46,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/<relative-path-to-repo-root>/resources/build/build-utils.sh"
+. "$(dirname "$THIS_SCRIPT")/<relative-path-to-repo-root>/resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # . "$KEYMAN_ROOT/.../foo.inc.sh"     # any other includes, such as jq.inc.sh
@@ -78,7 +81,7 @@ Builder scripts will inherit `set -eu` from builder.inc.sh:
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/<relative-path-to-repo-root>/resources/build/build-utils.sh"
+. "$(dirname "$THIS_SCRIPT")/<relative-path-to-repo-root>/resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 ```
 
@@ -100,7 +103,7 @@ search-and-replace) this section in the future as required.
 
 ## Any other includes
 
-Once `build-utils.sh` has been included, the variable `$KEYMAN_ROOT` will be
+Once `builder-basic.inc.sh` has been included, the variable `$KEYMAN_ROOT` will be
 available, so other include scripts should be sourced accordingly, for example:
 
 ```bash
@@ -114,7 +117,7 @@ to `cd` at the start of your script.
 
 ## Standard environment
 
-`build-utils.sh` will prepend `$KEYMAN_ROOT/node_modules/.bin` to the `PATH`
+`builder-basic.inc.sh` will prepend `$KEYMAN_ROOT/node_modules/.bin` to the `PATH`
 variable to ensure that we run the correct versions of npm package commands, so
 there is no need to hard-code path references or add script wrappers to
 package.json (`npm run <script>`).
@@ -123,6 +126,13 @@ package.json (`npm run <script>`).
   passed in, or `release` otherwise, which corresponds to the output folder
   names for many projects.
 
+* `BUILDER_OS` will be set to `linux`, `mac`, or `win`, depending on the platform
+  the builder script is currently running on.
+
+  **NOTE:** Only use `BUILDER_OS` in a `case` statement. Use one of the
+  `builder_is_macos`, `builder_is_windows`, or `builder_is_linux` functions
+  to check if the script is running on a particular platform.
+
 Other environment variables and paths will probably be added over time.
 
 ## Split
@@ -182,6 +192,8 @@ a user or called by another script:
   An option will be inherited by child scripts if you append a `+` to the option
   name.
 
+  Other standard options are listed in [standard builder options].
+
 * **module dependencies**: these are other builder scripts which must be
   configured and built before the actions in this script can continue. Only
   `configure` and `build` actions are ever passed to dependency scripts; these
@@ -219,7 +231,7 @@ The first step in your script is to describe the available parameters, using
 
 ```bash
 builder_describe \
-  "Tests the build-utils.sh builder functions. This is merely an example." \
+  "Tests the builder-basic.inc.sh builder functions. This is merely an example." \
   clean \
   build \
   test \
@@ -257,7 +269,7 @@ for example:
 
 ```bash
 if builder_start_action configure; then
-  verify_npm_setup
+  node_select_version_and_npm_ci
   builder_finish_action success configure
 fi
 
@@ -320,20 +332,33 @@ across targets. Use this judiciously; for example, Keyman Core uses this to
 build both x86_64 and arm64 targets, and test only the appropriate architecture
 on macOS.
 
-# Standard builder parameters
+# Standard builder options
 
-The following parameters are pre-defined and should not be overridden:
+The following options are pre-defined and should not be overridden:
 
 * `--help`, `-h`: displays help on using this script
 * `--color`: forces on ANSI color output for the script
 * `--no-color`: forces off ANSI color output for the script
 * `--verbose`, `-v`: verbose mode, sets the [`$builder_verbose`] variable
-* `--debug`, `-d`: debug build; see [`builder_is_debug_build`] for more detail
+* `--debug`, `-d`: debug build (default for local builds); see
+  [`builder_is_debug_build`] for more detail
+* `--release`: release build, inverse of `--debug`, to force a non-debug build
 * `--offline`: allow to build while offline. This might fail if not all
   dependencies are cached.
 * `--deps`: Build dependencies if required (default)
 * `--no-deps`: Skip build of dependencies
 * `--force-deps`: Reconfigure and rebuild all dependencies
+* `--builder-ignore-unknown-options`: Ignore any subsequent unrecognized `-` or
+  `--` prefixed options in the parameter list. This is intended for use in
+  transitional situations where scripts may need to temporarily support passing
+  additional parameters; see also: #14200 for more background,
+  [`builder_ignore_unknown_options`], and [`$builder_ignored_options`].
+
+## Internal builder options
+
+The following options are used internally in builder and should never be included
+as parameters otherwise: `--builder-dep-parent`, `--builder-child`,
+`--builder-report-dependencies`, `--builder-completion-describe`
 
 --------------------------------------------------------------------------------
 
@@ -482,7 +507,7 @@ There is one standard option: `--debug`. You should not include `--debug` in the
 `builder_describe` call, as it is always available. See
 [`builder_is_debug_build`] for more details.
 
-Note that you should not include any of the [standard builder parameters] here.
+Note that you should not include any of the [standard builder options] here.
 
 **Dependencies** are defined with a `@` prefix, for example:
 
@@ -842,6 +867,47 @@ fi
 
 --------------------------------------------------------------------------------
 
+## `builder_ignore_unknown_options` function
+
+Returns `true` (aka 0) if the `--builder-ignore-unknown-options` standard option
+was passed in.
+
+### Usage
+
+```bash
+if builder_ignore_unknown_options; then
+  builder_echo "These options were ignored: ${builder_ignored_options[@]}"
+fi
+```
+
+### Description
+
+This function should probably never be used in a builder script; it is included
+for completeness and testing. See discussion in [standard builder options].
+
+--------------------------------------------------------------------------------
+
+## `$builder_ignored_options` variable
+
+Lists all the unrecognized options passed in; only used if the
+`--builder-ignore-unknown-options` option was set (because if not set, the
+script would have aborted in `builder_parse` with an unknown option error).
+
+### Usage
+
+```bash
+if builder_ignore_unknown_options; then
+  builder_echo "These options were ignored: ${builder_ignored_options[@]}"
+fi
+```
+
+### Description
+
+This variable should probably never be used in a builder script; it is included
+for completeness and testing. See discussion in [standard builder options].
+
+--------------------------------------------------------------------------------
+
 ## `builder_is_debug_build` function
 
 Returns `true` (aka 0) if the `--debug` standard option was passed in. This
@@ -1026,7 +1092,7 @@ longhand form.
   }
 
   builder_run_action clean        rm -rf ./build/ ./tsconfig.tsbuildinfo
-  builder_run_action configure    verify_npm_setup
+  builder_run_action configure    node_select_version_and_npm_ci
   builder_run_action build        do_build
 ```
 
@@ -1165,7 +1231,7 @@ fi
 
 --------------------------------------------------------------------------------
 
-## `builder_do_typescript_tests` function
+## `typescript_run_eslint_mocha_tests` function
 
 Runs eslint, builds tests, and then runs tests with mocha + c8 (coverage)
 
@@ -1175,7 +1241,7 @@ be moved to builder.typescript.inc.sh in the future.
 ### Usage
 
 ```bash
-builder_run_action  test    builder_do_typescript_tests [coverage_threshold]
+builder_run_action  test    typescript_run_eslint_mocha_tests [coverage_threshold]
 ```
 
 ### Parameters
@@ -1185,6 +1251,20 @@ builder_run_action  test    builder_do_typescript_tests [coverage_threshold]
 
 --------------------------------------------------------------------------------
 
+## `builder_is_windows`, `builder_is_macos`, and `builder_is_linux` functions
+
+Returns 0 (true) if building on the particular platform.
+
+### Usage
+
+```bash
+if builder_is_windows; then
+  builder_echo "We're building on a Windows machine"
+fi
+```
+
+--------------------------------------------------------------------------------
+
 ## Formatting variables
 
 These helper variables define ANSI color escapes when running in color mode, and
@@ -1208,7 +1288,7 @@ Note: it is often cleaner to use [`builder_echo`] than to use these variables di
 Note: it is recommended that you use `$(builder_term text)` instead of
 `${BUILDER_TERM_START}text${BUILDER_TERM_END}`.
 
-[standard builder parameters]: #standard-builder-parameters
+[standard builder options]: #standard-builder-options
 [`builder_describe`]: #builder_describe-function
 [`builder_describe_internal_dependency`]: #builder_describe_internal_dependency-function
 [`builder_describe_outputs`]: #builder_describe_outputs-function
@@ -1218,6 +1298,9 @@ Note: it is recommended that you use `$(builder_term text)` instead of
 [`builder_finish_action`]: #builder_finish_action-function
 [`builder_has_action`]: #builder_has_action-function
 [`builder_has_option`]: #builder_has_option-function
+[`$builder_ignored_options`]: #builder_ignored_options-variable
+[`builder_ignore_unknown_options`]: #builder_ignore_unknown_options-function
+[`builder_is_debug_build`]: #builder_is_debug_build-function
 [`builder_parse`]: #builder_parse-function
 [`builder_start_action`]: #builder_start_action-function
 [`builder_use_color`]: #builder_use_color-function
@@ -1228,4 +1311,3 @@ Note: it is recommended that you use `$(builder_term text)` instead of
 [`builder_echo`]: #builder_echo-function
 [`builder_die`]: #builder_die-function
 [`builder_echo_debug`]: #builder_echo_debug-function
-[`builder_is_debug_build`]: #builder_is_debug_build-function
diff --git a/docs/minimum-versions.md b/docs/minimum-versions.md
index 28af8e676b..96b6e820a5 100644
--- a/docs/minimum-versions.md
+++ b/docs/minimum-versions.md
@@ -50,7 +50,7 @@ https://help.keyman.com/developer/engine/android/latest-version/
 |-----------------------------------|--------------|
 | KEYMAN_DEFAULT_VERSION_UBUNTU_CONTAINER | noble |
 | KEYMAN_MIN_TARGET_VERSION_ANDROID | 5.0 |
-| KEYMAN_MIN_TARGET_VERSION_ANDROID_CHROME | 53.0 |
+| KEYMAN_MIN_TARGET_VERSION_ANDROID_CHROME | 95.0 |
 | KEYMAN_MIN_TARGET_VERSION_IOS | 15.6 |
 | KEYMAN_MIN_TARGET_VERSION_MAC | 10.13 |
 | KEYMAN_MIN_TARGET_VERSION_UBUNTU | 22.04 |
diff --git a/ios/build.sh b/ios/build.sh
index 78bd320b23..fb4df58ed8 100755
--- a/ios/build.sh
+++ b/ios/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 builder_describe "Builds Keyman Engine and the Keyman app for use on iOS devices - iPhone and iPad." \
   "@/resources/tools/check-markdown  test:help" \
@@ -16,8 +16,8 @@ builder_describe "Builds Keyman Engine and the Keyman app for use on iOS devices
   ":engine                      Builds KeymanEngine.xcframework, usable by our main app and by third-party apps" \
   ":app=keyman                  Builds the Keyman app for iOS platforms" \
   ":help                        Online documentation" \
-  ":sample1=Samples/KMSample1   Builds the first KeymanEngine sample app" \
-  ":sample2=Samples/KMSample2   Builds the second KeymanEngine sample app" \
+  ":sample1=samples/KMSample1   Builds the first KeymanEngine sample app" \
+  ":sample2=samples/KMSample2   Builds the second KeymanEngine sample app" \
   ":fv=../oem/firstvoices/ios   Builds OEM FirstVoices for iOS platforms" \
   "--sim-artifact+              Also outputs a simulator-friendly test artifact corresponding to the build"
 
diff --git a/ios/ci.sh b/ios/ci.sh
index fbcb46409f..03c1e11df8 100755
--- a/ios/ci.sh
+++ b/ios/ci.sh
@@ -3,17 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-# This script runs from its own folder
-cd "$THIS_SCRIPT_PATH"
-
-# Include our resource functions; they're pretty useful!
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
-
-# Please note that this build script (understandably) assumes that it is running on Mac OS X.
-verify_on_mac
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
 
 builder_describe "Defines actions for use in CI-related iOS builds." \
   "build" \
@@ -25,6 +19,8 @@ builder_describe "Defines actions for use in CI-related iOS builds." \
 
 builder_parse "$@"
 
+verify_on_mac
+
 function do_build() {
   ./build.sh                         clean configure build:engine build:app --sim-artifact
 
diff --git a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
index 524aecdfba..94dea1d5c7 100644
--- a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
+++ b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
@@ -1363,7 +1363,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env bash";
-			shellScript = "\"$KEYMAN_ROOT/resources/build/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/set-bundle-versions-tagged.sh\"\n";
+			shellScript = "\"$KEYMAN_ROOT/resources/build/mac/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/mac/set-bundle-versions-tagged.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		CEC0C66F2410B005003E1BCD /* Run Script - upload dsyms to Sentry */ = {
@@ -1383,7 +1383,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env bash";
-			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n. \"$KEYMAN_ROOT/resources/build/xcode-utils.sh\"\n\nif [ ${UPLOAD_SENTRY:-false} = true ]; then\n  # Calls resource script to perform the dSYM upload\n  phaseSentryDsymUpload \"keyman-ios\"\nfi\n";
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n. \"$KEYMAN_ROOT/resources/build/mac/xcode-utils.inc.sh\"\n\nif [ ${UPLOAD_SENTRY:-false} = true ]; then\n  # Calls resource script to perform the dSYM upload\n  phaseSentryDsymUpload \"keyman-ios\"\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeyboardScaleMap.swift b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeyboardScaleMap.swift
index d91006b4cb..08fee03028 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeyboardScaleMap.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeyboardScaleMap.swift
@@ -153,6 +153,7 @@ class KeyboardScaleMap {
     scalings[KeyboardScaleMap.hashKey(for: Device.iPad8)] = Scaling(portrait: KeyboardSize(w: 810, h: 265, b: 55), landscape: KeyboardSize(w: 1080, h: 353, b: 55))
     scalings[KeyboardScaleMap.hashKey(for: Device.iPad9)] = Scaling(portrait: KeyboardSize(w: 810, h: 265, b: 55), landscape: KeyboardSize(w: 1080, h: 353, b: 55))
     scalings[KeyboardScaleMap.hashKey(for: Device.iPad10)] = Scaling(portrait: KeyboardSize(w: 820, h: 262-5, b: 55), landscape: KeyboardSize(w: 1180, h: 347-5, b: 55)) // has negative 'system inset' (-5), which causes a mismatch in final height balanced by the subtraction
+    scalings[KeyboardScaleMap.hashKey(for: Device.iPadAir2)] = Scaling(portrait: KeyboardSize(w: 768, h: 258, b: 55), landscape: KeyboardSize(w: 1024, h: 343, b: 55)) // Banner always shows; merges copy ctrls with pred-banner.
     scalings[KeyboardScaleMap.hashKey(for: Device.iPadAir3)] = Scaling(portrait: KeyboardSize(w: 834, h: 265, b: 55), landscape: KeyboardSize(w: 1112, h: 353, b: 55))
     scalings[KeyboardScaleMap.hashKey(for: Device.iPadAir4)] = Scaling(portrait: KeyboardSize(w: 820, h: 262-5, b: 55), landscape: KeyboardSize(w: 1180, h: 347-5, b: 55))
     scalings[KeyboardScaleMap.hashKey(for: Device.iPadAir5)] = Scaling(portrait: KeyboardSize(w: 820, h: 262-5, b: 55), landscape: KeyboardSize(w: 1180, h: 347-5, b: 55))
diff --git a/ios/engine/build.sh b/ios/engine/build.sh
index fd473a2cdf..a14287c0fd 100755
--- a/ios/engine/build.sh
+++ b/ios/engine/build.sh
@@ -3,16 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-# Include our resource functions; they're pretty useful!
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
 
-# Please note that this build script (understandably) assumes that it is running on Mac OS X.
-verify_on_mac
-
 builder_describe "Builds Keyman Engine for use on iOS devices - iPhone and iPad." \
   "@/web/src/app/webview        build" \
   "@/web/src/engine/sentry-manager  build" \
@@ -23,6 +20,8 @@ builder_describe "Builds Keyman Engine for use on iOS devices - iPhone and iPad.
 
 builder_parse "$@"
 
+verify_on_mac
+
 CONFIG="Release"
 if builder_is_debug_build; then
   CONFIG="Debug"
@@ -50,7 +49,7 @@ XCODEFLAGS="-quiet -configuration $CONFIG"
 XCODEFLAGS_EXT="$XCODEFLAGS -derivedDataPath \"$DERIVED_DATA\" -workspace ../keymanios.xcworkspace"
 
 CODE_SIGN=
-if builder_is_debug_build; then
+if builder_is_debug_build || ( builder_is_ci_build && ! builder_is_ci_build_level_release ); then
   CODE_SIGN="CODE_SIGN_IDENTITY= CODE_SIGNING_REQUIRED=NO ${DEV_TEAM:-} CODE_SIGN_ENTITLEMENTS= CODE_SIGNING_ALLOWED=NO"
 fi
 
@@ -133,7 +132,9 @@ function build_engine() {
             KEYMAN_VERSION_ENVIRONMENT=$KEYMAN_VERSION_ENVIRONMENT \
             UPLOAD_SENTRY=$UPLOAD_SENTRY
 
-  assertDirExists "$KEYMAN_XCFRAMEWORK"
+  if ! [[ -d "${KEYMAN_XCFRAMEWORK}" ]]; then
+    builder_die "Build failed: directory '${KEYMAN_XCFRAMEWORK}' missing"
+  fi
 }
 
 builder_run_action clean         do_clean
diff --git a/ios/i18n-export.sh b/ios/i18n-export.sh
index 5ae87a6f97..aa41fd8b30 100755
--- a/ios/i18n-export.sh
+++ b/ios/i18n-export.sh
@@ -3,21 +3,17 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-# Include our resource functions; they're pretty useful!
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
 
 # This script runs from its own folder
 cd "$(dirname "$THIS_SCRIPT")"
 
-# Please note that this build script (understandably) assumes that it is running on Mac OS X.
 verify_on_mac
 
-## END STANDARD BUILD SCRIPT INCLUDE
-
-
 #xcodebuild -exportLocalizations -project "engine/KMEI/KeymanEngine.xcodeproj"
 #xcodebuild -exportLocalizations -project "keyman/Keyman/Keyman.xcodeproj"
 
diff --git a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
index 010674c7e0..7292a3f91d 100644
--- a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
+++ b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
@@ -974,7 +974,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env bash";
-			shellScript = ". \"$KEYMAN_ROOT/resources/build/xcode-utils.sh\"\n\nif [ ${UPLOAD_SENTRY:-false} = true ]; then\n  # Calls resource script to perform the dSYM upload\n  \"$KEYMAN_ROOT/resources/build/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/sentry-dsym-upload.sh\"\nfi\n";
+			shellScript = ". \"$KEYMAN_ROOT/resources/build/mac/xcode-utils.inc.sh\"\n\nif [ ${UPLOAD_SENTRY:-false} = true ]; then\n  # Calls resource script to perform the dSYM upload\n  \"$KEYMAN_ROOT/resources/build/mac/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/mac/sentry-dsym-upload.sh\"\nfi\n";
 		};
 		CE06AA671F161422006D91C3 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -1006,7 +1006,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env bash";
-			shellScript = "\"$KEYMAN_ROOT/resources/build/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/set-bundle-versions-and-settings-tagged.sh\"\necho \"script - set version complete\"\n";
+			shellScript = "\"$KEYMAN_ROOT/resources/build/mac/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/mac/set-bundle-versions-and-settings-tagged.sh\"\necho \"script - set version complete\"\n";
 			showEnvVarsInLog = 0;
 		};
 		CED3CFDA240E49DF001540A1 /* ShellScript */ = {
@@ -1024,7 +1024,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env bash";
-			shellScript = "\"$KEYMAN_ROOT/resources/build/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/set-bundle-versions-untagged.sh\"\n";
+			shellScript = "\"$KEYMAN_ROOT/resources/build/mac/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/mac/set-bundle-versions-untagged.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
diff --git a/ios/keyman/build.sh b/ios/keyman/build.sh
index cc43d42e60..5c6182a036 100755
--- a/ios/keyman/build.sh
+++ b/ios/keyman/build.sh
@@ -3,11 +3,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # Include our resource functions; they're pretty useful!
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-help.inc.sh"
 
 # Please note that this build script (understandably) assumes that it is running on Mac OS X.
@@ -92,7 +93,9 @@ function build_app() {
               KEYMAN_VERSION_ENVIRONMENT=$KEYMAN_VERSION_ENVIRONMENT \
               UPLOAD_SENTRY=$UPLOAD_SENTRY
 
-  assertDirExists "$ARCHIVE_PATH"
+  if ! [[ -d "${ARCHIVE_PATH}" ]]; then
+    builder_die "Build failed: directory '${ARCHIVE_PATH}' missing"
+  fi
 
   if ! builder_is_debug_build; then
     echo "Preparing .ipa file for deployment to real devices"
diff --git a/ios/samples/KMSample1/build.sh b/ios/samples/KMSample1/build.sh
index f7bb8798c7..c3bf1cc712 100755
--- a/ios/samples/KMSample1/build.sh
+++ b/ios/samples/KMSample1/build.sh
@@ -3,19 +3,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-# This script runs from its own folder
-cd "$THIS_SCRIPT_PATH"
-
-# Include our resource functions; they're pretty useful!
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
-
-# Please note that this build script (understandably) assumes that it is running on Mac OS X.
-verify_on_mac
-
-source "${THIS_SCRIPT%/*}/../common.inc.sh"
+source "${THIS_SCRIPT_PATH}/../common.inc.sh"
 
 TARGET=KMSample1
 execute_sample_build "$@"
\ No newline at end of file
diff --git a/ios/samples/KMSample2/build.sh b/ios/samples/KMSample2/build.sh
index 0b0fdc542d..3b3f58ccfe 100755
--- a/ios/samples/KMSample2/build.sh
+++ b/ios/samples/KMSample2/build.sh
@@ -3,19 +3,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-# This script runs from its own folder
-cd "$THIS_SCRIPT_PATH"
-
-# Include our resource functions; they're pretty useful!
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
-
-# Please note that this build script (understandably) assumes that it is running on Mac OS X.
-verify_on_mac
-
-source "${THIS_SCRIPT%/*}/../common.inc.sh"
+source "${THIS_SCRIPT_PATH}/../common.inc.sh"
 
 TARGET=KMSample2
 execute_sample_build "$@"
\ No newline at end of file
diff --git a/ios/samples/common.inc.sh b/ios/samples/common.inc.sh
index cbfc4796fd..131343ec8f 100755
--- a/ios/samples/common.inc.sh
+++ b/ios/samples/common.inc.sh
@@ -1,7 +1,11 @@
 #!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
 
-# This script is included by each sample build.sh.  Accordingly, it inherits build-utils.sh, etc
-# from the including script.
+# This script is included by each sample build.sh.  Accordingly, it inherits
+# builder-full.inc.sh from the including script.
+
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
 
 function do_build() {
   # Copy resources.
@@ -32,6 +36,8 @@ function execute_sample_build() {
 
   builder_parse "$@"
 
+  verify_on_mac
+
   local CONFIG=Release
   if builder_is_debug_build; then
     CONFIG="Debug"
diff --git a/ios/scripts/kme-universal.sh b/ios/scripts/kme-universal.sh
index ab61a5b7ce..7a70662e67 100755
--- a/ios/scripts/kme-universal.sh
+++ b/ios/scripts/kme-universal.sh
@@ -1,14 +1,13 @@
 #!/usr/bin/env bash
 
-set -e
-set -u
-
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
+
 SCHEME_NAME="KeymanEngine"
 FRAMEWORK_NAME="KeymanEngine"
 
diff --git a/ios/test.sh b/ios/test.sh
index fbff357cdb..e93614f682 100755
--- a/ios/test.sh
+++ b/ios/test.sh
@@ -1,3 +1,17 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
+
+verify_on_mac
+
 if [ "$#" -ge 1 ]; then
   DEVICE=$1
 else
diff --git a/ios/tools/prepRelease.sh b/ios/tools/prepRelease.sh
index cd82520662..28adfbe1ff 100755
--- a/ios/tools/prepRelease.sh
+++ b/ios/tools/prepRelease.sh
@@ -12,7 +12,7 @@ set -e
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/zip.inc.sh"
@@ -27,7 +27,7 @@ fi
 
 #Include script dependency
 . $KEYMAN_ROOT/resources/build/history/history-utils.sh         #includes the following
-#. ../resources/shellHelperFunctions.sh
+#. ../resources/build/utils.inc.sh
 
 BUILD_NUMBER=`cat ../VERSION.md`
 KEYMAN_TIER=`cat ../TIER.md`
@@ -50,12 +50,10 @@ mkdir -p "${UPLOAD_DIR}"
 echo "Writing changelog to $CHANGELOG_PATH"
 get_version_notes "ios" "${BUILD_NUMBER}" "$KEYMAN_TIER" > $CHANGELOG_PATH
 echo "* Minor fixes and performance improvements" >> $CHANGELOG_PATH
-assertFileExists "${CHANGELOG_PATH}"
 
 # Strip emoji as App Store does not allow emoji in changelogs
 node "$KEYMAN_ROOT/resources/tools/strip-emoji" < "$CHANGELOG_PATH" > "$CHANGELOG_PATH.1"
 mv -f "$CHANGELOG_PATH.1" "$CHANGELOG_PATH"
-assertFileExists "${CHANGELOG_PATH}"
 
 #
 # Keyman Engine
@@ -129,11 +127,9 @@ fi
 # Write download info files
 #
 
-cd "${UPLOAD_DIR}"
+write_download_info "${UPLOAD_DIR}" "${KMEI_DST_NAME}" "Keyman Engine for iOS" zip ios
+write_download_info "${UPLOAD_DIR}" "${KEYMANAPP_IPA_DST}" "Keyman for iPhone and iPad" ipa ios
 
-write_download_info "Keyman Engine for iOS" "${KMEI_DST_NAME}" "${BUILD_NUMBER}" "${KEYMAN_TIER}" "ios"
-write_download_info "Keyman for iPhone and iPad" "${KEYMANAPP_IPA_DST}" "${BUILD_NUMBER}" "${KEYMAN_TIER}" "ios"
-
-if [ ${RELEASE_OEM_FIRSTVOICES} = true ]; then
-  write_download_info "FirstVoices Keyboards" "${FIRSTVOICESAPP_IPA_DST}" "${BUILD_NUMBER}" "${KEYMAN_TIER}" "ios"
+if [[ ${RELEASE_OEM_FIRSTVOICES} = true ]]; then
+  write_download_info "${UPLOAD_DIR}" "${FIRSTVOICESAPP_IPA_DST}" "FirstVoices Keyboards" ipa ios
 fi
diff --git a/linux/build.sh b/linux/build.sh
index ae5e5d3bd4..418c6d2fb2 100755
--- a/linux/build.sh
+++ b/linux/build.sh
@@ -3,10 +3,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 ################################ Main script ################################
 
diff --git a/linux/debian/control b/linux/debian/control
index 44f1dc4d61..e4a0c0437a 100644
--- a/linux/debian/control
+++ b/linux/debian/control
@@ -96,6 +96,7 @@ Depends:
  python3-fonttools,
  python3-gi,
  python3-packaging,
+ python3-pkg-resources,
  python3-sentry-sdk (>= 1.1),
  python3-xdg,
  ${misc:Depends},
diff --git a/linux/ibus-keyman/build.sh b/linux/ibus-keyman/build.sh
index b3ec6be21a..a266aec740 100755
--- a/linux/ibus-keyman/build.sh
+++ b/linux/ibus-keyman/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 ################################ Main script ################################
diff --git a/linux/ibus-keyman/meson.build b/linux/ibus-keyman/meson.build
index e18cb6111e..f7a0eb7c7f 100644
--- a/linux/ibus-keyman/meson.build
+++ b/linux/ibus-keyman/meson.build
@@ -1,5 +1,6 @@
 project('ibus-keyman', 'c', 'cpp',
         version: files('../../VERSION.md'),
+        default_options: ['cpp_std=c++17'],
         license: 'GPL-2+',
         meson_version: '>=1.0')
 
@@ -55,6 +56,10 @@ core_include_dirs = [
   include_directories('../../core/build/arch' / get_option('buildtype') / 'include'),
 ]
 
+linux_include_dirs = [
+  include_directories('../include')
+]
+
 subdir('icons')
 subdir('src')
 subdir('tests')
diff --git a/linux/ibus-keyman/src/KeymanSystemServiceClient.cpp b/linux/ibus-keyman/src/KeymanSystemServiceClient.cpp
index 1c2867778e..ca3f077afc 100644
--- a/linux/ibus-keyman/src/KeymanSystemServiceClient.cpp
+++ b/linux/ibus-keyman/src/KeymanSystemServiceClient.cpp
@@ -5,11 +5,9 @@
 #else
 #include <basu/sd-bus.h>
 #endif
+#include <km_linux_common.h>
 #include "KeymanSystemServiceClient.h"
 
-#define KEYMAN_BUS_NAME "com.keyman.SystemService1"
-#define KEYMAN_INTERFACE_NAME "com.keyman.SystemService1.System"
-#define KEYMAN_OBJECT_PATH "/com/keyman/SystemService1/System"
 
 extern gboolean testing;
 
diff --git a/linux/ibus-keyman/src/engine.c b/linux/ibus-keyman/src/engine.c
index 770ffcd877..f47ffe4dab 100644
--- a/linux/ibus-keyman/src/engine.c
+++ b/linux/ibus-keyman/src/engine.c
@@ -32,6 +32,8 @@
 #include <keyman/keyman_core_api.h>
 #include <keyman/keyman_core_api_consts.h>
 
+#include <km_linux_common.h>
+
 #include "config.h"
 #include "keymanutil.h"
 #include "keyman-service.h"
@@ -51,10 +53,6 @@
 #define KEYMAN_RCTRL  97 // 0x61
 #define KEYMAN_RALT  100 // 0x64
 
-// TODO: Move to a common header file. Also defined in tests/testfixture.h
-// and keyman-system-service/src/OrderedOutputDevice.cpp
-#define KEYMAN_F24_KEYCODE_OUTPUT_SENTINEL 194  // 0xC2
-
 typedef struct _IBusKeymanEngine IBusKeymanEngine;
 typedef struct _IBusKeymanEngineClass IBusKeymanEngineClass;
 
diff --git a/linux/ibus-keyman/src/meson.build b/linux/ibus-keyman/src/meson.build
index 1f77fdb765..d6404ac2bc 100644
--- a/linux/ibus-keyman/src/meson.build
+++ b/linux/ibus-keyman/src/meson.build
@@ -13,6 +13,7 @@ engine_files = files(
 
 include_dirs = [
   core_include_dirs,
+  linux_include_dirs,
   include_directories('..'),
   include_directories(meson.current_build_dir() / '..'),
 ]
diff --git a/linux/ibus-keyman/tests/DbusTestHelper.cpp b/linux/ibus-keyman/tests/DbusTestHelper.cpp
index a657055eeb..e1b23ffd15 100644
--- a/linux/ibus-keyman/tests/DbusTestHelper.cpp
+++ b/linux/ibus-keyman/tests/DbusTestHelper.cpp
@@ -2,18 +2,13 @@
 #include <glib-object.h>
 #include <glib.h>
 #include <kmx/kmx_processevent.h>
+#include <km_linux_test_common.h>
 #include "EventSource.h"
 #include "KeyHandling.h"
 #include "KeymanSystemServiceClient.h"
 #include "kmx_test_source.hpp"
 #include "DbusTestHelper.h"
 
-// TODO: move these to a common header. Also defined in
-// keyman-system-service/tests/OrderedOutputDeviceMock.cpp
-#define KEYMAN_TESTHELPER_BUS_NAME "com.keyman.TestService"
-#define KEYMAN_TESTHELPER_OBJECT_PATH "/com/keyman/TestService/TestHelper"
-#define KEYMAN_TESTHELPER_INTERFACE_NAME "com.keyman.TestService.TestHelper"
-
 static sd_bus* bus = NULL;
 static EventSource *source = NULL;
 
diff --git a/linux/ibus-keyman/tests/dbus-test-server/KmDbusTestServer.cpp b/linux/ibus-keyman/tests/dbus-test-server/KmDbusTestServer.cpp
index 80ae444185..50007e2b9e 100644
--- a/linux/ibus-keyman/tests/dbus-test-server/KmDbusTestServer.cpp
+++ b/linux/ibus-keyman/tests/dbus-test-server/KmDbusTestServer.cpp
@@ -98,11 +98,9 @@ void KmDbusTestServer::Loop()
     return;
   }
 
-  guint exitFlag = FALSE;
-
   // Install the object
   ret = sd_bus_add_object_vtable(bus, NULL, KEYMAN_TESTSVC_OBJECT_PATH,
-    KEYMAN_TESTSVC_INTERFACE_NAME, test_service_vtable, &exitFlag);
+    KEYMAN_TESTSVC_INTERFACE_NAME, test_service_vtable, this);
   if (ret < 0) {
     g_error("Failed to issue method call: %s", strerror(-ret));
     return;
@@ -118,12 +116,12 @@ void KmDbusTestServer::Loop()
   for (;;) {
     // Process requests
     ret = sd_bus_process(bus, NULL);
-    g_debug("sd_bus_process returned %d, exitFlag=%d", ret, exitFlag);
+    g_debug("sd_bus_process returned %d, exitFlag=%d", ret, this->exitFlag);
     if (ret < 0) {
       g_error("Failed to process bus: %s", strerror(-ret));
       return;
     }
-    if (exitFlag) {
+    if (this->exitFlag) {
       // `exitFlag` can be modified by the callback function
       // `on_exit_method` which can be called by `sd_bus_process`
       g_debug("Exiting loop");
diff --git a/linux/ibus-keyman/tests/meson.build b/linux/ibus-keyman/tests/meson.build
index 22f16ef975..24f4bca851 100644
--- a/linux/ibus-keyman/tests/meson.build
+++ b/linux/ibus-keyman/tests/meson.build
@@ -25,6 +25,7 @@ test_env = [
 
 test_include_dirs = [
   core_include_dirs,
+  linux_include_dirs,
   include_directories('../../../core/tests/kmx_test_source'),
   include_directories('../src'),
   include_directories('..'),
diff --git a/linux/ibus-keyman/tests/scripts/run-tests.sh b/linux/ibus-keyman/tests/scripts/run-tests.sh
index 1f26b39a41..c2b9d796df 100755
--- a/linux/ibus-keyman/tests/scripts/run-tests.sh
+++ b/linux/ibus-keyman/tests/scripts/run-tests.sh
@@ -1,20 +1,24 @@
 #!/usr/bin/env bash
+# shellcheck disable=SC2312
+
 set -eu
 
+# shellcheck disable=SC2034
 TOP_SRCDIR=${top_srcdir:-$(realpath "$(dirname "$0")/../..")}
-TESTBASEDIR=${XDG_DATA_HOME:-$HOME/.local/share}/keyman
+TESTBASEDIR=${XDG_DATA_HOME:-${HOME}/.local/share}/keyman
 TESTDIR=${TESTBASEDIR}/test_kmx
 CLEANUP_FILE=/tmp/ibus-keyman-test-cleanup
 PID_FILE=/tmp/ibus-keyman-test.pids
 ENV_FILE=/tmp/keyman-env.txt
 
+# shellcheck disable=SC1091
 . "$(dirname "$0")"/test-helper.inc.sh
 
 local_cleanup() {
-  cleanup "$CLEANUP_FILE"
+  cleanup "${CLEANUP_FILE}"
 }
 
-if [ -v KEYMAN_PKG_BUILD ]; then
+if [[ -v KEYMAN_PKG_BUILD ]]; then
   # During package builds we skip these tests that require to start ibus because
   # ibus requires to find /var/lib/dbus/machine-id or /etc/machine-id, otherwise it fails with:
   # "Bail out! IBUS-FATAL-WARNING: Unable to load /var/lib/dbus/machine-id: Failed to open file
@@ -23,7 +27,7 @@ if [ -v KEYMAN_PKG_BUILD ]; then
   exit 0
 fi
 
-if ! which Xvfb > /dev/null || ! which Xephyr > /dev/null || ! which metacity > /dev/null || ! which mutter > /dev/null; then
+if ! command -v Xvfb > /dev/null || ! command -v Xephyr > /dev/null || ! command -v metacity > /dev/null || ! command -v mutter > /dev/null; then
   echo "Please install Xvfb, Xephyr, metacity and mutter before running these tests!"
   echo "sudo apt install xvfb xserver-xephyr metacity mutter"
   exit 1
@@ -54,9 +58,9 @@ function run_tests() {
   DISPLAY_SERVER=$1
   shift
 
-  if [ -d "$(dirname "$0")/../../../build/$(arch)/debug" ]; then
+  if [[ -d "$(dirname "$0")/../../../build/$(arch)/debug" ]]; then
     CONFIG=debug
-  elif [ -d "$(dirname "$0")/../../../build/$(arch)/release" ]; then
+  elif [[ -d "$(dirname "$0")/../../../build/$(arch)/release" ]]; then
     CONFIG=release
   else
     echo "Cannot find ../../../build/$(arch)/debug or ../../../build/$(arch)/release"
@@ -74,19 +78,20 @@ function run_tests() {
   fi
   echo ""
 
-  if [ $# -gt 0 ]; then
+  if [[ $# -gt 0 ]]; then
     #shellcheck disable=SC2206
     TESTFILES=($@)
   else
-    pushd "$TESTDIR" > /dev/null || exit
+    pushd "${TESTDIR}" > /dev/null || exit
     TESTFILES=(*.kmx)
     popd > /dev/null || exit
   fi
 
   echo "# Starting tests..."
   # shellcheck disable=SC1090
-  source "$ENV_FILE"
-  echo "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
+  source "${ENV_FILE}"
+  # shellcheck disable=SC2154
+  echo "DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}"
 
   if [[ -n ${REMOTE_DEBUG:-} ]]; then
     echo "===> Now attach debugger to ${REMOTE_HOST}"
@@ -97,10 +102,10 @@ function run_tests() {
   #shellcheck disable=SC2086
   ${REMOTE_DEBUG:-} "${G_TEST_BUILDDIR:-../../build/$(arch)/${CONFIG}/tests}/ibus-keyman-tests" ${ARG_K-} ${ARG_TAP-} \
     ${ARG_VERBOSE-} ${ARG_DEBUG-} ${ARG_SURROUNDING_TEXT-} ${ARG_NO_SURROUNDING_TEXT-} \
-    --directory "$TESTDIR" "${DISPLAY_SERVER}" ${TESTFILES[@]}
+    --directory "${TESTDIR}" "${DISPLAY_SERVER}" ${TESTFILES[@]}
   echo "# Finished tests."
 
-  cleanup "$CLEANUP_FILE"
+  cleanup "${CLEANUP_FILE}"
 }
 
 USE_WAYLAND=1
@@ -124,34 +129,34 @@ while (( $# )); do
   shift || (echo "Error: The last argument is missing a value. Exiting."; false) || exit 5
 done
 
-if ! can_run_wayland && [ "$USE_WAYLAND" == "0" ]; then
+if ! can_run_wayland && [[ "${USE_WAYLAND}" == "0" ]]; then
   # support for --headless got added in mutter 40.x
   echo "# WARNING: mutter doesn't support running headless. Skipping Wayland tests."
   USE_WAYLAND=0
-  if [ "$USE_X11" == "0" ]; then
+  if [[ "${USE_X11}" == "0" ]]; then
     echo "ERROR: no tests to run. Can't run Wayland tests, and --no-x11 is specified."
     exit 8
   fi
 fi
 
-if [ "$USE_WAYLAND" == "0" ] && [ "$USE_X11" == "0" ]; then
+if [[ "${USE_WAYLAND}" == "0" ]] && [[ "${USE_X11}" == "0" ]]; then
   echo "ERROR: I'll have to run somewhere. Specifying both --no-wayland and --no-x11 is not allowed."
   exit 6
 fi
 
 G_TEST_BUILDDIR="${G_TEST_BUILDDIR:-../../build/$(arch)/debug/tests}"
-if [ ! -f "${G_TEST_BUILDDIR}/ibus-keyman-tests" ]; then
+if [[ ! -f "${G_TEST_BUILDDIR}/ibus-keyman-tests" ]]; then
   G_TEST_BUILDDIR="${G_TEST_BUILDDIR:-../../build/$(arch)/release/tests}"
 fi
 
-echo > "$CLEANUP_FILE"
-echo > "$PID_FILE"
+echo > "${CLEANUP_FILE}"
+echo > "${PID_FILE}"
 trap local_cleanup EXIT SIGINT
 
-if [ "$USE_WAYLAND" == "1" ]; then
+if [[ "${USE_WAYLAND}" == "1" ]]; then
   run_tests --wayland "$@"
 fi
 
-if [ "$USE_X11" == "1" ]; then
+if [[ "${USE_X11}" == "1" ]]; then
   run_tests --x11 "$@"
 fi
diff --git a/linux/ibus-keyman/tests/scripts/test-helper.inc.sh b/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
index e9732cc478..2a6b38be3d 100755
--- a/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
+++ b/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 
 function can_run_wayland() {
   local MUTTER_VERSION
@@ -13,9 +13,9 @@ function can_run_wayland() {
 function _generate_kmpjson() {
   local TESTDIR
   TESTDIR="$1"
-  pushd "$TESTDIR" > /dev/null || exit
+  pushd "${TESTDIR}" > /dev/null || exit
   KMPFILE="${TESTDIR}/kmp.json"
-  cat <<-EOF > "$KMPFILE"
+  cat <<-EOF > "${KMPFILE}"
   {
     "system": {
       "keymanDeveloperVersion": "10.0.1099.0",
@@ -36,33 +36,33 @@ function _generate_kmpjson() {
       }
 EOF
   for f in k_*.kmx; do
-    keyboard=$(basename "$f")
+    keyboard=$(basename "${f}")
     keyboard="${keyboard%.*}"
-    echo "      ," >> "$KMPFILE"
-    cat <<-EOF >> "$KMPFILE"
+    echo "      ," >> "${KMPFILE}"
+    cat <<-EOF >> "${KMPFILE}"
       {
-        "name": "$keyboard",
-        "description": "$keyboard"
+        "name": "${keyboard}",
+        "description": "${keyboard}"
       }
 EOF
   done
-  cat <<-EOF >> "$KMPFILE"
+  cat <<-EOF >> "${KMPFILE}"
     ],
     "keyboards": [
 EOF
   FIRST=true
   for f in k_*.kmx; do
-    keyboard=$(basename "$f")
+    keyboard=$(basename "${f}")
     keyboard="${keyboard%.*}"
-    if $FIRST; then
+    if ${FIRST}; then
       FIRST=false
     else
-      echo "    ," >> "$KMPFILE"
+      echo "    ," >> "${KMPFILE}"
     fi
-    cat <<-EOF >> "$KMPFILE"
+    cat <<-EOF >> "${KMPFILE}"
     {
-      "name": "$keyboard",
-      "id": "$keyboard",
+      "name": "${keyboard}",
+      "id": "${keyboard}",
       "version": "0.0",
       "languages": [
         {
@@ -73,8 +73,8 @@ EOF
     }
 EOF
   done
-  echo "  ]" >> "$KMPFILE"
-  echo "}" >> "$KMPFILE"
+  echo "  ]" >> "${KMPFILE}"
+  echo "}" >> "${KMPFILE}"
   popd > /dev/null || exit
 }
 
@@ -84,9 +84,9 @@ function _link_test_keyboards() {
   TESTBASEDIR=$3
 
   if [[ $(find "${KMX_TEST_DIR}/" -name k_\*.kmx 2>/dev/null | wc -l) -gt 0 ]]; then
-    mkdir -p "$(realpath --canonicalize-missing "$TESTBASEDIR")"
-    rm -f "$TESTDIR"
-    ln -sf "$(realpath "${KMX_TEST_DIR}")" "$TESTDIR"
+    mkdir -p "$(realpath --canonicalize-missing "${TESTBASEDIR}")"
+    rm -f "${TESTDIR}"
+    ln -sf "$(realpath "${KMX_TEST_DIR}")" "${TESTDIR}"
   else
     echo "Can't find test kmx files in ${KMX_TEST_DIR}"
     exit 3
@@ -99,31 +99,31 @@ function _setup_init() {
   CLEANUP_FILE=$2
   PID_FILE=$3
 
-  if [ -z "${TOP_SRCDIR:-}" ]; then
+  if [[ -z "${TOP_SRCDIR:-}" ]]; then
     TOP_SRCDIR=${G_TEST_SRCDIR:-$(realpath "$(dirname "$0")/..")}/..
   fi
-  if [ -z "${TOP_BINDIR:-}" ]; then
+  if [[ -z "${TOP_BINDIR:-}" ]]; then
     TOP_BINDIR=${G_TEST_BUILDDIR:-$(realpath "$(dirname "$0/..")")}/..
   fi
 
-  echo > "$ENV_FILE"
+  echo > "${ENV_FILE}"
 
-  if [ -f "$CLEANUP_FILE" ]; then
+  if [[ -f "${CLEANUP_FILE}" ]]; then
     # kill previous instances
-    "$(dirname "$0")"/teardown-tests.sh "$CLEANUP_FILE" || true
+    "$(dirname "$0")"/teardown-tests.sh "${CLEANUP_FILE}" || true
   fi
 
-  echo > "$CLEANUP_FILE"
-  echo > "$PID_FILE"
+  echo > "${CLEANUP_FILE}"
+  echo > "${PID_FILE}"
   TEMP_DATA_DIR=$(mktemp --directory)
   echo "rm -rf \"${TEMP_DATA_DIR}\" || true # TEMP_DATA_DIR" >> "${CLEANUP_FILE}"
 
   COMMON_ARCH_DIR=
-  [ -d "${TOP_SRCDIR}"/../../core/build/arch ] && COMMON_ARCH_DIR=${TOP_SRCDIR}/../../core/build/arch
+  [[ -d "${TOP_SRCDIR}"/../../core/build/arch ]] && COMMON_ARCH_DIR=${TOP_SRCDIR}/../../core/build/arch
 
-  if [ -d "${COMMON_ARCH_DIR}"/release ]; then
+  if [[ -d "${COMMON_ARCH_DIR}"/release ]]; then
     COMMON_ARCH_DIR=${COMMON_ARCH_DIR}/release
-  elif [ -d "${COMMON_ARCH_DIR}"/debug ]; then
+  elif [[ -d "${COMMON_ARCH_DIR}"/debug ]]; then
     COMMON_ARCH_DIR=${COMMON_ARCH_DIR}/debug
   else
     echo "Can't find neither ${COMMON_ARCH_DIR}/release nor ${COMMON_ARCH_DIR}/debug"
@@ -131,7 +131,7 @@ function _setup_init() {
   fi
 
   export LD_LIBRARY_PATH=${COMMON_ARCH_DIR}/src:${LD_LIBRARY_PATH-}
-  echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> "$ENV_FILE"
+  echo "export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> "${ENV_FILE}"
 }
 
 function _setup_test_dbus_server() {
@@ -143,12 +143,14 @@ function _setup_test_dbus_server() {
   "${TOP_BINDIR}/tests/dbus-test-server/km-dbus-test-server" &> /tmp/km-test-server.log &
   sleep 1
 
-  cat /tmp/km-test-server.env >> "$ENV_FILE"
-  cat /tmp/km-test-server.env >> "$CLEANUP_FILE"
-  echo "${TOP_BINDIR}/tests/dbus-test-server/stop-test-server" >> "$CLEANUP_FILE"
+  cat /tmp/km-test-server.env >> "${ENV_FILE}"
+  cat /tmp/km-test-server.env >> "${CLEANUP_FILE}"
+  echo "${TOP_BINDIR}/tests/dbus-test-server/stop-test-server" >> "${CLEANUP_FILE}"
 
+  # shellcheck disable=SC1091
   source /tmp/km-test-server.env
-  echo "# DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
+  # shellcheck disable=SC2154
+  echo "# DBUS_SESSION_BUS_ADDRESS=${DBUS_SESSION_BUS_ADDRESS}"
 }
 
 function _setup_display_server() {
@@ -158,7 +160,7 @@ function _setup_display_server() {
   PID_FILE=$3
   DISPLAY_SERVER=$4
 
-  if [ "$DISPLAY_SERVER" == "--wayland" ]; then
+  if [[ "${DISPLAY_SERVER}" == "--wayland" ]]; then
     if ! can_run_wayland; then
       # support for --headless got added in mutter 40.x
       echo "ERROR: mutter doesn't support running headless. Can't run Wayland tests."
@@ -168,49 +170,49 @@ function _setup_display_server() {
     echo "Starting mutter..."
     TMPFILE=$(mktemp)
     # mutter-Message: 18:56:15.422: Using Wayland display name 'wayland-1'
-    mutter --wayland --headless --no-x11 --virtual-monitor 1024x768 &> "$TMPFILE" &
+    mutter --wayland --headless --no-x11 --virtual-monitor 1024x768 &> "${TMPFILE}" &
     PID=$!
-    echo "kill -9 ${PID} || true # mutter" >> "$CLEANUP_FILE"
+    echo "kill -9 ${PID} || true # mutter" >> "${CLEANUP_FILE}"
     echo "${PID} mutter" >> "${PID_FILE}"
     sleep 1s
     export WAYLAND_DISPLAY
-    WAYLAND_DISPLAY=$(grep "Using Wayland display" "$TMPFILE" | cut -d"'" -f2)
-    rm "$TMPFILE"
-    echo "export WAYLAND_DISPLAY=\"$WAYLAND_DISPLAY\"" >> "$ENV_FILE"
+    WAYLAND_DISPLAY=$(grep "Using Wayland display" "${TMPFILE}" | cut -d"'" -f2)
+    rm "${TMPFILE}"
+    echo "export WAYLAND_DISPLAY=\"${WAYLAND_DISPLAY}\"" >> "${ENV_FILE}"
   else
     echo "Running on X11:"
     while true; do
       echo "Starting Xvfb..."
-      DISP_XVFB=$RANDOM
-      Xvfb -screen 0 1024x768x24 :${DISP_XVFB} &> /dev/null &
+      DISP_XVFB=${RANDOM}
+      Xvfb -screen 0 1024x768x24 ":${DISP_XVFB}" &> /dev/null &
       PID=$!
       sleep 1
-      if ps --no-headers --pid="$PID" > /dev/null; then
+      if ps --no-headers --pid="${PID}" > /dev/null; then
         break
       fi
     done
-    echo "kill -9 ${PID} || true # Xvfb" >> "$CLEANUP_FILE"
+    echo "kill -9 ${PID} || true # Xvfb" >> "${CLEANUP_FILE}"
     echo "${PID} Xvfb" >> "${PID_FILE}"
     while true; do
       echo "Starting Xephyr..."
-      DISP_XEPHYR=$RANDOM
-      DISPLAY=:${DISP_XVFB} Xephyr :${DISP_XEPHYR} -screen 1024x768 &> /dev/null &
+      DISP_XEPHYR=${RANDOM}
+      DISPLAY=:${DISP_XVFB} Xephyr ":${DISP_XEPHYR}" -screen 1024x768 &> /dev/null &
       PID=$!
       sleep 1
-      if ps --no-headers --pid="$PID" > /dev/null; then
+      if ps --no-headers --pid="${PID}" > /dev/null; then
         break
       fi
     done
-    echo "kill -9 ${PID} || true # Xephyr" >> "$CLEANUP_FILE"
+    echo "kill -9 ${PID} || true # Xephyr" >> "${CLEANUP_FILE}"
     echo "${PID} Xephyr" >> "${PID_FILE}"
     echo "Starting metacity"
-    metacity --display=:${DISP_XEPHYR} &> /dev/null &
+    metacity --display=":${DISP_XEPHYR}" &> /dev/null &
     PID=$!
-    echo "kill -9 ${PID} || true # metacity" >> "$CLEANUP_FILE"
+    echo "kill -9 ${PID} || true # metacity" >> "${CLEANUP_FILE}"
     echo "${PID} metacity" >> "${PID_FILE}"
 
     export DISPLAY=:${DISP_XEPHYR}
-    echo "export DISPLAY=\"$DISPLAY\"" >> "$ENV_FILE"
+    echo "export DISPLAY=\"${DISPLAY}\"" >> "${ENV_FILE}"
   fi
 }
 
@@ -219,23 +221,23 @@ function _setup_schema_and_gsettings() {
   ENV_FILE=$1
 
   # Install schema to temporary directory. This removes the build dependency on the keyman package.
-  SCHEMA_DIR=$TEMP_DATA_DIR/glib-2.0/schemas
-  export XDG_DATA_DIRS=$TEMP_DATA_DIR:${XDG_DATA_DIRS-}
-  echo "export XDG_DATA_DIRS=$XDG_DATA_DIRS" >> "$ENV_FILE"
+  SCHEMA_DIR=${TEMP_DATA_DIR}/glib-2.0/schemas
+  export XDG_DATA_DIRS=${TEMP_DATA_DIR}:${XDG_DATA_DIRS-}
+  echo "export XDG_DATA_DIRS=${XDG_DATA_DIRS}" >> "${ENV_FILE}"
 
   export GSETTINGS_SCHEMA_DIR=${SCHEMA_DIR}
-  echo "export GSETTINGS_SCHEMA_DIR=\"$SCHEMA_DIR\"" >> "$ENV_FILE"
+  echo "export GSETTINGS_SCHEMA_DIR=\"${SCHEMA_DIR}\"" >> "${ENV_FILE}"
 
-  mkdir -p "$SCHEMA_DIR"
-  cp "${TOP_SRCDIR}"/../keyman-config/resources/com.keyman.gschema.xml "$SCHEMA_DIR"/
-  glib-compile-schemas "$SCHEMA_DIR"
+  mkdir -p "${SCHEMA_DIR}"
+  cp "${TOP_SRCDIR}"/../keyman-config/resources/com.keyman.gschema.xml "${SCHEMA_DIR}"/
+  glib-compile-schemas "${SCHEMA_DIR}"
 
   # Ubuntu 18.04 Bionic doesn't have ibus-memconf, and glib is not compiled with the keyfile
   # backend enabled, so we just use the default backend. Otherwise we use the keyfile
   # store which interferes less when running on a dev machine.
-  if [ -f /usr/libexec/ibus-memconf ]; then
+  if [[ -f /usr/libexec/ibus-memconf ]]; then
     export GSETTINGS_BACKEND=keyfile
-    echo "export GSETTINGS_BACKEND=\"$GSETTINGS_BACKEND\"" >> "$ENV_FILE"
+    echo "export GSETTINGS_BACKEND=\"${GSETTINGS_BACKEND}\"" >> "${ENV_FILE}"
     IBUS_CONFIG=--config=/usr/libexec/ibus-memconf
   fi
 }
@@ -264,7 +266,7 @@ function _setup_ibus() {
   IBUS_ADDRESS=$(ibus address)
   export IBUS_ADDRESS
 
-  echo "export IBUS_ADDRESS=\"$IBUS_ADDRESS\"" >> "$ENV_FILE"
+  echo "export IBUS_ADDRESS=\"${IBUS_ADDRESS}\"" >> "${ENV_FILE}"
 
   echo "Starting ibus-engine-keyman..."
   #shellcheck disable=SC2086
@@ -285,12 +287,12 @@ function setup() {
 
   _setup_init "${ENV_FILE}" "${CLEANUP_FILE}" "${PID_FILE}"
 
-  TESTBASEDIR=${XDG_DATA_HOME:-$HOME/.local/share}/keyman
+  TESTBASEDIR=${XDG_DATA_HOME:-${HOME}/.local/share}/keyman
   TESTDIR=${TESTBASEDIR}/test_kmx
 
-  _link_test_keyboards "${TOP_SRCDIR}/../../common/test/keyboards/baseline" "$TESTDIR" "$TESTBASEDIR"
+  _link_test_keyboards "${TOP_SRCDIR}/../../common/test/keyboards/baseline" "${TESTDIR}" "${TESTBASEDIR}"
 
-  _generate_kmpjson "$TESTDIR"
+  _generate_kmpjson "${TESTDIR}"
 
   _setup_test_dbus_server "${ENV_FILE}" "${CLEANUP_FILE}"
   _setup_display_server "${ENV_FILE}" "${CLEANUP_FILE}" "${PID_FILE}" "${DISPLAY_SERVER}"
@@ -314,10 +316,10 @@ function cleanup() {
   local CLEANUP_FILE
   CLEANUP_FILE=$1
 
-  if [ -f "$CLEANUP_FILE" ]; then
+  if [[ -f "${CLEANUP_FILE}" ]]; then
     echo
     echo "# Shutting down processes..."
-    bash "$CLEANUP_FILE" # > /dev/null 2>&1
+    bash "${CLEANUP_FILE}" # > /dev/null 2>&1
     rm "$CLEANUP_FILE"
     echo "# Finished shutdown of processes."
   fi
@@ -333,7 +335,7 @@ function cleanup() {
 }
 
 function exit_on_package_build() {
-  if [ -v KEYMAN_PKG_BUILD ]; then
+  if [[ -v KEYMAN_PKG_BUILD ]]; then
     # Skip setup during package builds - can't run headless and we won't
     # run the other tests anyway
     exit 0
@@ -346,12 +348,12 @@ function _get_missing_processes() {
   MISSING_PROCS=""
 
   while read -r LINE; do
-    if [ -z "$LINE" ]; then
+    if [[ -z "${LINE}" ]]; then
       continue
     fi
-    PID=$(echo "$LINE" | cut -d' ' -f1)
-    if ! ps --no-headers --pid="$PID" > /dev/null; then
-      MISSING_PROCS="${MISSING_PROCS}    $(echo "$LINE" | cut -d' ' -f2)"
+    PID=$(echo "${LINE}" | cut -d' ' -f1)
+    if ! ps --no-headers --pid="${PID}" > /dev/null; then
+      MISSING_PROCS="${MISSING_PROCS}    $(echo "${LINE}" | cut -d' ' -f2)"
       break
     fi
   done < "${PID_FILE}"
@@ -364,19 +366,19 @@ function check_processes_running() {
   CLEANUP_FILE=$3
   PID_FILE=$4
   TEST_NAME=$5
-  MISSING_PROCS=$(_get_missing_processes "$PID_FILE")
+  MISSING_PROCS=$(_get_missing_processes "${PID_FILE}")
 
-  if [ "$MISSING_PROCS" != "" ]; then
+  if [[ "${MISSING_PROCS}" != "" ]]; then
     echo "# Some background processes no longer running. Restarting..."
     { echo "Some background processes no longer running (running ${TEST_NAME}):" ; \
-      echo "$MISSING_PROCS" ; \
+      echo "${MISSING_PROCS}" ; \
       echo "Restarting..." ; } >> /tmp/debug.output
     mv /tmp/ibus-engine-keyman.log{,"-${TEST_NAME}-$(date -Iseconds)"}
     cleanup "${CLEANUP_FILE}" > /dev/null 2>&1
     setup "${DISPLAY_SERVER}" "${ENV_FILE}" "${CLEANUP_FILE}" "${PID_FILE}" > /dev/null 2>&1
   fi
 
-  if [ "$(_get_missing_processes "$PID_FILE")" != "" ]; then
+  if [[ "$(_get_missing_processes "$PID_FILE")" != "" ]]; then
     echo "# WARNING: Expected background processes are still missing after restart: ${MISSING_PROCS}"
     echo "# Maybe an old process is still running?"
   fi
diff --git a/linux/ibus-keyman/tests/testfixture.h b/linux/ibus-keyman/tests/testfixture.h
index bb317618a4..5d0e2f8eaf 100644
--- a/linux/ibus-keyman/tests/testfixture.h
+++ b/linux/ibus-keyman/tests/testfixture.h
@@ -4,12 +4,9 @@
 #include <glib-object.h>
 #include <glib.h>
 #include <ibus.h>
+#include <km_linux_common.h>
 #include "ibusimcontext.h"
 
-// TODO: Move to a common header file. Also defined in engine.c and
-// keyman-system-service/src/OrderedOutputDevice.cpp
-#define KEYMAN_F24_KEYCODE_OUTPUT_SENTINEL 194  // 0xC2
-
 typedef struct {
   IBusBus* bus;
   GtkIMContext* context;
diff --git a/linux/include/km_linux_common.h b/linux/include/km_linux_common.h
new file mode 100644
index 0000000000..65204d9ccf
--- /dev/null
+++ b/linux/include/km_linux_common.h
@@ -0,0 +1,11 @@
+// Keyman is copyright(C) SIL Global.MIT License.
+#ifndef __KM_LINUX_COMMON_H__
+#define __KM_LINUX_COMMON_H__
+
+#define KEYMAN_F24_KEYCODE_OUTPUT_SENTINEL 194  // 0xC2
+
+#define KEYMAN_BUS_NAME "com.keyman.SystemService1"
+#define KEYMAN_INTERFACE_NAME "com.keyman.SystemService1.System"
+#define KEYMAN_OBJECT_PATH "/com/keyman/SystemService1/System"
+
+#endif // __KM_LINUX_COMMON_H__
diff --git a/linux/include/km_linux_test_common.h b/linux/include/km_linux_test_common.h
new file mode 100644
index 0000000000..83fef7db2f
--- /dev/null
+++ b/linux/include/km_linux_test_common.h
@@ -0,0 +1,9 @@
+// Keyman is copyright(C) SIL Global.MIT License.
+#ifndef __KM_LINUX_TEST_COMMON_H__
+#define __KM_LINUX_TEST_COMMON_H__
+
+#define KEYMAN_TESTHELPER_BUS_NAME "com.keyman.TestService"
+#define KEYMAN_TESTHELPER_OBJECT_PATH "/com/keyman/TestService/TestHelper"
+#define KEYMAN_TESTHELPER_INTERFACE_NAME "com.keyman.TestService.TestHelper"
+
+#endif // __KM_LINUX_TEST_COMMON_H__
diff --git a/linux/keyman-config/build.sh b/linux/keyman-config/build.sh
index 8da21f35ce..32383ac83d 100755
--- a/linux/keyman-config/build.sh
+++ b/linux/keyman-config/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 ################################ Main script ################################
diff --git a/linux/keyman-system-service/build.sh b/linux/keyman-system-service/build.sh
index c673907882..9949fb1531 100755
--- a/linux/keyman-system-service/build.sh
+++ b/linux/keyman-system-service/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 ################################ Main script ################################
diff --git a/linux/keyman-system-service/meson.build b/linux/keyman-system-service/meson.build
index 82ef06d0e9..6f950ba59f 100644
--- a/linux/keyman-system-service/meson.build
+++ b/linux/keyman-system-service/meson.build
@@ -1,5 +1,6 @@
 project('keyman-system-service', 'c', 'cpp',
         version: files('../../VERSION.md'),
+        default_options: ['cpp_std=c++17'],
         license: 'MIT',
         meson_version: '>=1.0')
 
@@ -19,6 +20,10 @@ endif
 configure_file(output : 'config.h',
                configuration : conf)
 
+linux_include_dirs = [
+  include_directories('../include')
+]
+
 subdir('resources')
 subdir('src')
 subdir('tests')
diff --git a/linux/keyman-system-service/src/KeymanSystemService.cpp b/linux/keyman-system-service/src/KeymanSystemService.cpp
index f226ff2b2f..88cfa09ffa 100644
--- a/linux/keyman-system-service/src/KeymanSystemService.cpp
+++ b/linux/keyman-system-service/src/KeymanSystemService.cpp
@@ -17,12 +17,10 @@
 #else
 #include <basu/sd-bus.h>
 #endif
+#include <km_linux_common.h>
 #include "KeymanSystemService.h"
 #include "KeyboardDevice.h"
 
-#define KEYMAN_BUS_NAME "com.keyman.SystemService1"
-#define KEYMAN_INTERFACE_NAME "com.keyman.SystemService1.System"
-#define KEYMAN_OBJECT_PATH "/com/keyman/SystemService1/System"
 
 using namespace std;
 
diff --git a/linux/keyman-system-service/src/OrderedOutputDevice.cpp b/linux/keyman-system-service/src/OrderedOutputDevice.cpp
index 5d388769ff..bc1d1546fc 100644
--- a/linux/keyman-system-service/src/OrderedOutputDevice.cpp
+++ b/linux/keyman-system-service/src/OrderedOutputDevice.cpp
@@ -5,14 +5,11 @@
 #include <string>
 #include <syslog.h>
 #include <unistd.h>
+#include <km_linux_common.h>
 #include "OrderedOutputDevice.h"
 
 using namespace std;
 
-// TODO: Move to a common header file. Also defined in ibus-keyman/src/engine.c
-// and ibus-keyman/tests/testfixture.h
-#define KEYMAN_F24_KEYCODE_OUTPUT_SENTINEL 194  // 0xC2
-
 #ifndef KEYMAN_TESTING
 OrderedOutputDevice* CreateOrderedOutputDevice() {
   return new OrderedOutputDevice();
diff --git a/linux/keyman-system-service/src/meson.build b/linux/keyman-system-service/src/meson.build
index a99c977efb..1a1532deed 100644
--- a/linux/keyman-system-service/src/meson.build
+++ b/linux/keyman-system-service/src/meson.build
@@ -11,7 +11,7 @@ exe = executable(
   'keyman-system-service',
   sources: [service_files],
   dependencies: deps,
-  include_directories: ['..'],
+  include_directories: [linux_include_dirs, '..'],
   install: true,
   install_dir: get_option('libexecdir'),
 )
diff --git a/linux/keyman-system-service/tests/OrderedOutputDeviceMock.cpp b/linux/keyman-system-service/tests/OrderedOutputDeviceMock.cpp
index ca5db30ae6..152dbab5a7 100644
--- a/linux/keyman-system-service/tests/OrderedOutputDeviceMock.cpp
+++ b/linux/keyman-system-service/tests/OrderedOutputDeviceMock.cpp
@@ -4,14 +4,9 @@
 #else
 #include <basu/sd-bus.h>
 #endif
+#include <km_linux_test_common.h>
 #include "OrderedOutputDevice.h"
 
-// TODO: move these to a common header. Also defined in
-// ibus-keyman/tests/DBusTestHelper.cpp
-#define KEYMAN_TESTHELPER_BUS_NAME "com.keyman.TestService"
-#define KEYMAN_TESTHELPER_OBJECT_PATH "/com/keyman/TestService/TestHelper"
-#define KEYMAN_TESTHELPER_INTERFACE_NAME "com.keyman.TestService.TestHelper"
-
 #ifndef KEYMAN_TESTING
 #warning KEYMAN_TESTING should be defined when compiling tests
 #endif
diff --git a/linux/keyman-system-service/tests/README.md b/linux/keyman-system-service/tests/README.md
index af77363b65..477a776c63 100644
--- a/linux/keyman-system-service/tests/README.md
+++ b/linux/keyman-system-service/tests/README.md
@@ -9,3 +9,11 @@ keyman-system-service. The differences are:
 
 The keyman-test-service gets called/used by the ibus-keyman integration
 tests.
+
+This test service goes hand in hand with `linux/ibus-keyman/tests/dbus-test-server`:
+during test setup the dbus-test-server gets started (and registers its
+class), but also adds our `services` subdir (`linux/keyman-system-service/tests/services`)
+to the list of directories to be searched for services.
+
+When during the test `ibus-engine-keyman` calls a method on
+`keyman-test-service` it will be started by dbus.
diff --git a/linux/keyman-system-service/tests/meson.build b/linux/keyman-system-service/tests/meson.build
index b180b73a18..b984747427 100644
--- a/linux/keyman-system-service/tests/meson.build
+++ b/linux/keyman-system-service/tests/meson.build
@@ -19,7 +19,7 @@ exe = executable(
   c_args: test_c_args,
   cpp_args: test_c_args,
   dependencies: deps,
-  include_directories: [ '..', '../src' ]
+  include_directories: [ linux_include_dirs, '..', '../src' ]
 )
 
 # we currently don't have any real unit tests for keyman-system-service.
diff --git a/linux/mcompile/keymap/build.sh b/linux/mcompile/keymap/build.sh
index d7c6aac34f..e969d0d025 100755
--- a/linux/mcompile/keymap/build.sh
+++ b/linux/mcompile/keymap/build.sh
@@ -3,11 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 . "${THIS_SCRIPT%/*}/../../../resources/build/meson-utils.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-#. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+#. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 ################################ Main script ################################
 
diff --git a/linux/mcompile/keymap/meson.build b/linux/mcompile/keymap/meson.build
index b6d489902c..af9c84017e 100644
--- a/linux/mcompile/keymap/meson.build
+++ b/linux/mcompile/keymap/meson.build
@@ -1,6 +1,7 @@
 project(
   'mcompile', 'c', 'cpp',
   version: files('../../../VERSION.md'),
+  default_options: ['cpp_std=c++17'],
   license: 'MIT',
   meson_version: '>=1.0',
 )
diff --git a/linux/scripts/deb-packaging.sh b/linux/scripts/deb-packaging.sh
index bc5cca2730..97f069377b 100755
--- a/linux/scripts/deb-packaging.sh
+++ b/linux/scripts/deb-packaging.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# shellcheck disable=SC2154 # (variables are set in build-utils.sh)
+# shellcheck disable=SC2154 # (variables are set in builder-basic.inc.sh)
 # Actions for creating a Debian source package and verifying the API.
 # Used by deb-packaging.yml and api-verification.yml GHAs.
 
@@ -9,7 +9,7 @@ shopt -s inherit_errexit
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${KEYMAN_ROOT}/linux/scripts/verify_api.inc.sh"
diff --git a/linux/scripts/debian.sh b/linux/scripts/debian.sh
index 3a896c10b2..6c8314ee10 100755
--- a/linux/scripts/debian.sh
+++ b/linux/scripts/debian.sh
@@ -16,7 +16,7 @@ set -e
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . $(dirname "$THIS_SCRIPT")/package-build.inc.sh
diff --git a/linux/scripts/dist.sh b/linux/scripts/dist.sh
index 9a55cd630b..f1580c99cd 100755
--- a/linux/scripts/dist.sh
+++ b/linux/scripts/dist.sh
@@ -12,7 +12,7 @@ set -e
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 BASEDIR=$(pwd)
@@ -93,7 +93,7 @@ dpkg-source \
   --tar-ignore=keyman/resources/scopes \
   --tar-ignore=keyman/resources/teamcity \
   --tar-ignore=keyman/resources/build/*.lua \
-  --tar-ignore=keyman/resources/build/jq* \
+  --tar-ignore=keyman/resources/build/jq-* \
   --tar-ignore=keyman/results \
   --tar-ignore=keyman/tmp \
   --tar-ignore=keyman/web \
diff --git a/linux/scripts/launchpad.sh b/linux/scripts/launchpad.sh
index 3d139c1032..47e0144595 100755
--- a/linux/scripts/launchpad.sh
+++ b/linux/scripts/launchpad.sh
@@ -15,8 +15,8 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-# shellcheck source=resources/build/build-utils.sh
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+# shellcheck source=resources/build/builder-basic.inc.sh
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck source=linux/scripts/package-build.inc.sh
@@ -33,7 +33,7 @@ else
 fi
 echo "ppa: ${ppa}"
 
-distributions="${DIST:-jammy noble oracular plucky questing}"
+distributions="${DIST:-jammy noble plucky questing}"
 packageversion="${PACKAGEVERSION:-1~sil1}"
 
 BASEDIR=$(pwd)
diff --git a/linux/scripts/reconf.sh b/linux/scripts/reconf.sh
index d6d2c3891c..a6b7f1f5a0 100755
--- a/linux/scripts/reconf.sh
+++ b/linux/scripts/reconf.sh
@@ -5,7 +5,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 BASEDIR="$KEYMAN_ROOT/linux"
diff --git a/linux/scripts/test/deb-packaging.tests.sh b/linux/scripts/test/deb-packaging.tests.sh
index 8da8fd8ec8..c3cd751e5c 100755
--- a/linux/scripts/test/deb-packaging.tests.sh
+++ b/linux/scripts/test/deb-packaging.tests.sh
@@ -4,7 +4,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${THIS_SCRIPT%/*}/test.inc.sh"
diff --git a/linux/scripts/test/verify_api.tests.sh b/linux/scripts/test/verify_api.tests.sh
index 05f60cea83..d3095ae150 100755
--- a/linux/scripts/test/verify_api.tests.sh
+++ b/linux/scripts/test/verify_api.tests.sh
@@ -6,7 +6,7 @@ shopt -s inherit_errexit
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${THIS_SCRIPT%/*}/test.inc.sh"
diff --git a/linux/scripts/upload-to-debian.sh b/linux/scripts/upload-to-debian.sh
index 3b2c5ba1dd..50a1831830 100755
--- a/linux/scripts/upload-to-debian.sh
+++ b/linux/scripts/upload-to-debian.sh
@@ -33,10 +33,10 @@ END
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 NOOP=
 PUSH=
diff --git a/linux/scripts/verify_api.inc.sh b/linux/scripts/verify_api.inc.sh
index 0caaa6d23f..843a7ea350 100644
--- a/linux/scripts/verify_api.inc.sh
+++ b/linux/scripts/verify_api.inc.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# shellcheck disable=SC2154 # (variables are set in build-utils.sh)
+# shellcheck disable=SC2154 # (variables are set in builder-basic.inc.sh)
 
 output_log() {
   echo "$1" >&2
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/es.lproj/Localizable.strings b/mac/Keyman4MacIM/Keyman4MacIM/es.lproj/Localizable.strings
index 5251447fa7..5813350d75 100644
--- a/mac/Keyman4MacIM/Keyman4MacIM/es.lproj/Localizable.strings
+++ b/mac/Keyman4MacIM/Keyman4MacIM/es.lproj/Localizable.strings
@@ -71,7 +71,7 @@
 "privacy-alert-text" = "Para funcionar correctamente, Keyman requiere las siguientes características de accesibilidad:\nel acceso en Preferencias del Sistema, Seguridad y Privacidad.\nel reinicio del sistema.";
 
 /* message displayed to alert user to grant accessibility permission in Settings, for macOS Ventura and later */
-"privacy-alert-text-ventura" = "To function properly, Keyman requires accessibility features:\n\nGrant access in System Settings, Privacy & Security.\nRestart your system.";
+"privacy-alert-text-ventura" = "Para funcionar correctamente, Keyman requiere características de accesibilidad:\n\nConceder acceso en la configuración del sistema, privacidad y seguridad.\nReinicie su sistema.";
 
 /* Text of menu item in Input Menu when no Keyboards are configured -- include parentheses  */
 "no-keyboard-configured-menu-placeholder" = "(Sin teclado configurado)";
diff --git a/mac/Keyman4MacIM/make-km-dmg.sh b/mac/Keyman4MacIM/make-km-dmg.sh
index 84d09312c1..0ee1d7395b 100755
--- a/mac/Keyman4MacIM/make-km-dmg.sh
+++ b/mac/Keyman4MacIM/make-km-dmg.sh
@@ -3,11 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # Please note that this build script (understandably) assumes that it is running on Mac OS X.
-if [[ "${OSTYPE}" != "darwin"* ]]; then
+if ! builder_is_macos; then
   echo "This build script will only run in a Mac environment."
   exit 1
 fi
@@ -46,7 +46,7 @@ cd `dirname ${KEYMAN_MACIM_BASE_PATH}` > /dev/null
 KEYMAN_MACIM_BASE_PATH=`pwd`;
 popd  > /dev/null
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 KM_APP_NAME="Install Keyman.app"
 OUTPUT_DIR="$KEYMAN_MACIM_BASE_PATH/output"
@@ -141,14 +141,14 @@ fi
 
 # Step 1 - Copy template to working copy to prevent unintended changes
 WORKING_COPY_OF_IMAGE="$OUTPUT_DIR/Keyman-temp-$KEYMAN_VERSION.dmg"
-displayInfo "Copying \"$TEMPLATE_IMAGE\" to \"$WORKING_COPY_OF_IMAGE\"..."
+builder_echo info "Copying \"$TEMPLATE_IMAGE\" to \"$WORKING_COPY_OF_IMAGE\"..."
 if [[ -e "$WORKING_COPY_OF_IMAGE" && "$VERBOSITY" != "-quiet" ]] ; then
     builder_warn "Overwriting: $WORKING_COPY_OF_IMAGE"
 fi
 cp -f "$TEMPLATE_IMAGE" "$WORKING_COPY_OF_IMAGE"
 
 # Step 2 - Mount (copy of) template image - writeable
-displayInfo "Attaching \"$WORKING_COPY_OF_IMAGE\"" "Mounting as \"$STAGING_DIR\"..."
+builder_echo info "Attaching \"$WORKING_COPY_OF_IMAGE\"" "Mounting as \"$STAGING_DIR\"..."
 if [[ -e "$STAGING_DIR" ]]; then
     builder_die "Mount folder $STAGING_DIR is already present. Unmount it first."
 fi
@@ -170,7 +170,7 @@ ls -la "$STAGING_DIR/background"
 echo "---- End Listing ----"
 
 # Step 3 - Replace existing application files with new version
-displayInfo "Copying files from \"$SOURCE_KM_APP\"..."
+builder_echo info "Copying files from \"$SOURCE_KM_APP\"..."
 find "$DEST_KM_APP" -mindepth 1 -maxdepth 1
 echo "---------"
 find "$DEST_KM_APP" -mindepth 1 -maxdepth 1 -print0 | xargs -0 rm -rf
@@ -184,7 +184,7 @@ ls -la "$STAGING_DIR/background"
 echo "---- End Listing ----"
 
 # Step 4 - Detach/unmount the temporary image/staging area
-displayInfo "Detaching \"$WORKING_COPY_OF_IMAGE\""
+builder_echo info "Detaching \"$WORKING_COPY_OF_IMAGE\""
 
 # Attempt to detach 10 times, waiting 5 seconds each time
 # because macOS may still be working in the folder in the
@@ -213,7 +213,7 @@ fi
 
 # Step 5 - Convert image to a compressed readonly DMG image
 DMG_FILE_PATH="$DEST_DIR/keyman-$KEYMAN_VERSION.dmg"
-displayInfo "Converting/compressing image to create \"$DMG_FILE_PATH\""
+builder_echo info "Converting/compressing image to create \"$DMG_FILE_PATH\""
 if [[ -e "$DMG_FILE_PATH" ]] ; then
     if [[ "$VERBOSITY" != "-quiet" ]] ; then
         builder_warn "Overwriting: $DMG_FILE_PATH"
@@ -226,8 +226,8 @@ if ! [[ $? == 0 && -f "$DMG_FILE_PATH" ]]; then
 fi
 
 # Step 6 - Clean up
-displayInfo "Cleaning up..."
+builder_echo info "Cleaning up..."
 rm "$WORKING_COPY_OF_IMAGE"
 
-displayInfo "Make DMG completed successfully."
+builder_echo info "Make DMG completed successfully."
 exit 0
diff --git a/mac/Keyman4MacIM/write-download_info.sh b/mac/Keyman4MacIM/write-download_info.sh
deleted file mode 100755
index 656d0ce385..0000000000
--- a/mac/Keyman4MacIM/write-download_info.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/env bash
-
-## START STANDARD BUILD SCRIPT INCLUDE
-# adjust relative paths as necessary
-THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-# Please note that this build script (understandably) assumes that it is running on Mac OS X.
-if [[ "${OSTYPE}" != "darwin"* ]]; then
-  echo "This build script will only run in a Mac environment."
-  exit 1
-fi
-
-display_usage() {
-    echo "Used to create a metadata file needed on the download site"
-    echo "to describe the downloadable Keyman Input Method app."
-    echo "Typically called from the Keyman mac build script."
-    echo
-    echo "usage: write-download_info.sh [-destDir DIR]"
-    echo
-    echo "  Optional switches:"
-    echo "  -destDir DIR    Directory where the download_info file should be created"
-    echo "                  (will be created if it does not exist)"
-    exit 1
-}
-
-KEYMAN_MACIM_BASE_PATH="${BASH_SOURCE[0]}";
-if ([ -h "${KEYMAN_MACIM_BASE_PATH}" ]) then
-	while([ -h "${KEYMAN_MACIM_BASE_PATH}" ]) do KEYMAN_MACIM_BASE_PATH=`readlink "${KEYMAN_MACIM_BASE_PATH}"`; done
-fi
-pushd . > /dev/null
-cd `dirname ${KEYMAN_MACIM_BASE_PATH}` > /dev/null
-KEYMAN_MACIM_BASE_PATH=`pwd`;
-popd  > /dev/null
-
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
-
-DEST_DIR="$KEYMAN_MACIM_BASE_PATH/output/upload"
-ADD_VERSION_TO_DEST_DIR=true
-
-KM_BLD_COUNTER="$((${KEYMAN_VERSION##*.}))"
-
-# Parse args
-shopt -s nocasematch
-
-while [[ $# -gt 0 ]] ; do
-    key="$1"
-    case $key in
-        -destDir)
-            if [[ "$2" == "" || "$2" =~ ^\- ]]; then
-                builder_die "Missing destination directory on command line."
-            else
-                DEST_DIR="$2"
-                ADD_VERSION_TO_DEST_DIR=false
-                shift # past argument
-            fi
-            ;;
-        -h|-\?|-help|--help)
-            display_usage
-            ;;
-        -*)
-          builder_die "Unknown option $1. Run with --help for help."
-          ;;
-    esac
-    shift # past argument
-done
-
-if $ADD_VERSION_TO_DEST_DIR ; then
-    DEST_DIR="$DEST_DIR/$KEYMAN_VERSION"
-fi
-if [[ ! -e $DEST_DIR ]]; then
-	mkdir -p $DEST_DIR
-elif [[ ! -d $DEST_DIR ]]; then
-	builder_die "Destination dir exists but is not a directory: $2"
-fi
-
-DMG_FILENAME="keyman-$KEYMAN_VERSION.dmg"
-DMG_FILEPATH="$DEST_DIR/$DMG_FILENAME"
-DOWNLOAD_INFO_FILEPATH="${DMG_FILEPATH}.download_info"
-if [[ ! -f "$DMG_FILEPATH" ]]; then
-  builder_die "Cannot compute file size or MD5 for non-existent DMG file: $DMG_FILEPATH"
-fi
-DMG_FILE_SIZE=$(/usr/bin/stat -f"%z" "$DMG_FILEPATH")
-DMG_MD5=$(md5 -q "$DMG_FILEPATH")
-
-if [[ -f "$DOWNLOAD_INFO_FILEPATH" ]]; then
-  builder_warn "Overwriting $DOWNLOAD_INFO_FILEPATH"
-fi
-
-echo { > "$DOWNLOAD_INFO_FILEPATH"
-echo "  \"name\": \"Keyman4MacIM\"," >> "$DOWNLOAD_INFO_FILEPATH"
-echo "  \"version\": \"${KEYMAN_VERSION}\"," >> "$DOWNLOAD_INFO_FILEPATH"
-echo "  \"date\": \"$(date "+%Y-%m-%d")\"," >> "$DOWNLOAD_INFO_FILEPATH"
-echo "  \"platform\": \"mac\"," >> "$DOWNLOAD_INFO_FILEPATH"
-echo "  \"stability\": \"${KEYMAN_TIER}\"," >> "$DOWNLOAD_INFO_FILEPATH"
-echo "  \"file\": \"${DMG_FILENAME}\"," >> "$DOWNLOAD_INFO_FILEPATH"
-echo "  \"md5\": \"${DMG_MD5}\"," >> "$DOWNLOAD_INFO_FILEPATH"
-echo "  \"type\": \"dmg\"," >> "$DOWNLOAD_INFO_FILEPATH"
-echo "  \"build\": \"${KM_BLD_COUNTER}\"," >> "$DOWNLOAD_INFO_FILEPATH"
-echo "  \"size\": \"${DMG_FILE_SIZE}\"" >> "$DOWNLOAD_INFO_FILEPATH"
-echo } >> "$DOWNLOAD_INFO_FILEPATH"
-
-exit 0
diff --git a/mac/build.sh b/mac/build.sh
index ea9822f909..cff2b22b84 100755
--- a/mac/build.sh
+++ b/mac/build.sh
@@ -2,12 +2,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-help.inc.sh"
-. "$KEYMAN_ROOT/mac/mac-utils.inc.sh"
 
 builder_describe "Builds Keyman for macOS." \
   "@/core:mac" \
@@ -27,6 +27,8 @@ builder_describe "Builds Keyman for macOS." \
 
 builder_parse "$@"
 
+verify_on_mac
+
 # Default is release build of Engine and (code-signed) Input Method
 if builder_is_debug_build; then
   CONFIG="Debug"
@@ -102,7 +104,7 @@ execBuildCommand() {
     shift
     declare -r cmnd="$*"
 
-    displayInfo "Building $component:" "$cmnd"
+    builder_echo heading "Building $component:" "$cmnd"
     set +e
     local ret_code=0
     eval "$cmnd" || ret_code=$?
@@ -276,7 +278,7 @@ do_install() {
 
   builder_heading "Attempting local deployment with command:"
   KM4MIM_APP_BASE_PATH="$KM4MIM_BASE_PATH/build/$CONFIG"
-  displayInfo "$KM4MIM_BASE_PATH/localdeploy.sh \"$KM4MIM_APP_BASE_PATH\""
+  builder_echo info "$KM4MIM_BASE_PATH/localdeploy.sh \"$KM4MIM_APP_BASE_PATH\""
   "$KM4MIM_BASE_PATH/localdeploy.sh" "$KM4MIM_APP_BASE_PATH"
 }
 
@@ -286,10 +288,10 @@ do_publish() {
   builder_heading "Preparing files for release deployment..."
   ./setup/build.sh
 
-  "$KM4MIM_BASE_PATH/make-km-dmg.sh"
+  "${KM4MIM_BASE_PATH}/make-km-dmg.sh"
 
-  # Create download info
-  "$KM4MIM_BASE_PATH/write-download_info.sh"
+  local UPLOAD_PATH="${KM4MIM_BASE_PATH}/output/upload/${KEYMAN_VERSION}"
+  write_download_info "${UPLOAD_PATH}" "keyman-${KEYMAN_VERSION}.dmg" "Keyman4MacIM" dmg mac
 
   do_sentry
 }
diff --git a/mac/is_same_version.sh b/mac/is_same_version.sh
index da9daf1610..d8c3441a6e 100755
--- a/mac/is_same_version.sh
+++ b/mac/is_same_version.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+# TODO: this is currently a no-op. Eliminate or fix.
+
 # compares the version of this branch (in ../VERSION.md) to the
 #	version in the Xcode project file of the subproject named in $1
 # returns zero if they are the same, non-zero if not the same or a problem occurs
@@ -7,7 +9,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 #TODO:
diff --git a/mac/mac-utils.inc.sh b/mac/mac-utils.inc.sh
deleted file mode 100644
index a9d814d247..0000000000
--- a/mac/mac-utils.inc.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-
-if [ -z "${DEVELOPMENT_TEAM+x}" ]; then
-    DEVELOPMENT_TEAM=3YE4W86L3G
-fi
-
-function mac_notarize() {
-  local TARGET_PATH="$1"
-  local TARGET_FILE="$2"
-
-  local NOTARYTOOL_LOG_PATH="$TARGET_PATH/notarytool.log"
-
-  xcrun notarytool submit \
-      --apple-id "$APPSTORECONNECT_USERNAME" \
-      --team-id "$DEVELOPMENT_TEAM" \
-      --password "$APPSTORECONNECT_PASSWORD" \
-      --output-format json \
-      --wait \
-      "$TARGET_FILE" > "$NOTARYTOOL_LOG_PATH"
-  # notarytool output: {"status":"Accepted","id":"ca62bba0-6c49-43c2-90d8-83a8ef306e0f","message":"Processing complete"}
-
-  cat "$NOTARYTOOL_LOG_PATH"
-  local NOTARYTOOL_STATUS=`cat "$NOTARYTOOL_LOG_PATH" | jq -r .status`
-  local NOTARYTOOL_SUBMISSION_ID=`cat "$NOTARYTOOL_LOG_PATH" | jq -r .id`
-  if [[ "$NOTARYTOOL_STATUS" != Accepted ]]; then
-      # We won't assume notarytool returns an error code if status != Accepted
-      builder_die "Notarization failed with $NOTARYTOOL_STATUS"
-  fi
-
-  builder_heading "Notarization completed successfully. Review logs below for any warnings."
-
-  xcrun notarytool log \
-        --apple-id "$APPSTORECONNECT_USERNAME" \
-        --team-id "$DEVELOPMENT_TEAM" \
-        --password "$APPSTORECONNECT_PASSWORD" \
-        "$NOTARYTOOL_SUBMISSION_ID"
-
-  rm -f "$NOTARYTOOL_LOG_PATH"
-}
-
-execCodeSign() {
-  # Allow the signing to fail up to 5 times (network transient error on timestamping)
-  local ret_code=0
-  local count=0
-  local method="$1"
-  shift
-  if [[ "$method" == direct ]]; then
-    method=
-  fi
-  while (( count <  5 )); do
-    $method codesign "$@" || ret_code=$?
-    if [ $ret_code == 0 ]; then
-      return 0
-    fi
-    (( count++ ))
-    builder_echo "codesign attempt $count failed with error $ret_code"
-    sleep 5
-  done
-
-  builder_echo "*** codesign parameters: $@"
-  builder_die "Unable to sign component after 5 attempts (exit code $ret_code)"
-}
diff --git a/mac/mcompile/build.sh b/mac/mcompile/build.sh
index c689cd7a39..76571ffa18 100755
--- a/mac/mcompile/build.sh
+++ b/mac/mcompile/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 . "${THIS_SCRIPT%/*}/../../resources/build/meson-utils.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
diff --git a/mac/mcompile/meson.build b/mac/mcompile/meson.build
index 0918028e45..6a156752ab 100644
--- a/mac/mcompile/meson.build
+++ b/mac/mcompile/meson.build
@@ -1,5 +1,6 @@
 project('mcompile', 'c', 'cpp',
         version: files('../../VERSION.md'),
+        default_options: ['cpp_std=c++17'],
         license: 'MIT',
         meson_version: '>=1.0')
 
@@ -26,8 +27,7 @@ comon_include_dir = [
 
 mcompile = executable(
     'mcompile',
-    cpp_args: ['-std=c++17'], # this should be defined from resources/standard.meson.build
     sources: [cpp_files],
     dependencies: deps,
     include_directories : comon_include_dir
-    )
\ No newline at end of file
+    )
diff --git a/mac/setup/build.sh b/mac/setup/build.sh
index af39660b6a..f8c161c08a 100755
--- a/mac/setup/build.sh
+++ b/mac/setup/build.sh
@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-# Include our resource functions; they're pretty useful!
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
-. "$KEYMAN_ROOT/mac/mac-utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
 
-# Please note that this build script (understandably) assumes that it is running on Mac OS X.
 verify_on_mac
 
 cd "${THIS_SCRIPT_PATH}"
diff --git a/oem/firstvoices/android/app/build.gradle b/oem/firstvoices/android/app/build.gradle
index 8a6558aa3d..468517061d 100644
--- a/oem/firstvoices/android/app/build.gradle
+++ b/oem/firstvoices/android/app/build.gradle
@@ -7,6 +7,12 @@ plugins {
 ext.rootPath = '../../../../android'
 apply from: "$rootPath/version.gradle"
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
+
 android {
     compileSdk 34
     namespace="com.firstvoices.keyboards"
diff --git a/oem/firstvoices/android/build.sh b/oem/firstvoices/android/build.sh
index 2e10dd5b83..f571c8209b 100755
--- a/oem/firstvoices/android/build.sh
+++ b/oem/firstvoices/android/build.sh
@@ -4,10 +4,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
 
diff --git a/oem/firstvoices/common/build_csv_languages.sh b/oem/firstvoices/common/build_csv_languages.sh
index 19e6ba06ed..dc33056f79 100755
--- a/oem/firstvoices/common/build_csv_languages.sh
+++ b/oem/firstvoices/common/build_csv_languages.sh
@@ -11,7 +11,7 @@ set -u
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
diff --git a/oem/firstvoices/ios/FirstVoices.xcodeproj/project.pbxproj b/oem/firstvoices/ios/FirstVoices.xcodeproj/project.pbxproj
index 7546e31557..1242db1b8f 100644
--- a/oem/firstvoices/ios/FirstVoices.xcodeproj/project.pbxproj
+++ b/oem/firstvoices/ios/FirstVoices.xcodeproj/project.pbxproj
@@ -440,7 +440,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env bash";
-			shellScript = "\"$KEYMAN_ROOT/resources/build/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/set-bundle-versions-untagged.sh\"\n";
+			shellScript = "\"$KEYMAN_ROOT/resources/build/mac/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/mac/set-bundle-versions-untagged.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		37DF007C24595F6F00C73128 /* Run Script */ = {
@@ -459,7 +459,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/usr/bin/env bash";
-			shellScript = "\"$KEYMAN_ROOT/resources/build/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/set-bundle-versions-and-settings-untagged.sh\"\n";
+			shellScript = "\"$KEYMAN_ROOT/resources/build/mac/xcode-wrap.sh\" \"$KEYMAN_ROOT/resources/build/mac/set-bundle-versions-and-settings-untagged.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		9800EC5D1C029FCD00BF0FB5 /* ShellScript */ = {
diff --git a/oem/firstvoices/ios/build.sh b/oem/firstvoices/ios/build.sh
index 1b13248f98..18fe62ef44 100755
--- a/oem/firstvoices/ios/build.sh
+++ b/oem/firstvoices/ios/build.sh
@@ -4,18 +4,15 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-# Include our resource functions; they're pretty useful!
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/mac/mac.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
 
 # ################################ Main script ################################
 
-# Please note that this build script (understandably) assumes that it is running on Mac OS X.
-verify_on_mac
-
 export TARGET=FirstVoices
 
 builder_describe "Builds the $TARGET app for use on iOS devices - iPhone and iPad." \
@@ -27,6 +24,8 @@ builder_describe "Builds the $TARGET app for use on iOS devices - iPhone and iPa
 
 builder_parse "$@"
 
+verify_on_mac
+
 KMEI_BUILD_DIR="$KEYMAN_ROOT/ios/build"
 DERIVED_DATA="$THIS_SCRIPT_PATH/build"
 
@@ -109,8 +108,9 @@ function do_build() {
             KEYMAN_VERSION=$KEYMAN_VERSION \
             KEYMAN_VERSION_WITH_TAG=$KEYMAN_VERSION_WITH_TAG
 
-    assertDirExists "$ARCHIVE_PATH"
-
+    if ! [[ -d "${ARCHIVE_PATH}" ]]; then
+      builder_die "Build failed: directory '${ARCHIVE_PATH}' missing"
+    fi
 
     # Do NOT use the _EXT variant here; there's no scheme to ref, which will lead
     # Xcode to generate a build error.
diff --git a/oem/firstvoices/windows/src/inst/build.sh b/oem/firstvoices/windows/src/inst/build.sh
index f427c0dfc0..c264fcbc83 100755
--- a/oem/firstvoices/windows/src/inst/build.sh
+++ b/oem/firstvoices/windows/src/inst/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-source "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+source "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 source "$KEYMAN_ROOT/resources/build/build-download-resources.sh"
 
 builder_describe "Installation files for FirstVoices Keyboards" \
@@ -22,7 +22,7 @@ builder_parse "$@"
 
 . "$KEYMAN_ROOT/resources/build/win/environment.inc.sh"
 . "$KEYMAN_ROOT/resources/build/win/wix.inc.sh"
-. "$KEYMAN_ROOT/resources/build/win/zip.inc.sh"
+. "$KEYMAN_ROOT/resources/build/zip.inc.sh"
 
 # In dev environments, we'll hack the tier to alpha; CI sets this for us in real builds.
 if [[ -z ${KEYMAN_TIER+x} ]]; then
@@ -85,7 +85,7 @@ function do_publish() {
   # Build self-extracting archive
   #
   create-setup-inf
-  wzzip firstvoices.zip firstvoices.msi license.html setup.inf setuptitle.png fv_all.kmp
+  add_zip_files firstvoices.zip firstvoices.msi license.html setup.inf setuptitle.png fv_all.kmp
   rm -f setup.inf
   cat "$WINDOWS_PROGRAM_APP/setup-redist.exe" firstvoices.zip > firstvoices.exe
   rm -f firstvoices.zip
@@ -105,7 +105,7 @@ function copy-installer() {
   cp firstvoices.msi "$KEYMAN_ROOT/windows/release/${KEYMAN_VERSION}/firstvoices.msi"
   cp firstvoices.exe "$KEYMAN_ROOT/windows/release/${KEYMAN_VERSION}/firstvoices-${KEYMAN_VERSION}.exe"
 
-  verify-installer-signatures
+  builder_if_release_build_level verify-installer-signatures
 }
 
 function verify-installer-signatures() {
diff --git a/package-lock.json b/package-lock.json
index 5262663a45..91bbb1d165 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1153,7 +1153,7 @@
         "@sentry/node": "^7.57.0",
         "chalk": "^4.1.2",
         "express": "^4.20.0",
-        "multer": "^2.0.1",
+        "multer": "^2.0.2",
         "ngrok": "^5.0.0-beta.2",
         "open": "^8.4.0",
         "restructure": "^3.0.1",
@@ -5053,7 +5053,9 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5342,6 +5344,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -6259,6 +6274,20 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/duplexer": {
       "version": "0.1.2",
       "dev": true,
@@ -6396,12 +6425,10 @@
       }
     },
     "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
@@ -6420,15 +6447,29 @@
       "integrity": "sha512-pqrTKmwEIgafsYZAGw9kszYzmagcE/n4dbgwGWLEXg7J4QFJVQRBld8j3Q3GNez79jzxZshq0bcT962QHOghjw==",
       "dev": true
     },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
-      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
-      "dev": true,
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -7892,13 +7933,16 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -8038,15 +8082,21 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "license": "MIT",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
         "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8055,6 +8105,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-stream": {
       "version": "5.2.0",
       "license": "MIT",
@@ -8297,11 +8360,12 @@
       }
     },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -8383,6 +8447,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
       "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -8391,9 +8456,10 @@
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -8402,12 +8468,13 @@
       }
     },
     "node_modules/has-tostringtag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9876,6 +9943,15 @@
       "integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==",
       "dev": true
     },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/media-typer": {
       "version": "0.3.0",
       "license": "MIT",
@@ -10197,9 +10273,9 @@
       }
     },
     "node_modules/mocha/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -10493,9 +10569,9 @@
       "license": "MIT"
     },
     "node_modules/multer": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.1.tgz",
-      "integrity": "sha512-Ug8bXeTIUlxurg8xLTEskKShvcKDZALo1THEX5E41pYCD2sCVub5/kIRIGqWNoqV6szyLyQKV6mD4QUrWE5GCQ==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/multer/-/multer-2.0.2.tgz",
+      "integrity": "sha512-u7f2xaZ/UG8oLXHvtF/oWTRvT44p9ecwBBqTwgJVq0+4BW1g8OW01TyMEGWBHbyMOYVHXslaut7qEQ1meATXgw==",
       "license": "MIT",
       "dependencies": {
         "append-field": "^1.0.0",
diff --git a/resources/build.sh b/resources/build.sh
index a3cf8b0dd5..432cd8c9eb 100755
--- a/resources/build.sh
+++ b/resources/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman resources module" clean configure build test
@@ -15,6 +15,8 @@ builder_parse "$@"
 
 if builder_start_action test; then
   ./build/test/test.sh
+  ./build/test/build-bot/trigger-build-bot.test.sh
+  ./build/pr-build-status/build.sh test
   ./build/publish-minimum-versions.sh test
   builder_finish_action success test
 fi
diff --git a/resources/build/README.md b/resources/build/README.md
index 6a9271a5e4..1a03fbda34 100644
--- a/resources/build/README.md
+++ b/resources/build/README.md
@@ -12,9 +12,22 @@ including this file...
 
 ## Various tools
 
-### build-utils.sh, builder.inc.sh
+### builder-basic.inc.sh, builder-full.inc.sh
 
-See [builder.md](../../docs/builder.md)
+There are two wrappers for builder.inc.sh:
+
+* resources/build/builder-basic.inc.sh - Keyman-specific builder-based script
+  that also sets version environment,  repo base path, and other environment
+  variables
+* resources/build/builder-full.inc.sh - Keyman-specific builder-based script,
+  calls builder-basic.inc.sh, sets cwd to script path, and on exit verifies that
+  builder functions were used appropriately.
+
+All build.sh scripts should use builder-full.inc.sh. Some helper scripts may
+use builder-basic.inc.sh. No scripts in this repo (apart from tests) should
+use builder.inc.sh directly.
+
+builder.inc.sh is documented in [builder.md](../../docs/builder.md)
 
 ### jq/jq-win64
 
diff --git a/resources/build/build-utils-ci.inc.sh b/resources/build/build-utils-ci.inc.sh
index b4fc88c252..33c074037a 100644
--- a/resources/build/build-utils-ci.inc.sh
+++ b/resources/build/build-utils-ci.inc.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
 #
 # This script gets CI / pull request details for builds, part of the build-utils
 # builder_ suite of functions. All functions and variables in this file have the
@@ -179,7 +180,7 @@ function _builder_prepublish() {
 
         builder_echo "Manually linking $link_source -> $link_target (see https://github.com/npm/cli/issues/3466)"
         rm -rf $link_source
-        if [[ $BUILDER_OS == win ]]; then
+        if builder_is_windows; then
           link_source="$(cygpath -w "$link_source")"
           link_target="$(cygpath -w "$link_target")"
           cmd //c mklink //j "$link_source" "$link_target"
diff --git a/resources/build/build-utils-ci.test.sh b/resources/build/build-utils-ci.test.sh
index 662ea581da..a4d79e5d5a 100755
--- a/resources/build/build-utils-ci.test.sh
+++ b/resources/build/build-utils-ci.test.sh
@@ -8,17 +8,17 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 # Tests
 
 builder_echo "${COLOR_BLUE}## Testing: builder_pull_get_details with \$TEAMCITY_PR_NUMBER not set${COLOR_RESET}"
 if ! builder_pull_get_details; then
-  builder_echo "PASS: builder_pull_get_details should get no details if \$TEAMCITY_PR_NUMBER is not set"
+  builder_echo green "  ✓ PASS: builder_pull_get_details should get no details if \$TEAMCITY_PR_NUMBER is not set"
 else
   builder_die "FAIL: builder_pull_get_details should get no details if \$TEAMCITY_PR_NUMBER is not set"
 fi
@@ -27,7 +27,7 @@ fi
 builder_echo "${COLOR_BLUE}## Testing: builder_pull_get_details with \$TEAMCITY_PR_NUMBER=master${COLOR_RESET}"
 TEAMCITY_PR_NUMBER=master
 if ! builder_pull_get_details; then
-  builder_echo "PASS: builder_pull_get_details should get no details if \$TEAMCITY_PR_NUMBER=master"
+  builder_echo green "  ✓ PASS: builder_pull_get_details should get no details if \$TEAMCITY_PR_NUMBER=master"
 else
   builder_die "FAIL: builder_pull_get_details should get no details if \$TEAMCITY_PR_NUMBER=master"
 fi
@@ -44,7 +44,7 @@ builder_echo "  pull number: $builder_pull_number"
 builder_echo "  title:       $builder_pull_title"
 builder_echo "  labels:      ${builder_pull_labels[*]}"
 
-builder_echo "PASS: builder_pull_get_details with \$TEAMCITY_PR_NUMBER=$TEAMCITY_PR_NUMBER"
+builder_echo green "  ✓ PASS: builder_pull_get_details with \$TEAMCITY_PR_NUMBER=$TEAMCITY_PR_NUMBER"
 
 
 builder_echo "${COLOR_BLUE}## Testing: builder_pull_has_label epic-ldml${COLOR_RESET}"
@@ -52,6 +52,6 @@ if ! builder_pull_has_label epic-ldml; then
   builder_die "FAIL: builder_pull_has_label epic-ldml"
 fi
 
-builder_echo "PASS: builder_pull_has_label epic-ldml"
+builder_echo green "  ✓ PASS: builder_pull_has_label epic-ldml"
 
 builder_echo "All tests passed."
diff --git a/resources/build/build-utils.sh b/resources/build/build-utils.sh
index 4996845c5a..0d735b0add 100755
--- a/resources/build/build-utils.sh
+++ b/resources/build/build-utils.sh
@@ -1,408 +1,6 @@
 #!/usr/bin/env bash
-#
-# This script sets build environment variables. KEYMAN_VERSION vars are also exported:
-#   KEYMAN_VERSION:          Full current build version, e.g. "14.0.1"
-#   KEYMAN_VERSION_WIN:      Full current build version for Windows, e.g. "14.0.1.0"
-#   KEYMAN_VERSION_RELEASE:  Current release version, e.g. "14.0"
-#   KEYMAN_VERSION_MAJOR:    Major version, e.g. "14"
-#   KEYMAN_VERSION_MINOR:    Minor version, e.g. "0"
-#   KEYMAN_VERSION_PATCH:    Patch version, e.g. "1"
-#   KEYMAN_TIER:             Current tier, one of "alpha", "beta" or "stable"
-#   KEYMAN_VERSION_TAG:      Tier + Pull Request + Location of build [-alpha|-beta][-test[-1234]][-local]
-#   KEYMAN_VERSION_WITH_TAG: e.g. "14.0.1-alpha-test-1234" or "14.0.5-beta-local" or "14.0.1-alpha-test"
-#   KEYMAN_VERSION_GIT_TAG:  Git tag for the release, "release@$KEYMAN_VERSION_WITH_TAG", e.g. "release@14.0.1-alpha-test-1234"
-#   KEYMAN_ROOT:      fully resolved root path of Keyman repository
-#   KEYMAN_VERSION_ENVIRONMENT: One of: local, test, alpha, beta, stable
-#   UPLOAD_SENTRY:    true - if KEYMAN_VERSION_ENVIRONMENT is one of alpha, beta, stable
-#                     false - if local, test.  Indicates if debug artifacts should be uploaded to Sentry
-#   BUILDER_OS:       win|mac|linux -- current build environment
-#
-# On macOS, this script requires coreutils (`brew install coreutils`)
-#
-# Here is how to include this script reliably, cross-platform:
-#    ## START STANDARD BUILD SCRIPT INCLUDE
-#    # adjust relative paths as necessary
-#    THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-#    . "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
-#    # END STANDARD BUILD SCRIPT INCLUDE
-#
-# Note: keep changes to version, tier and tag determination in sync with mkver (windows/src/buildutils/mkver)
-#
 
-# Note: set -eu and SHLVL are deliberately set both here and in builder.inc.sh,
-#       because we want them set as early as possible, and because
-#       builder.inc.sh is shared to other repos, this keeps the usage consistent
-#       there as well.
-
-# Exit on command failure and when using unset variables:
-set -eu
-
-#
-# Prevents 'clear' on exit of mingw64 bash shell
-#
-SHLVL=0
-
-function findKeymanRoot() {
-  # We don't need readlink here because our standard script prolog does a
-  # readlink -f already so we will have already escaped from any symlinks but we
-  # still need to canonicalize paths to remove ../../..
-  #
-  # We only want to set KEYMAN_ROOT if it isn't already set and readonly
-  # (https://stackoverflow.com/a/4441178/1836776)
-  if (unset KEYMAN_ROOT 2>/dev/null); then
-    KEYMAN_ROOT="${BASH_SOURCE[0]%/*/*/*}"
-    KEYMAN_ROOT="$( cd "$KEYMAN_ROOT" && echo "$PWD" )"
-    readonly KEYMAN_ROOT
-  fi
-}
-
-function findVersion() {
-    local KEYMAN_VERSION_MD="$KEYMAN_ROOT/VERSION.md"
-    KEYMAN_VERSION=$(builder_trim $(<"$KEYMAN_VERSION_MD"))
-    [[ "$KEYMAN_VERSION" =~ ^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$ ]] && {
-        KEYMAN_VERSION_MAJOR="${BASH_REMATCH[1]}"
-        KEYMAN_VERSION_MINOR="${BASH_REMATCH[2]}"
-        KEYMAN_VERSION_PATCH="${BASH_REMATCH[3]}"
-        KEYMAN_VERSION_RELEASE="$KEYMAN_VERSION_MAJOR.$KEYMAN_VERSION_MINOR"
-    } || {
-        echo "Invalid VERSION.md file: expected major.minor.patch";
-        exit 1;
-    }
-
-    # Used for Windows, which requires a four part version string
-    KEYMAN_VERSION_WIN="$KEYMAN_VERSION.0"
-
-    #
-    # Build a tag to append to the version string. This is not assigned
-    # to the version number used in the projects but may be used as a
-    # display string and in TeamCity configuration
-    #
-
-    if [ "$KEYMAN_TIER" == "alpha" ] || [ "$KEYMAN_TIER" == "beta" ]; then
-        KEYMAN_VERSION_TAG="-$KEYMAN_TIER"
-    else
-        KEYMAN_VERSION_TAG=
-    fi
-
-    if ! builder_is_running_on_teamcity && ! builder_is_running_on_gha \
-      && [[ -z "${KEYMAN_PKG_BUILD-}" ]]; then
-        # Local dev machine, not TeamCity or GitHub Action and not .deb package build
-        KEYMAN_VERSION_TAG="$KEYMAN_VERSION_TAG-local"
-        KEYMAN_VERSION_ENVIRONMENT=local
-    elif [ -n "${TEAMCITY_PR_NUMBER-}" ]; then
-        # On TeamCity: are we running a pull request build or a master/beta/stable build?
-        KEYMAN_VERSION_ENVIRONMENT="test"
-        # Note TEAMCITY_PR_NUMBER can also be 'master', 'beta', or 'stable-x.y'
-        # This indicates we are running a Test build.
-        if [[ $TEAMCITY_PR_NUMBER =~ ^(master|beta|stable(-[0-9]+\.[0-9]+)?)$ ]]; then
-            KEYMAN_VERSION_TAG="$KEYMAN_VERSION_TAG-test"
-        else
-            KEYMAN_VERSION_TAG="$KEYMAN_VERSION_TAG-test-$TEAMCITY_PR_NUMBER"
-        fi
-    elif builder_is_running_on_gha && ${GHA_TEST_BUILD-}; then
-        KEYMAN_VERSION_ENVIRONMENT="test"
-        # Note GHA_BRANCH can be 'master', 'beta', or 'stable-x.y'
-        # This indicates we are running a Test build.
-        if [[ ${GHA_BRANCH-} =~ ^(master|beta|stable(-[0-9]+\.[0-9]+)?)$ ]]; then
-            KEYMAN_VERSION_TAG="${KEYMAN_VERSION_TAG}-test"
-        else
-            KEYMAN_VERSION_TAG="${KEYMAN_VERSION_TAG}-test-${GHA_BRANCH-unset}"
-        fi
-    else
-        KEYMAN_VERSION_ENVIRONMENT="$KEYMAN_TIER"
-    fi
-
-    KEYMAN_VERSION_WITH_TAG="$KEYMAN_VERSION$KEYMAN_VERSION_TAG"
-    KEYMAN_VERSION_GIT_TAG="release@$KEYMAN_VERSION_WITH_TAG"
-
-    readonly KEYMAN_VERSION
-    readonly KEYMAN_VERSION_MAJOR
-    readonly KEYMAN_VERSION_MINOR
-    readonly KEYMAN_VERSION_PATCH
-    readonly KEYMAN_VERSION_RELEASE
-    readonly KEYMAN_VERSION_WIN
-    readonly KEYMAN_VERSION_TAG
-    readonly KEYMAN_VERSION_WITH_TAG
-    readonly KEYMAN_VERSION_ENVIRONMENT
-    readonly KEYMAN_VERSION_GIT_TAG
-
-    # Export version strings so places like version.gradle can access them
-    export KEYMAN_VERSION
-    export KEYMAN_VERSION_MAJOR
-    export KEYMAN_VERSION_MINOR
-    export KEYMAN_VERSION_PATCH
-    export KEYMAN_VERSION_RELEASE
-    export KEYMAN_VERSION_WIN
-    export KEYMAN_VERSION_TAG
-    export KEYMAN_VERSION_WITH_TAG
-    export KEYMAN_VERSION_ENVIRONMENT
-    export KEYMAN_VERSION_GIT_TAG
-}
-
-function findTier() {
-  local KEYMAN_TIER_MD="$KEYMAN_ROOT/TIER.md"
-  KEYMAN_TIER=$(builder_trim $(<"$KEYMAN_TIER_MD"))
-  [[ "$KEYMAN_TIER" =~ ^(alpha|beta|stable)$ ]] || {
-      echo "Invalid TIER.md file: expected alpha, beta or stable."
-      exit 1;
-  }
-}
-
-function printBuildNumberForTeamCity() {
-    if [ ! -z "${TEAMCITY_VERSION-}" ]; then
-        if [ ! -z "${TEAMCITY_PR_NUMBER-}" ]; then
-            echo "##teamcity[buildNumber '$KEYMAN_VERSION_WITH_TAG']"
-        else
-            # For alpha/beta builds, for now we don't append the
-            # version tag as buildNumber is used in the delivery
-            # of the build version. We may improve this in the
-            # future.
-            echo "##teamcity[buildNumber '$KEYMAN_VERSION']"
-        fi
-    fi
-}
-
-function printVersionUtilsDebug() {
-    echo "KEYMAN_ROOT:                $KEYMAN_ROOT"
-    echo "KEYMAN_VERSION:             $KEYMAN_VERSION"
-    echo "KEYMAN_VERSION_WIN:         $KEYMAN_VERSION_WIN"
-    echo "KEYMAN_VERSION_RELEASE:     $KEYMAN_VERSION_RELEASE"
-    echo "KEYMAN_VERSION_MAJOR:       $KEYMAN_VERSION_MAJOR"
-    echo "KEYMAN_VERSION_MINOR:       $KEYMAN_VERSION_MINOR"
-    echo "KEYMAN_VERSION_PATCH:       $KEYMAN_VERSION_PATCH"
-    echo "KEYMAN_TIER:                $KEYMAN_TIER"
-    echo "KEYMAN_VERSION_TAG:         $KEYMAN_VERSION_TAG"
-    echo "KEYMAN_VERSION_WITH_TAG:    $KEYMAN_VERSION_WITH_TAG"
-    echo "KEYMAN_VERSION_GIT_TAG:     $KEYMAN_VERSION_GIT_TAG"
-    echo "KEYMAN_VERSION_ENVIRONMENT: $KEYMAN_VERSION_ENVIRONMENT"
-}
-
-function findShouldSentryRelease() {
-    # Default, for 'test' or 'local' environment, or in case
-    # $KEYMAN_VERSION_ENVIRONMENT is improperly specified.
-    # (May be overridden by -upload-sentry in supporting build scripts.)
-    UPLOAD_SENTRY=false
-
-    # Default: override to `true` for release builds.
-    case $KEYMAN_VERSION_ENVIRONMENT in
-    # Actual release tiers
-    alpha | beta | stable)
-        UPLOAD_SENTRY=true
-        ;;
-    esac
-}
-
-findKeymanRoot
-
-# Source builder_script
-. "$KEYMAN_ROOT/resources/builder.inc.sh"
-
-findTier
-findVersion
-
-# printVersionUtilsDebug
-printBuildNumberForTeamCity
-
-findShouldSentryRelease
-
-# Sets the BUILDER_OS environment variable to linux|mac|win
-#
-_builder_get_operating_system() {
-  declare -g BUILDER_OS
-  # Default value, since it's the most general case/configuration to detect.
-  BUILDER_OS=linux
-
-  # Subject to change with future improvements.
-  if [[ $OSTYPE == darwin* ]]; then
-    BUILDER_OS=mac
-  elif [[ $OSTYPE == msys ]]; then
-    BUILDER_OS=win
-  elif [[ $OSTYPE == cygwin ]]; then
-    BUILDER_OS=win
-  fi
-  readonly BUILDER_OS
-}
-
-_builder_get_operating_system
-
-# Intended for use with macOS-based builds, as Xcode build phase "run script"s do not have access to important
-# environment variables.  Doesn't hurt to run it at other times as well.  The output file is .gitignore'd.
-function exportEnvironmentDefinitionScript() {
-    ENVIRONMENT_SH="$KEYMAN_ROOT/resources/environment.sh"
-
-    # Remove old copy if it exists
-    [ -f "$ENVIRONMENT_SH" ] && rm "$ENVIRONMENT_SH"
-
-    # Documentation about the script, within the script.
-    echo "# Do not edit - this is an autogenerated script.  See build/build-utils.sh for more details." >> "$ENVIRONMENT_SH"
-    echo "# This file redefines critical environment variables for import to Xcode build phases." >> "$ENVIRONMENT_SH"
-    echo "" >> "$ENVIRONMENT_SH"
-
-    # Defining variables for KEYMAN_VERSION here will leave static definitions that don't automatically update when a user
-    # changes branches; some branches are 'similar enough' to not require full command-line based rebuilds.
-    # We want that KEYMAN_VERSION number to properly mirror the state of its branch during development so that it matches
-    # any error reports that get logged to Sentry.
-    #
-    # As a result, we explicitly do NOT define KEYMAN_VERSION or KEYMAN_VERSION_TAG as part of ENVIRONMENT_SH.
-
-    echo "# Required for successful dSYM upload for Sentry error reporting" >> "$ENVIRONMENT_SH"
-    echo "export SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN:-}" >> "$ENVIRONMENT_SH"
-    echo "export SENTRY_URL=${SENTRY_URL:-}" >> "$ENVIRONMENT_SH"
-    echo "export SENTRY_ORG=${SENTRY_ORG:-}" >> "$ENVIRONMENT_SH"
-
-    # Ensure the autogenerated file may be successfully run/included by xcode-utils.sh.
-    chmod +x "$ENVIRONMENT_SH"
-}
-
-# Detect if this script is running from within Xcode.  Obviously, this assumes we don't have other definitions
-# for these variables... but they're set within Xcode during its runs.  As a result, they're not the wisest thing for
-# someone else to intentionally use, so this check seems reasonable.
-#
-# https://gist.github.com/gdavis/6670468 has a representative copy of a standard Xcode environment variable setup.
-if [ "$BUILDER_OS" == "mac" ] && [[ -z "${XCODE_VERSION_ACTUAL:-}" ]] && [[ -z "${XCODE_PRODUCT_BUILD_VERSION:-}" ]]; then
-    exportEnvironmentDefinitionScript
-fi
-
-
-replaceVersionStrings() {
-  local infile=$1
-  local outfile=$2
-
-  sed "
-    s/\$KEYMAN_VERSION_WIN/$KEYMAN_VERSION_WIN/g;
-    s/\$KEYMAN_VERSION_RELEASE/$KEYMAN_VERSION_RELEASE/g;
-    s/\$KEYMAN_VERSION_MAJOR/$KEYMAN_VERSION_MAJOR/g;
-    s/\$KEYMAN_VERSION_MINOR/$KEYMAN_VERSION_MINOR/g;
-    s/\$KEYMAN_VERSION_PATCH/$KEYMAN_VERSION_PATCH/g;
-    s/\$KEYMAN_TIER/$KEYMAN_TIER/g;
-    s/\$KEYMAN_VERSION_TAG/$KEYMAN_VERSION_TAG/g;
-    s/\$KEYMAN_VERSION_WITH_TAG/$KEYMAN_VERSION_WITH_TAG/g;
-    s/\$KEYMAN_VERSION_GIT_TAG/$KEYMAN_VERSION_GIT_TAG/g;
-    s/\$KEYMAN_VERSION_ENVIRONMENT/$KEYMAN_VERSION_ENVIRONMENT/g;
-    s/\$KEYMAN_VERSION/$KEYMAN_VERSION/g;
-    " "$infile" > "$outfile"
-}
-
-replaceVersionStrings_Mkver() {
-  # This is similar to replaceVersionStrings but supports all
-  # the old mkver strings as used by windows/src
-  local infile=$1
-  local outfile=$2
-
-  # Note that $KEYMAN_VERSION differs between the two functions!
-  # We should be deprecating all the mkver strings
-
-  sed "
-    s/\$VersionWin/$KEYMAN_VERSION_WIN/g;
-    s/\$VersionRelease/$KEYMAN_VERSION_RELEASE/g;
-    s/\$VersionMajor/$KEYMAN_VERSION_MAJOR/g;
-    s/\$VersionMinor/$KEYMAN_VERSION_MINOR/g;
-    s/\$VersionPatch/$KEYMAN_VERSION_PATCH/g;
-    s/\$Tier/$KEYMAN_TIER/g;
-    s/\$Tag/$KEYMAN_VERSION_TAG/g;
-    s/\$VersionWithTag/$KEYMAN_VERSION_WITH_TAG/g;
-    s/\$VersionGitTag/$KEYMAN_VERSION_GIT_TAG/g;
-    s/\$VersionRc/$KEYMAN_VERSION_MAJOR,$KEYMAN_VERSION_MINOR,$KEYMAN_VERSION_PATCH,0/g;
-    s/\$Environment/$KEYMAN_VERSION_ENVIRONMENT/g;
-    s/\$Version/$KEYMAN_VERSION/g;
-    s/\$KEYMAN_VERSIONNUM/$KEYMAN_VERSION_MAJOR,$KEYMAN_VERSION_MINOR,$KEYMAN_VERSION_PATCH,0/g;
-    s/\$RELEASE_MAJOR/$KEYMAN_VERSION_MAJOR/g;
-    s/\$RELEASE_MINOR/$KEYMAN_VERSION_MINOR/g;
-    s/\$RELEASE/$KEYMAN_VERSION_RELEASE/g;
-
-    s/\$KEYMAN_VERSION_WIN/$KEYMAN_VERSION_WIN/g;
-    s/\$KEYMAN_VERSION_RELEASE/$KEYMAN_VERSION_RELEASE/g;
-    s/\$KEYMAN_VERSION_MAJOR/$KEYMAN_VERSION_MAJOR/g;
-    s/\$KEYMAN_VERSION_MINOR/$KEYMAN_VERSION_MINOR/g;
-    s/\$KEYMAN_VERSION_PATCH/$KEYMAN_VERSION_PATCH/g;
-    s/\$KEYMAN_TIER/$KEYMAN_TIER/g;
-    s/\$KEYMAN_VERSION_TAG/$KEYMAN_VERSION_TAG/g;
-    s/\$KEYMAN_VERSION_WITH_TAG/$KEYMAN_VERSION_WITH_TAG/g;
-    s/\$KEYMAN_VERSION_GIT_TAG/$KEYMAN_VERSION_GIT_TAG/g;
-    s/\$KEYMAN_VERSION_ENVIRONMENT/$KEYMAN_VERSION_ENVIRONMENT/g;
-
-    s/\$KEYMAN_VERSION/$KEYMAN_VERSION_WIN/g;
-
-    " "$infile" > "$outfile"
-}
-
-set_keyman_standard_build_path() {
-  PATH="$KEYMAN_ROOT/node_modules/.bin:$PATH"
-}
-
-# For CI compatibility of building Keyman for Android 18.0 with OpenJDK 11,
-# this overrides JAVA_HOME for the builder script to use OpenJDK 21.
-set_java_home() {
-  set_java_home_21
-}
-
-set_java_home_21() {
-  if [[ ! -z ${JAVA_HOME_21+x} ]]; then
-    builder_echo "Setting JAVA_HOME to JAVA_HOME_21 (${JAVA_HOME_21})"
-    export JAVA_HOME="${JAVA_HOME_21}"
-  fi
-}
-
-set_java_home_11() {
-  if [[ ! -z ${JAVA_HOME_11+x} ]]; then
-    builder_echo "Setting JAVA_HOME to JAVA_HOME_11 (${JAVA_HOME_11})"
-    export JAVA_HOME="${JAVA_HOME_11}"
-  fi
-}
-
-#
-# printXCodeBuildScriptLogs: xcodebuild does not emit stdout from scripts in
-# PBXShellScriptBuildPhase phases. This is a real problem for us because if
-# there is an issue, we just can't see it. So we capture the output in a
-# separate logfile, and then call printXCodeBuildScriptLogs after any xcodebuild
-# call to get the output.
-#
-# This file is captured in xcode-utils.sh, logScriptsToFile function, and each
-# script phase will append to the log file, until funprintXCodeBuildScriptLogs
-# is called, at which point the logfile will be deleted.
-#
-# The logfile is placed in $KEYMAN_ROOT/xcodebuild-scripts.log. It is used for
-# both iOS and macOS builds.
-#
-# If there is no logfile, then this function will not emit anything.
-#
-printXCodeBuildScriptLogs() {
-  local SCRIPT_LOG="$KEYMAN_ROOT/xcodebuild-scripts.log"
-  if [ -f "$SCRIPT_LOG" ]; then
-    echo "printXCodeBuildScriptLogs: reporting script results from previous xcode build"
-    cat "$SCRIPT_LOG"
-    rm "$SCRIPT_LOG"
-    echo "printXCodeBuildScriptLogs: done"
-    echo
-  fi
-}
-
-#
-# Wraps xcodebuild with error handling and log printing
-#
-run_xcodebuild() {
-  typeset cmnd="$*"
-  typeset ret_code
-  local hasSetErrExit=false
-  if [ -o errexit ]; then
-    hasSetErrExit=true
-    set +e
-  fi
-  eval xcodebuild $cmnd
-  ret_code=$?
-  if $hasSetErrExit; then
-    set -e
-  fi
-
-  printXCodeBuildScriptLogs
-  if [ $ret_code != 0 ]; then
-    builder_die "Build failed! Error: [$ret_code] when executing command: 'xcodebuild $cmnd'"
-  fi
-}
-
-
-#
-# We always want to use tools out of node_modules/.bin to guarantee that we get the
-# correct version
-#
-set_keyman_standard_build_path
+# TODO: remove this file in v19.0. Used only by deb-packaging.yml
+echo "WARNING: build-utils.sh is deprecated. Use instead builder-basic.inc.sh"
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/builder-basic.inc.sh"
diff --git a/resources/build/builder-basic.inc.sh b/resources/build/builder-basic.inc.sh
new file mode 100644
index 0000000000..83f77c3134
--- /dev/null
+++ b/resources/build/builder-basic.inc.sh
@@ -0,0 +1,279 @@
+#!/usr/bin/env bash
+#
+# This script sets build environment variables. KEYMAN_VERSION vars are also exported:
+#   KEYMAN_VERSION:          Full current build version, e.g. "14.0.1"
+#   KEYMAN_VERSION_WIN:      Full current build version for Windows, e.g. "14.0.1.0"
+#   KEYMAN_VERSION_RELEASE:  Current release version, e.g. "14.0"
+#   KEYMAN_VERSION_MAJOR:    Major version, e.g. "14"
+#   KEYMAN_VERSION_MINOR:    Minor version, e.g. "0"
+#   KEYMAN_VERSION_PATCH:    Patch version, e.g. "1"
+#   KEYMAN_TIER:             Current tier, one of "alpha", "beta" or "stable"
+#   KEYMAN_VERSION_TAG:      Tier + Pull Request + Location of build [-alpha|-beta][-test[-1234]][-local]
+#   KEYMAN_VERSION_WITH_TAG: e.g. "14.0.1-alpha-test-1234" or "14.0.5-beta-local" or "14.0.1-alpha-test"
+#   KEYMAN_VERSION_GIT_TAG:  Git tag for the release, "release@$KEYMAN_VERSION_WITH_TAG", e.g. "release@14.0.1-alpha-test-1234"
+#   KEYMAN_ROOT:      fully resolved root path of Keyman repository
+#   KEYMAN_VERSION_ENVIRONMENT: One of: local, test, alpha, beta, stable
+#   UPLOAD_SENTRY:    true - if KEYMAN_VERSION_ENVIRONMENT is one of alpha, beta, stable
+#                     false - if local, test.  Indicates if debug artifacts should be uploaded to Sentry
+#   BUILDER_OS:       win|mac|linux -- current build environment
+#
+# On macOS, this script requires coreutils (`brew install coreutils`)
+#
+# Here is how to include this script reliably, cross-platform:
+#    ## START STANDARD BUILD SCRIPT INCLUDE
+#    # adjust relative paths as necessary
+#    THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+#    . "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
+#    # END STANDARD BUILD SCRIPT INCLUDE
+#
+# Note: keep changes to version, tier and tag determination in sync with mkver (windows/src/buildutils/mkver)
+#
+
+# Note: set -eu and SHLVL are deliberately set both here and in builder.inc.sh,
+#       because we want them set as early as possible, and because
+#       builder.inc.sh is shared to other repos, this keeps the usage consistent
+#       there as well.
+
+# Exit on command failure and when using unset variables:
+set -eu
+
+#
+# Prevents 'clear' on exit of mingw64 bash shell
+#
+SHLVL=0
+
+function _builder_basic_find_keyman_root() {
+  # We don't need readlink here because our standard script prolog does a
+  # readlink -f already so we will have already escaped from any symlinks but we
+  # still need to canonicalize paths to remove ../../..
+  #
+  # We only want to set KEYMAN_ROOT if it isn't already set and readonly
+  # (https://stackoverflow.com/a/4441178/1836776)
+  if (unset KEYMAN_ROOT 2>/dev/null); then
+    KEYMAN_ROOT="${BASH_SOURCE[0]%/*/*/*}"
+    KEYMAN_ROOT="$( cd "$KEYMAN_ROOT" && echo "$PWD" )"
+    readonly KEYMAN_ROOT
+  fi
+}
+
+function _builder_basic_find_version() {
+    local KEYMAN_VERSION_MD="$KEYMAN_ROOT/VERSION.md"
+    KEYMAN_VERSION=$(builder_trim $(<"$KEYMAN_VERSION_MD"))
+    [[ "$KEYMAN_VERSION" =~ ^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$ ]] && {
+        KEYMAN_VERSION_MAJOR="${BASH_REMATCH[1]}"
+        KEYMAN_VERSION_MINOR="${BASH_REMATCH[2]}"
+        KEYMAN_VERSION_PATCH="${BASH_REMATCH[3]}"
+        KEYMAN_VERSION_RELEASE="$KEYMAN_VERSION_MAJOR.$KEYMAN_VERSION_MINOR"
+    } || {
+        echo "Invalid VERSION.md file: expected major.minor.patch";
+        exit 1;
+    }
+
+    # Used for Windows, which requires a four part version string
+    KEYMAN_VERSION_WIN="$KEYMAN_VERSION.0"
+
+    #
+    # Build a tag to append to the version string. This is not assigned
+    # to the version number used in the projects but may be used as a
+    # display string and in TeamCity configuration
+    #
+
+    if [ "$KEYMAN_TIER" == "alpha" ] || [ "$KEYMAN_TIER" == "beta" ]; then
+        KEYMAN_VERSION_TAG="-$KEYMAN_TIER"
+    else
+        KEYMAN_VERSION_TAG=
+    fi
+
+    if ! builder_is_running_on_teamcity && ! builder_is_running_on_gha \
+      && [[ -z "${KEYMAN_PKG_BUILD-}" ]]; then
+        # Local dev machine, not TeamCity or GitHub Action and not .deb package build
+        KEYMAN_VERSION_TAG="$KEYMAN_VERSION_TAG-local"
+        KEYMAN_VERSION_ENVIRONMENT=local
+    elif [ -n "${TEAMCITY_PR_NUMBER-}" ]; then
+        # On TeamCity: are we running a pull request build or a master/beta/stable build?
+        KEYMAN_VERSION_ENVIRONMENT="test"
+        # Note TEAMCITY_PR_NUMBER can also be 'master', 'beta', or 'stable-x.y'
+        # This indicates we are running a Test build.
+        if [[ $TEAMCITY_PR_NUMBER =~ ^(master|beta|stable(-[0-9]+\.[0-9]+)?)$ ]]; then
+            KEYMAN_VERSION_TAG="$KEYMAN_VERSION_TAG-test"
+        else
+            KEYMAN_VERSION_TAG="$KEYMAN_VERSION_TAG-test-$TEAMCITY_PR_NUMBER"
+        fi
+    elif builder_is_running_on_gha && ${GHA_TEST_BUILD-}; then
+        KEYMAN_VERSION_ENVIRONMENT="test"
+        # Note GHA_BRANCH can be 'master', 'beta', or 'stable-x.y'
+        # This indicates we are running a Test build.
+        if [[ ${GHA_BRANCH-} =~ ^(master|beta|stable(-[0-9]+\.[0-9]+)?)$ ]]; then
+            KEYMAN_VERSION_TAG="${KEYMAN_VERSION_TAG}-test"
+        else
+            KEYMAN_VERSION_TAG="${KEYMAN_VERSION_TAG}-test-${GHA_BRANCH-unset}"
+        fi
+    else
+        KEYMAN_VERSION_ENVIRONMENT="$KEYMAN_TIER"
+    fi
+
+    KEYMAN_VERSION_WITH_TAG="$KEYMAN_VERSION$KEYMAN_VERSION_TAG"
+    KEYMAN_VERSION_GIT_TAG="release@$KEYMAN_VERSION_WITH_TAG"
+
+    readonly KEYMAN_VERSION
+    readonly KEYMAN_VERSION_MAJOR
+    readonly KEYMAN_VERSION_MINOR
+    readonly KEYMAN_VERSION_PATCH
+    readonly KEYMAN_VERSION_RELEASE
+    readonly KEYMAN_VERSION_WIN
+    readonly KEYMAN_VERSION_TAG
+    readonly KEYMAN_VERSION_WITH_TAG
+    readonly KEYMAN_VERSION_ENVIRONMENT
+    readonly KEYMAN_VERSION_GIT_TAG
+
+    # Export version strings so places like version.gradle can access them
+    export KEYMAN_VERSION
+    export KEYMAN_VERSION_MAJOR
+    export KEYMAN_VERSION_MINOR
+    export KEYMAN_VERSION_PATCH
+    export KEYMAN_VERSION_RELEASE
+    export KEYMAN_VERSION_WIN
+    export KEYMAN_VERSION_TAG
+    export KEYMAN_VERSION_WITH_TAG
+    export KEYMAN_VERSION_ENVIRONMENT
+    export KEYMAN_VERSION_GIT_TAG
+}
+
+function _builder_basic_find_tier() {
+  local KEYMAN_TIER_MD="$KEYMAN_ROOT/TIER.md"
+  KEYMAN_TIER=$(builder_trim $(<"$KEYMAN_TIER_MD"))
+  [[ "$KEYMAN_TIER" =~ ^(alpha|beta|stable)$ ]] || {
+      echo "Invalid TIER.md file: expected alpha, beta or stable."
+      exit 1;
+  }
+}
+
+function _builder_basic_print_build_number_for_teamcity() {
+    if [ ! -z "${TEAMCITY_VERSION-}" ]; then
+        if [ ! -z "${TEAMCITY_PR_NUMBER-}" ]; then
+            echo "##teamcity[buildNumber '$KEYMAN_VERSION_WITH_TAG']"
+        else
+            # For alpha/beta builds, for now we don't append the
+            # version tag as buildNumber is used in the delivery
+            # of the build version. We may improve this in the
+            # future.
+            echo "##teamcity[buildNumber '$KEYMAN_VERSION']"
+        fi
+    fi
+}
+
+function _builder_basic_print_version_utils_debug() {
+    echo "KEYMAN_ROOT:                $KEYMAN_ROOT"
+    echo "KEYMAN_VERSION:             $KEYMAN_VERSION"
+    echo "KEYMAN_VERSION_WIN:         $KEYMAN_VERSION_WIN"
+    echo "KEYMAN_VERSION_RELEASE:     $KEYMAN_VERSION_RELEASE"
+    echo "KEYMAN_VERSION_MAJOR:       $KEYMAN_VERSION_MAJOR"
+    echo "KEYMAN_VERSION_MINOR:       $KEYMAN_VERSION_MINOR"
+    echo "KEYMAN_VERSION_PATCH:       $KEYMAN_VERSION_PATCH"
+    echo "KEYMAN_TIER:                $KEYMAN_TIER"
+    echo "KEYMAN_VERSION_TAG:         $KEYMAN_VERSION_TAG"
+    echo "KEYMAN_VERSION_WITH_TAG:    $KEYMAN_VERSION_WITH_TAG"
+    echo "KEYMAN_VERSION_GIT_TAG:     $KEYMAN_VERSION_GIT_TAG"
+    echo "KEYMAN_VERSION_ENVIRONMENT: $KEYMAN_VERSION_ENVIRONMENT"
+}
+
+# TODO: consolidate with buildLevel, see #14285
+function _builder_basic_find_should_sentry_release() {
+    # Default, for 'test' or 'local' environment, or in case
+    # $KEYMAN_VERSION_ENVIRONMENT is improperly specified.
+    # (May be overridden by -upload-sentry in supporting build scripts.)
+    UPLOAD_SENTRY=false
+
+    # Default: override to `true` for release builds.
+    case $KEYMAN_VERSION_ENVIRONMENT in
+    # Actual release tiers
+    alpha | beta | stable)
+        UPLOAD_SENTRY=true
+        ;;
+    esac
+}
+
+replaceVersionStrings() {
+  local infile=$1
+  local outfile=$2
+
+  sed "
+    s/\$KEYMAN_VERSION_WIN/$KEYMAN_VERSION_WIN/g;
+    s/\$KEYMAN_VERSION_RELEASE/$KEYMAN_VERSION_RELEASE/g;
+    s/\$KEYMAN_VERSION_MAJOR/$KEYMAN_VERSION_MAJOR/g;
+    s/\$KEYMAN_VERSION_MINOR/$KEYMAN_VERSION_MINOR/g;
+    s/\$KEYMAN_VERSION_PATCH/$KEYMAN_VERSION_PATCH/g;
+    s/\$KEYMAN_TIER/$KEYMAN_TIER/g;
+    s/\$KEYMAN_VERSION_TAG/$KEYMAN_VERSION_TAG/g;
+    s/\$KEYMAN_VERSION_WITH_TAG/$KEYMAN_VERSION_WITH_TAG/g;
+    s/\$KEYMAN_VERSION_GIT_TAG/$KEYMAN_VERSION_GIT_TAG/g;
+    s/\$KEYMAN_VERSION_ENVIRONMENT/$KEYMAN_VERSION_ENVIRONMENT/g;
+    s/\$KEYMAN_VERSION/$KEYMAN_VERSION/g;
+    " "$infile" > "$outfile"
+}
+
+replaceVersionStrings_Mkver() {
+  # This is similar to replaceVersionStrings but supports all
+  # the old mkver strings as used by windows/src
+  local infile=$1
+  local outfile=$2
+
+  # Note that $KEYMAN_VERSION differs between the two functions!
+  # We should be deprecating all the mkver strings
+
+  sed "
+    s/\$VersionWin/$KEYMAN_VERSION_WIN/g;
+    s/\$VersionRelease/$KEYMAN_VERSION_RELEASE/g;
+    s/\$VersionMajor/$KEYMAN_VERSION_MAJOR/g;
+    s/\$VersionMinor/$KEYMAN_VERSION_MINOR/g;
+    s/\$VersionPatch/$KEYMAN_VERSION_PATCH/g;
+    s/\$Tier/$KEYMAN_TIER/g;
+    s/\$Tag/$KEYMAN_VERSION_TAG/g;
+    s/\$VersionWithTag/$KEYMAN_VERSION_WITH_TAG/g;
+    s/\$VersionGitTag/$KEYMAN_VERSION_GIT_TAG/g;
+    s/\$VersionRc/$KEYMAN_VERSION_MAJOR,$KEYMAN_VERSION_MINOR,$KEYMAN_VERSION_PATCH,0/g;
+    s/\$Environment/$KEYMAN_VERSION_ENVIRONMENT/g;
+    s/\$Version/$KEYMAN_VERSION/g;
+    s/\$KEYMAN_VERSIONNUM/$KEYMAN_VERSION_MAJOR,$KEYMAN_VERSION_MINOR,$KEYMAN_VERSION_PATCH,0/g;
+    s/\$RELEASE_MAJOR/$KEYMAN_VERSION_MAJOR/g;
+    s/\$RELEASE_MINOR/$KEYMAN_VERSION_MINOR/g;
+    s/\$RELEASE/$KEYMAN_VERSION_RELEASE/g;
+
+    s/\$KEYMAN_VERSION_WIN/$KEYMAN_VERSION_WIN/g;
+    s/\$KEYMAN_VERSION_RELEASE/$KEYMAN_VERSION_RELEASE/g;
+    s/\$KEYMAN_VERSION_MAJOR/$KEYMAN_VERSION_MAJOR/g;
+    s/\$KEYMAN_VERSION_MINOR/$KEYMAN_VERSION_MINOR/g;
+    s/\$KEYMAN_VERSION_PATCH/$KEYMAN_VERSION_PATCH/g;
+    s/\$KEYMAN_TIER/$KEYMAN_TIER/g;
+    s/\$KEYMAN_VERSION_TAG/$KEYMAN_VERSION_TAG/g;
+    s/\$KEYMAN_VERSION_WITH_TAG/$KEYMAN_VERSION_WITH_TAG/g;
+    s/\$KEYMAN_VERSION_GIT_TAG/$KEYMAN_VERSION_GIT_TAG/g;
+    s/\$KEYMAN_VERSION_ENVIRONMENT/$KEYMAN_VERSION_ENVIRONMENT/g;
+
+    s/\$KEYMAN_VERSION/$KEYMAN_VERSION_WIN/g;
+
+    " "$infile" > "$outfile"
+}
+
+_builder_basic_set_keyman_standard_build_path() {
+  PATH="$KEYMAN_ROOT/node_modules/.bin:$PATH"
+}
+
+_builder_basic_find_keyman_root
+
+# Source builder_script
+. "$KEYMAN_ROOT/resources/builder.inc.sh"
+
+_builder_basic_find_tier
+_builder_basic_find_version
+
+# _builder_basic_print_version_utils_debug
+_builder_basic_print_build_number_for_teamcity
+
+_builder_basic_find_should_sentry_release
+
+#
+# We always want to use tools out of node_modules/.bin to guarantee that we get the
+# correct version
+#
+_builder_basic_set_keyman_standard_build_path
diff --git a/resources/build/builder.inc.sh b/resources/build/builder-full.inc.sh
similarity index 51%
rename from resources/build/builder.inc.sh
rename to resources/build/builder-full.inc.sh
index 70d7d07c16..e937582565 100644
--- a/resources/build/builder.inc.sh
+++ b/resources/build/builder-full.inc.sh
@@ -1,4 +1,5 @@
-# builder.inc.sh
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
 #
 # Wrapper for Builder scripts. Do not confuse this with
 # /resources/builder.inc.sh which has the full implementation of builder scripts
@@ -7,28 +8,13 @@
 # report an error if builder_parse is never called.
 
 
-# Note: set -eu and SHLVL are deliberately set both here and in build-utils.sh
+# Note: set -eu and SHLVL are deliberately set both here and in builder-basic.inc.sh
 # Exit on command failure and when using unset variables:
 set -eu
 # Prevents 'clear' on exit of mingw64 bash shell
 SHLVL=0
 
-
-function __builder_find_keyman_root() {
-  # We don't need readlink here because our standard script prolog does a
-  # readlink -f already so we will have already escaped from any symlinks
-  # But we still need to canonicalize paths to remove ../../..
-  #
-  # We only want to set KEYMAN_ROOT if it isn't already set and readonly
-  # (https://stackoverflow.com/a/4441178/1836776)
-  if (unset KEYMAN_ROOT 2>/dev/null); then
-    KEYMAN_ROOT="${BASH_SOURCE[0]%/*/*/*}"
-    KEYMAN_ROOT="$( cd "$KEYMAN_ROOT" && echo "$PWD" )"
-    readonly KEYMAN_ROOT
-  fi
-}
-
-function __builder_not_a_builder_script() {
+function _builder_full_not_a_builder_script() {
   if ! _builder_has_function_been_called builder_describe; then
     builder_echo warning "builder_describe was never called; script is not a valid builder script"
     exit 1
@@ -39,13 +25,10 @@ function __builder_not_a_builder_script() {
   fi
 }
 
-__builder_find_keyman_root
-
-trap __builder_not_a_builder_script exit
+trap _builder_full_not_a_builder_script exit
 
 # This will also import /resources/builder.inc.sh
-# TODO: rename build-utils.sh to utils.sh
-. "$KEYMAN_ROOT/resources/build/build-utils.sh"
+. "${BASH_SOURCE[0]%/*}/builder-basic.inc.sh"
 
-# All builder scripts start in their own folder
+# All full builder scripts start in their own folder
 cd "$THIS_SCRIPT_PATH"
diff --git a/resources/build/builder-report.sh b/resources/build/builder-report.sh
index 6f2a21fa7f..931a47f660 100755
--- a/resources/build/builder-report.sh
+++ b/resources/build/builder-report.sh
@@ -11,7 +11,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$KEYMAN_ROOT"
diff --git a/resources/build/ci/pull-requests.inc.sh b/resources/build/ci/pull-requests.inc.sh
index 6959f826d3..2e2f3a587f 100644
--- a/resources/build/ci/pull-requests.inc.sh
+++ b/resources/build/ci/pull-requests.inc.sh
@@ -107,7 +107,7 @@ function ci_open_pull_request {
   git push origin "$branch"
   builder_echo "Push complete"
 
-  hub pull-request --force --message "$commit_message" --labels auto
+  hub pull-request --force --message "$commit_message" --labels auto,automerge
   builder_echo "Pull request created"
 
   git switch "$current_branch"
diff --git a/resources/build/ci/test/test-pull-requests.sh b/resources/build/ci/test/test-pull-requests.sh
index cebf9e1b27..cd72343d37 100755
--- a/resources/build/ci/test/test-pull-requests.sh
+++ b/resources/build/ci/test/test-pull-requests.sh
@@ -8,7 +8,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$THIS_SCRIPT_PATH"
diff --git a/resources/build/help-keyman-com.sh b/resources/build/help-keyman-com.sh
index 0bf4067bfa..8d851b0afe 100755
--- a/resources/build/help-keyman-com.sh
+++ b/resources/build/help-keyman-com.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/ci/pull-requests.inc.sh"
diff --git a/resources/build/history/history-utils.sh b/resources/build/history/history-utils.sh
index a7a8b3e837..9a1f8f6b5e 100755
--- a/resources/build/history/history-utils.sh
+++ b/resources/build/history/history-utils.sh
@@ -5,7 +5,7 @@
 
 _hu_base_dir=$(dirname "$BASH_SOURCE")/../../..
 
-. $_hu_base_dir/resources/shellHelperFunctions.sh
+. $_hu_base_dir/resources/build/utils.inc.sh
 
 _hu_debug() {
   if [[ ! -z ${DEBUG+x} ]] && [[ $DEBUG == 1 ]]; then echo "$1"; fi
diff --git a/resources/build/increment-version.sh b/resources/build/increment-version.sh
index f1d15c6a7d..7116c6b917 100755
--- a/resources/build/increment-version.sh
+++ b/resources/build/increment-version.sh
@@ -19,7 +19,7 @@ set -u
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${THIS_SCRIPT%/*}/trigger-definitions.inc.sh"
@@ -136,7 +136,7 @@ if [ "$action" == "commit" ]; then
   NEWVERSION=`cat $KEYMAN_VERSION_MD | tr -d "[:space:]"`
 
   pushd "$KEYMAN_ROOT" > /dev/null
-  message="auto: increment $base version to $NEWVERSION"
+  message="auto: increment $base version to $NEWVERSION"$'\n\nTest-bot: skip\nBuild-bot: skip'
   branch="auto/version-$base-$NEWVERSION"
   git tag -a "$KEYMAN_VERSION_GIT_TAG" -m "Keyman release $KEYMAN_VERSION_WITH_TAG"
   git checkout -b "$branch"
@@ -158,7 +158,7 @@ if [ "$action" == "commit" ]; then
   # Trigger builds for the previous version on TeamCity and GitHub
   #
 
-  triggerBuilds
+  triggerReleaseBuilds
 
   #
   # Now, create the PR on GitHub which will be merged when ready
@@ -166,7 +166,7 @@ if [ "$action" == "commit" ]; then
 
   cd "$KEYMAN_ROOT"
   git checkout "$branch"
-  hub pull-request -f --no-edit -b $base -l auto
+  hub pull-request -f --no-edit -b $base -l auto,automerge
 
   #
   # If we are on a stable-x.y branch, then we also want to merge changes to
@@ -174,6 +174,8 @@ if [ "$action" == "commit" ]; then
   # beta changes will be merged to master periodically anyway.
   #
   if [[ "$base" =~ ^stable-[0-9]+\.[0-9]+$ ]]; then
+    # TODO: why is this not happening?
+
     git switch master
 
     # In order to avoid potential git conflicts, we run the history collater
@@ -190,8 +192,8 @@ if [ "$action" == "commit" ]; then
       git switch -c "chore/version-$base-$NEWVERSION-master-history" master
       git add HISTORY.md
       git commit -m "$message (history cherry-pick to master)"
-      # TODO: once we are sure this is stable, add `-l auto` to get the "auto:"
-      # label
+      # TODO: once we are sure this is stable, add `-l auto,automerge` to get
+      # the "auto" label
       hub pull-request -fp --no-edit
     fi
 
diff --git a/resources/build/jq.inc.sh b/resources/build/jq.inc.sh
index d1d7c32c23..59490328d5 100644
--- a/resources/build/jq.inc.sh
+++ b/resources/build/jq.inc.sh
@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
 #
 # Setup JQ environment variable according to the user's system
 #
@@ -10,25 +11,22 @@ if [[ -z "${JQ+x}" ]]; then
   ## START STANDARD BUILD SCRIPT INCLUDE
   # adjust relative paths as necessary
   JQ_THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-  # . "${THIS_SCRIPT%/*}/build-utils.sh"
+  # . "${THIS_SCRIPT%/*}/builder-basic.inc.sh"
   ## END STANDARD BUILD SCRIPT INCLUDE
 
-  case "${OSTYPE}" in
-    "cygwin")
-      JQ=$(dirname "$JQ_THIS_SCRIPT")/jq-win64.exe
-      ;;
-    "msys")
-      JQ=$(dirname "$JQ_THIS_SCRIPT")/jq-win64.exe
-      ;;
-    *)
-      JQ=jq
-      ;;
-  esac
+  # Don't use 'builder_is_windows' here, because this script is also
+  # used in git-hooks which don't source 'builder.inc.sh'.
+  if [[ "${OSTYPE}" == "cygwin" || "${OSTYPE}" == "msys" ]]; then
+    JQ="$(dirname "${JQ_THIS_SCRIPT}")/jq-win64.exe"
+  else
+    JQ=jq
+  fi
 
   readonly JQ
 
   # JQ with inplace file replacement
   function jqi() {
-    cat <<< "$($JQ -c "$1" < "$2")" > "$2"
+    # shellcheck disable=2312
+    cat <<< "$("${JQ}" -c "$1" < "$2")" > "$2"
   }
-fi
\ No newline at end of file
+fi
diff --git a/resources/build/mac/mac.inc.sh b/resources/build/mac/mac.inc.sh
new file mode 100644
index 0000000000..e64dccbffa
--- /dev/null
+++ b/resources/build/mac/mac.inc.sh
@@ -0,0 +1,159 @@
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+if [ -z "${DEVELOPMENT_TEAM+x}" ]; then
+    DEVELOPMENT_TEAM=3YE4W86L3G
+fi
+
+function mac_notarize() {
+  local TARGET_PATH="$1"
+  local TARGET_FILE="$2"
+
+  local NOTARYTOOL_LOG_PATH="$TARGET_PATH/notarytool.log"
+
+  xcrun notarytool submit \
+      --apple-id "$APPSTORECONNECT_USERNAME" \
+      --team-id "$DEVELOPMENT_TEAM" \
+      --password "$APPSTORECONNECT_PASSWORD" \
+      --output-format json \
+      --wait \
+      "$TARGET_FILE" > "$NOTARYTOOL_LOG_PATH"
+  # notarytool output: {"status":"Accepted","id":"ca62bba0-6c49-43c2-90d8-83a8ef306e0f","message":"Processing complete"}
+
+  cat "$NOTARYTOOL_LOG_PATH"
+  local NOTARYTOOL_STATUS=`cat "$NOTARYTOOL_LOG_PATH" | jq -r .status`
+  local NOTARYTOOL_SUBMISSION_ID=`cat "$NOTARYTOOL_LOG_PATH" | jq -r .id`
+  if [[ "$NOTARYTOOL_STATUS" != Accepted ]]; then
+      # We won't assume notarytool returns an error code if status != Accepted
+      builder_die "Notarization failed with $NOTARYTOOL_STATUS"
+  fi
+
+  builder_heading "Notarization completed successfully. Review logs below for any warnings."
+
+  xcrun notarytool log \
+        --apple-id "$APPSTORECONNECT_USERNAME" \
+        --team-id "$DEVELOPMENT_TEAM" \
+        --password "$APPSTORECONNECT_PASSWORD" \
+        "$NOTARYTOOL_SUBMISSION_ID"
+
+  rm -f "$NOTARYTOOL_LOG_PATH"
+}
+
+execCodeSign() {
+  # Allow the signing to fail up to 5 times (network transient error on timestamping)
+  local ret_code=0
+  local count=0
+  local method="$1"
+  shift
+  if [[ "$method" == direct ]]; then
+    method=
+  fi
+  while (( count <  5 )); do
+    $method codesign "$@" || ret_code=$?
+    if [ $ret_code == 0 ]; then
+      return 0
+    fi
+    (( count++ ))
+    builder_echo "codesign attempt $count failed with error $ret_code"
+    sleep 5
+  done
+
+  builder_echo "*** codesign parameters: $@"
+  builder_die "Unable to sign component after 5 attempts (exit code $ret_code)"
+}
+
+# Allows for a quick macOS check for those scripts requiring a macOS environment.
+verify_on_mac() {
+  if ! builder_is_macos; then
+    builder_die "This build script will only run in a Mac environment."
+    exit 1
+  fi
+}
+
+# Intended for use with macOS-based builds, as Xcode build phase "run script"s do not have access to important
+# environment variables.  Doesn't hurt to run it at other times as well.  The output file is .gitignore'd.
+function _mac_generate_xcode_environment_definition_script() {
+    ENVIRONMENT_SH="$KEYMAN_ROOT/resources/environment.sh"
+
+    # Remove old copy if it exists
+    [ -f "$ENVIRONMENT_SH" ] && rm "$ENVIRONMENT_SH"
+
+    # Documentation about the script, within the script.
+    echo "# Do not edit - this is an autogenerated script.  See build/builder-basic.inc.sh for more details." >> "$ENVIRONMENT_SH"
+    echo "# This file redefines critical environment variables for import to Xcode build phases." >> "$ENVIRONMENT_SH"
+    echo "" >> "$ENVIRONMENT_SH"
+
+    # Defining variables for KEYMAN_VERSION here will leave static definitions that don't automatically update when a user
+    # changes branches; some branches are 'similar enough' to not require full command-line based rebuilds.
+    # We want that KEYMAN_VERSION number to properly mirror the state of its branch during development so that it matches
+    # any error reports that get logged to Sentry.
+    #
+    # As a result, we explicitly do NOT define KEYMAN_VERSION or KEYMAN_VERSION_TAG as part of ENVIRONMENT_SH.
+
+    echo "# Required for successful dSYM upload for Sentry error reporting" >> "$ENVIRONMENT_SH"
+    echo "export SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN:-}" >> "$ENVIRONMENT_SH"
+    echo "export SENTRY_URL=${SENTRY_URL:-}" >> "$ENVIRONMENT_SH"
+    echo "export SENTRY_ORG=${SENTRY_ORG:-}" >> "$ENVIRONMENT_SH"
+
+    # Ensure the autogenerated file may be successfully run/included by xcode-utils.inc.sh.
+    chmod +x "$ENVIRONMENT_SH"
+}
+
+#
+# printXCodeBuildScriptLogs: xcodebuild does not emit stdout from scripts in
+# PBXShellScriptBuildPhase phases. This is a real problem for us because if
+# there is an issue, we just can't see it. So we capture the output in a
+# separate logfile, and then call printXCodeBuildScriptLogs after any xcodebuild
+# call to get the output.
+#
+# This file is captured in xcode-utils.inc.sh, logScriptsToFile function, and
+# each script phase will append to the log file, until printXCodeBuildScriptLogs
+# is called, at which point the logfile will be deleted.
+#
+# The logfile is placed in $KEYMAN_ROOT/xcodebuild-scripts.log. It is used for
+# both iOS and macOS builds.
+#
+# If there is no logfile, then this function will not emit anything.
+#
+printXCodeBuildScriptLogs() {
+  local SCRIPT_LOG="$KEYMAN_ROOT/xcodebuild-scripts.log"
+  if [ -f "$SCRIPT_LOG" ]; then
+    echo "printXCodeBuildScriptLogs: reporting script results from previous xcode build"
+    cat "$SCRIPT_LOG"
+    rm "$SCRIPT_LOG"
+    echo "printXCodeBuildScriptLogs: done"
+    echo
+  fi
+}
+
+#
+# Wraps xcodebuild with error handling and log printing
+#
+run_xcodebuild() {
+  typeset cmnd="$*"
+  typeset ret_code
+  local hasSetErrExit=false
+  if [ -o errexit ]; then
+    hasSetErrExit=true
+    set +e
+  fi
+  eval xcodebuild $cmnd
+  ret_code=$?
+  if $hasSetErrExit; then
+    set -e
+  fi
+
+  printXCodeBuildScriptLogs
+  if [ $ret_code != 0 ]; then
+    builder_die "Build failed! Error: [$ret_code] when executing command: 'xcodebuild $cmnd'"
+  fi
+}
+
+# If this script is running on macOS but  not within xcode script calls, generate the
+# env script that will be used for xcode scripts
+# Reference: https://gist.github.com/gdavis/6670468
+# shellcheck disable=2310
+if builder_is_macos && [[ -z "${XCODE_VERSION_ACTUAL:-}" ]] && [[ -z "${XCODE_PRODUCT_BUILD_VERSION:-}" ]]; then
+  _mac_generate_xcode_environment_definition_script
+fi
+
diff --git a/resources/build/mac/sentry-dsym-upload.sh b/resources/build/mac/sentry-dsym-upload.sh
new file mode 100755
index 0000000000..6da9c944dc
--- /dev/null
+++ b/resources/build/mac/sentry-dsym-upload.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+# Calls resource script to perform the dSYM upload
+
+source "$KEYMAN_ROOT/resources/build/mac/xcode-utils.inc.sh"
+phaseSentryDsymUpload "keyman-ios"
\ No newline at end of file
diff --git a/resources/build/set-bundle-versions-and-settings-tagged.sh b/resources/build/mac/set-bundle-versions-and-settings-tagged.sh
similarity index 71%
rename from resources/build/set-bundle-versions-and-settings-tagged.sh
rename to resources/build/mac/set-bundle-versions-and-settings-tagged.sh
index 6985ae3c3c..69b7a0ac45 100755
--- a/resources/build/set-bundle-versions-and-settings-tagged.sh
+++ b/resources/build/mac/set-bundle-versions-and-settings-tagged.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
 
 # Calls script in xcode-utils to update the version
 # true:  applies KEYMAN_VERSION_WITH_TAG to custom KeymanVersionWithTag plist member used for in-app display
 # updates the version string for Settings
 
-source "$KEYMAN_ROOT/resources/build/xcode-utils.sh"
+source "$KEYMAN_ROOT/resources/build/mac/xcode-utils.inc.sh"
 
 phaseSetBundleVersions true
 
diff --git a/resources/build/set-bundle-versions-and-settings-untagged.sh b/resources/build/mac/set-bundle-versions-and-settings-untagged.sh
similarity index 71%
rename from resources/build/set-bundle-versions-and-settings-untagged.sh
rename to resources/build/mac/set-bundle-versions-and-settings-untagged.sh
index 93cd8a7eab..2906cfa971 100755
--- a/resources/build/set-bundle-versions-and-settings-untagged.sh
+++ b/resources/build/mac/set-bundle-versions-and-settings-untagged.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
 
 # Calls script in xcode-utils to update the version
 # true:  applies KEYMAN_VERSION_WITH_TAG to custom KeymanVersionWithTag plist member used for in-app display
 # updates the version string for Settings
 
-source "$KEYMAN_ROOT/resources/build/xcode-utils.sh"
+source "$KEYMAN_ROOT/resources/build/mac/xcode-utils.inc.sh"
 
 phaseSetBundleVersions
 
diff --git a/resources/build/set-bundle-versions-tagged.sh b/resources/build/mac/set-bundle-versions-tagged.sh
similarity index 65%
rename from resources/build/set-bundle-versions-tagged.sh
rename to resources/build/mac/set-bundle-versions-tagged.sh
index a941d460fe..c3a91d055f 100755
--- a/resources/build/set-bundle-versions-tagged.sh
+++ b/resources/build/mac/set-bundle-versions-tagged.sh
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
 
 # Calls script in xcode-utils to update the version
 # true:  applies KEYMAN_VERSION_WITH_TAG to custom KeymanVersionWithTag plist member used for in-app display
 
-source "$KEYMAN_ROOT/resources/build/xcode-utils.sh"
+source "$KEYMAN_ROOT/resources/build/mac/xcode-utils.inc.sh"
 phaseSetBundleVersions true
diff --git a/resources/build/mac/set-bundle-versions-untagged.sh b/resources/build/mac/set-bundle-versions-untagged.sh
new file mode 100755
index 0000000000..98f737e120
--- /dev/null
+++ b/resources/build/mac/set-bundle-versions-untagged.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+# Calls script in xcode-utils to update the version
+
+source "$KEYMAN_ROOT/resources/build/mac/xcode-utils.inc.sh"
+phaseSetBundleVersions
\ No newline at end of file
diff --git a/resources/build/xcode-utils.sh b/resources/build/mac/xcode-utils.inc.sh
old mode 100755
new mode 100644
similarity index 92%
rename from resources/build/xcode-utils.sh
rename to resources/build/mac/xcode-utils.inc.sh
index b917b5d63f..9cdb85de2d
--- a/resources/build/xcode-utils.sh
+++ b/resources/build/mac/xcode-utils.inc.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
 
 # This script will automatically have Xcode's build environment (and variables),
 # so there's no need to do anything extra to fetch them.
@@ -24,7 +25,7 @@ function importEnvironment() {
     buildError "KEYMAN_ROOT is not defined.  Recommendation:  define it as a project-wide \"user-defined\" Build Setting for the \"$PROJECT_NAME\" project."
     exit 1
   else
-    # As defined within build-utils.sh, which this script does NOT call.  (It was already called externally.)
+    # As defined within builder-basic.inc.sh, which this script does NOT call.  (It was already called externally.)
     ENVIRONMENT_SH="$KEYMAN_ROOT/resources/environment.sh"
     . "$ENVIRONMENT_SH"
   fi
@@ -45,13 +46,13 @@ function phaseSetBundleVersions() {
   # For command-line builds, KEYMAN_VERSION and KEYMAN_VERSION_WITH_TAG) are forwarded through xcodebuild.
   if [ -z "${KEYMAN_VERSION:-}" ]; then
     # This is likely not a command-line build at the top level; it's been triggered through Xcode.
-    # The $KEYMAN_VERSION-loading code is in build-utils.sh, but we need $THIS_SCRIPT to be set
+    # The $KEYMAN_VERSION-loading code is in builder-basic.inc.sh, but we need $THIS_SCRIPT to be set
     # (in similar manner to the "standard build header") in order to avoid script errors therein.
     THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
     # Note that this script's process will not have access to TC environment variables, but that's fine for
     # local builds triggered through Xcode's UI, which aren't part of our CI processes.
-    . "$KEYMAN_ROOT/resources/build/build-utils.sh"
+    . "$KEYMAN_ROOT/resources/build/builder-basic.inc.sh"
     echo "phaseSetBundleVersions: UI build - fetching version from repository:"
     echo "  Plain:  $KEYMAN_VERSION"
     echo "  Tagged: $KEYMAN_VERSION_WITH_TAG"
@@ -102,10 +103,10 @@ function phaseSetBundleVersions() {
 function setSettingsBundleVersion() {
   # For command-line builds, KEYMAN_VERSION and KEYMAN_VERSION_WITH_TAG) are forwarded through xcodebuild.
   if [ -z "${KEYMAN_VERSION:-}" ]; then
-    # We're not a command-line build... so we'll need to retrieve these values ourselves with ./build-utils.sh.
+    # We're not a command-line build... so we'll need to retrieve these values ourselves with ./builder-basic.inc.sh.
     # Note that this script's process will not have access to TC environment variables, but that's fine for
     # local builds triggered through Xcode's UI, which aren't part of our CI processes.
-    . "$KEYMAN_ROOT/resources/build/build-utils.sh"
+    . "$KEYMAN_ROOT/resources/build/builder-basic.inc.sh"
     echo "setSettingsBundleVersion: UI build - fetching version from repository:"
     echo "  Plain:  $KEYMAN_VERSION"
     echo "  Tagged: $KEYMAN_VERSION_WITH_TAG"
@@ -163,12 +164,12 @@ function phaseSentryDsymUpload() {
 }
 
 #
-# All calls to xcode-utils.sh scripts will have their output redirected to
+# All calls to xcode-utils.inc.sh scripts will have their output redirected to
 # $KEYMAN_ROOT/xcodebuild-scripts.log. This will redirect both stdout and stderr
 # to this log file. See the corresponding printXCodeBuildScriptLogs function in
-# build-utils.sh to print the log after xcodebuild returns.
+# builder-basic.inc.sh to print the log after xcodebuild returns.
 #
-# More information in the build-utils.sh.
+# More information in the builder-basic.inc.sh.
 #
 function logScriptsToFile() {
   local SCRIPT_LOG="$KEYMAN_ROOT/xcodebuild-scripts.log"
diff --git a/resources/build/mac/xcode-wrap.sh b/resources/build/mac/xcode-wrap.sh
new file mode 100755
index 0000000000..3b97ab57fd
--- /dev/null
+++ b/resources/build/mac/xcode-wrap.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+# Runs a script using the homebrew version of bash from within an xcode script;
+# we need this because xcode does not inherit paths from user's terminal
+# environment.
+
+echo "xcode-wrap: wrap script for arch $(arch)"
+if [[ $(arch) == i386 ]] && [[ -f /usr/local/bin/bash ]]; then
+  /usr/local/bin/bash -l "$@" || exit $?
+elif [[ $(arch) == arm64 ]] && [[ -f /opt/homebrew/bin/bash ]]; then
+  /opt/homebrew/bin/bash -l "$@" || exit $?
+else
+  >&2 echo "xcode-wrap: Could not start build due to missing homebrew bash"
+  exit 55
+fi
\ No newline at end of file
diff --git a/resources/build/meson/standard.meson.build b/resources/build/meson/standard.meson.build
index 0bf48f9e9c..6345e67fb2 100644
--- a/resources/build/meson/standard.meson.build
+++ b/resources/build/meson/standard.meson.build
@@ -16,13 +16,6 @@
 cpp_compiler = meson.get_compiler('cpp')
 c_compiler = meson.get_compiler('c')
 
-# Once we can assume meson 0.60 we can delete this
-# (https://mesonbuild.com/Release-notes-for-0-60-0.html#msvc-compiler-now-assumes-utf8-source-code-by-default)
-if cpp_compiler.get_id() == 'msvc'
-  add_global_arguments('/source-charset:utf-8', language: ['c', 'cpp'])
-  add_global_arguments('/execution-charset:utf-8', language: ['c', 'cpp'])
-endif
-
 #
 # Standard informational messages for our builds
 #
diff --git a/resources/build/meson/standard_meson_build.inc.sh b/resources/build/meson/standard_meson_build.inc.sh
index f910b8e35d..bede8aaa76 100644
--- a/resources/build/meson/standard_meson_build.inc.sh
+++ b/resources/build/meson/standard_meson_build.inc.sh
@@ -1,3 +1,5 @@
+# shellcheck shell=bash
+# shellcheck disable=SC2154
 #
 # Keyman is copyright (C) SIL Global. MIT License.
 #
@@ -29,7 +31,7 @@
 #
 
 standard_meson_build() {
-  mkdir -p "$THIS_SCRIPT_PATH/resources"
-  cp "$KEYMAN_ROOT/resources/build/meson/standard.meson.build" "$THIS_SCRIPT_PATH/resources/meson.build"
-  echo "$KEYMAN_VERSION_WITH_TAG" > "$THIS_SCRIPT_PATH/resources/KEYMAN_VERSION_WITH_TAG.md"
+  mkdir -p "${THIS_SCRIPT_PATH}/resources"
+  cp "${KEYMAN_ROOT}/resources/build/meson/standard.meson.build" "${THIS_SCRIPT_PATH}/resources/meson.build"
+  echo "${KEYMAN_VERSION_WITH_TAG}" > "${THIS_SCRIPT_PATH}/resources/KEYMAN_VERSION_WITH_TAG.md"
 }
diff --git a/resources/build/minimum-versions.inc.sh b/resources/build/minimum-versions.inc.sh
index 49e546c0fb..5bcbf3cc12 100644
--- a/resources/build/minimum-versions.inc.sh
+++ b/resources/build/minimum-versions.inc.sh
@@ -3,6 +3,7 @@
 # This is a list of minimum, maximum, and specific versions of any external
 # components or dependencies found in Keyman.
 #
+# Original (outdated) reference 
 # https://docs.google.com/document/d/1Uy3U2YXeA4rCEbUbT7O6QzUGJDZBeViFecL8fjUOLkE/edit?usp=sharing
 
 # NOTE: After changing any values, you should run publish-minimum-versions.sh.
@@ -15,7 +16,7 @@ KEYMAN_MIN_TARGET_VERSION_IOS=15.6            # iOS 15.6
 KEYMAN_MIN_TARGET_VERSION_WINDOWS=10          # Windows 10
 KEYMAN_MIN_TARGET_VERSION_MAC=10.13           # MacOS 10.13 (High Sierra)
 KEYMAN_MIN_TARGET_VERSION_UBUNTU=22.04        # Ubuntu 22.04 Jammy
-KEYMAN_MIN_TARGET_VERSION_ANDROID_CHROME=53.0 # min version of Chrome for Keyman for Android
+KEYMAN_MIN_TARGET_VERSION_ANDROID_CHROME=95.0 # min version of Chrome for Keyman for Android
 
 # Target web browsers for KeymanWeb -- we do not have polyfills for
 # earlier versions, YMMV
diff --git a/resources/build/node.inc.sh b/resources/build/node.inc.sh
new file mode 100644
index 0000000000..15e66da78c
--- /dev/null
+++ b/resources/build/node.inc.sh
@@ -0,0 +1,79 @@
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+[[ -z ${_utils_inc_sh+x} ]] && source "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+
+# Verifies that node is installed, and installs npm packages, but only once per
+# build invocation
+node_select_version_and_npm_ci() {
+  # We'll piggy-back on the builder module dependency build state to determine
+  # if npm ci has been called in the current script invocation. Adding the
+  # prefix /external/ to module name in order to differentiate between this and
+  # internal modules (although it is unlikely to ever collide!); we will also
+  # use this pattern for other similar external dependencies in future. These
+  # functions are safe to call even in a non-builder context (they do nothing or
+  # return 1 -- not built)
+  if builder_has_module_been_built /external/npm-ci; then
+    return 0
+  fi
+  builder_set_module_has_been_built /external/npm-ci
+
+  # If we are on CI environment, automatically select a node version with nvm
+  # Also, a developer can set KEYMAN_USE_NVM variable to get this behaviour
+  # automatically too (see /docs/build/node.md)
+  if [[ "$KEYMAN_VERSION_ENVIRONMENT" != local || ! -z "${KEYMAN_USE_NVM+x}" ]]; then
+    _node_select_version_with_nvm
+  fi
+
+  # Check if Node.JS/npm is installed.
+  type npm >/dev/null ||\
+    builder_die "Build environment setup error detected!  Please ensure Node.js is installed!"
+
+  pushd "$KEYMAN_ROOT" > /dev/null
+
+  offline_param=
+  if builder_try_offline; then
+    builder_echo "Trying offline build"
+    offline_param=--prefer-offline
+  fi
+  try_multiple_times npm ${offline_param} ci
+
+  popd > /dev/null
+}
+
+_node_print_expected_version() {
+  "$JQ" -r '.engines.node' "$KEYMAN_ROOT/package.json"
+}
+
+# Use nvm to select a node version according to package.json
+# see /docs/build/node.md
+_node_select_version_with_nvm() {
+  local REQUIRED_NODE_VERSION  CURRENT_NODE_VERSION
+
+  REQUIRED_NODE_VERSION="$(_node_print_expected_version)"
+  if [[ -z "$REQUIRED_NODE_VERSION" ]]; then
+    builder_die "Could not find expected Node.js version in $KEYMAN_ROOT/package.json"
+  fi
+
+  if builder_is_windows; then
+    CURRENT_NODE_VERSION="$(node --version)"
+    if [[ "${CURRENT_NODE_VERSION}" != "v${REQUIRED_NODE_VERSION}" ]]; then
+      start //wait //b nvm install "${REQUIRED_NODE_VERSION}"
+      start //wait //b nvm use "${REQUIRED_NODE_VERSION}"
+    fi
+  else
+    # launch nvm in a sub process, see _builder_nvm.sh for details
+    "${KEYMAN_ROOT}/resources/build/_builder_nvm.sh" "${REQUIRED_NODE_VERSION}"
+  fi
+
+  # Now, check that the node version is correct, on all systems
+
+  # Note: On windows, `nvm use` and `nvm install` always return success.
+  # https://github.com/coreybutler/nvm-windows/issues/738
+
+  # note the 'v' prefix that node emits (and npm doesn't!)
+  CURRENT_NODE_VERSION="$(node --version)"
+  if [[ "$CURRENT_NODE_VERSION" != "v$REQUIRED_NODE_VERSION" ]]; then
+    builder_die "Attempted to select node.js version $REQUIRED_NODE_VERSION but found $CURRENT_NODE_VERSION instead"
+  fi
+}
diff --git a/resources/build/pr-build-status/build.sh b/resources/build/pr-build-status/build.sh
new file mode 100755
index 0000000000..ca87de813d
--- /dev/null
+++ b/resources/build/pr-build-status/build.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+builder_describe "Build and test the pr-build-status.yml GHA" build test
+
+builder_parse "$@"
+
+YML_PREFIX_FILE="${THIS_SCRIPT_PATH}/pr-build-status.prefix.yml"
+YML_FILE="${KEYMAN_ROOT}/.github/workflows/pr-build-status.yml"
+MJS_FILE="${THIS_SCRIPT_PATH}/pr-build-status.mjs"
+
+# Regenerate pr-build-status.yml from the script here
+function do_build() {
+  local YML_PREFIX=$(cat "$YML_PREFIX_FILE")
+  local SCRIPT_CLONE=$(sed -n '/CLONE:START/,/CLONE:END/{//!p}' < "$MJS_FILE")
+  local SCRIPT_SUFFIX=$(sed -n '/CLONE-COMMENTED:START/,/CLONE-COMMENTED:END/{//!p}' < "$MJS_FILE" | sed 's/\/\/ //g')
+  echo -e "# GENERATED FILE - DO NOT EDIT!\n$YML_PREFIX\n$SCRIPT_CLONE\n$SCRIPT_SUFFIX\n" > "$YML_FILE"
+}
+
+builder_run_action build  do_build
+builder_run_action test   npm test
+
diff --git a/resources/build/pr-build-status/fixtures/11a558e926370253db37026c95b7ff5a6aa1e8fc-check-runs.json b/resources/build/pr-build-status/fixtures/11a558e926370253db37026c95b7ff5a6aa1e8fc-check-runs.json
new file mode 100644
index 0000000000..46f4415c17
--- /dev/null
+++ b/resources/build/pr-build-status/fixtures/11a558e926370253db37026c95b7ff5a6aa1e8fc-check-runs.json
@@ -0,0 +1,384 @@
+[
+  {
+    "id": 44090590145,
+    "name": "build",
+    "node_id": "CR_kwDOAY2xT88AAAAKRAEDwQ",
+    "head_sha": "11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "external_id": "389dd74c-044c-5be6-a27d-4b4819c2ff55",
+    "url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44090590145",
+    "html_url": "https://github.com/keymanapp/keyman/actions/runs/15648814574/job/44090590145",
+    "details_url": "https://github.com/keymanapp/keyman/actions/runs/15648814574/job/44090590145",
+    "status": "completed",
+    "conclusion": "skipped",
+    "started_at": "2025-06-14T05:23:18Z",
+    "completed_at": "2025-06-14T05:23:18Z",
+    "output": {
+      "title": null,
+      "summary": null,
+      "text": null,
+      "annotations_count": 0,
+      "annotations_url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44090590145/annotations"
+    },
+    "check_suite": {
+      "id": 40118324763
+    },
+    "app": {
+      "id": 15368,
+      "client_id": "Iv1.05c79e9ad1f6bdfa",
+      "slug": "github-actions",
+      "node_id": "MDM6QXBwMTUzNjg=",
+      "owner": {
+        "login": "github",
+        "id": 9919,
+        "node_id": "MDEyOk9yZ2FuaXphdGlvbjk5MTk=",
+        "avatar_url": "https://avatars.githubusercontent.com/u/9919?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github",
+        "html_url": "https://github.com/github",
+        "followers_url": "https://api.github.com/users/github/followers",
+        "following_url": "https://api.github.com/users/github/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github/subscriptions",
+        "organizations_url": "https://api.github.com/users/github/orgs",
+        "repos_url": "https://api.github.com/users/github/repos",
+        "events_url": "https://api.github.com/users/github/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github/received_events",
+        "type": "Organization",
+        "user_view_type": "public",
+        "site_admin": false
+      },
+      "name": "GitHub Actions",
+      "description": "Automate your workflow from idea to production",
+      "external_url": "https://help.github.com/en/actions",
+      "html_url": "https://github.com/apps/github-actions",
+      "created_at": "2018-07-30T09:30:17Z",
+      "updated_at": "2025-03-07T16:35:00Z",
+      "permissions": {
+        "actions": "write",
+        "administration": "read",
+        "attestations": "write",
+        "checks": "write",
+        "contents": "write",
+        "deployments": "write",
+        "discussions": "write",
+        "issues": "write",
+        "merge_queues": "write",
+        "metadata": "read",
+        "models": "read",
+        "packages": "write",
+        "pages": "write",
+        "pull_requests": "write",
+        "repository_hooks": "write",
+        "repository_projects": "write",
+        "security_events": "write",
+        "statuses": "write",
+        "vulnerability_alerts": "read"
+      },
+      "events": [
+        "branch_protection_rule",
+        "check_run",
+        "check_suite",
+        "create",
+        "delete",
+        "deployment",
+        "deployment_status",
+        "discussion",
+        "discussion_comment",
+        "fork",
+        "gollum",
+        "issues",
+        "issue_comment",
+        "label",
+        "merge_group",
+        "milestone",
+        "page_build",
+        "project",
+        "project_card",
+        "project_column",
+        "public",
+        "pull_request",
+        "pull_request_review",
+        "pull_request_review_comment",
+        "push",
+        "registry_package",
+        "release",
+        "repository",
+        "repository_dispatch",
+        "status",
+        "watch",
+        "workflow_dispatch",
+        "workflow_run"
+      ]
+    },
+    "pull_requests": [
+      {
+        "url": "https://api.github.com/repos/keymanapp/keyman/pulls/14196",
+        "id": 2591938321,
+        "number": 14196,
+        "head": {
+          "ref": "maint/developer/support-buildLevel",
+          "sha": "825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        },
+        "base": {
+          "ref": "maint/common/pr-build-bot",
+          "sha": "81c941313bcccd8405364731ce61672588285d5d",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "id": 44090590129,
+    "name": "triage",
+    "node_id": "CR_kwDOAY2xT88AAAAKRAEDsQ",
+    "head_sha": "11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "external_id": "d467db85-960e-541c-a8c1-5f09c33904f5",
+    "url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44090590129",
+    "html_url": "https://github.com/keymanapp/keyman/actions/runs/15648814560/job/44090590129",
+    "details_url": "https://github.com/keymanapp/keyman/actions/runs/15648814560/job/44090590129",
+    "status": "completed",
+    "conclusion": "success",
+    "started_at": "2025-06-14T05:23:21Z",
+    "completed_at": "2025-06-14T05:23:29Z",
+    "output": {
+      "title": null,
+      "summary": null,
+      "text": null,
+      "annotations_count": 0,
+      "annotations_url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44090590129/annotations"
+    },
+    "check_suite": {
+      "id": 40118324747
+    },
+    "app": {
+      "id": 15368,
+      "client_id": "Iv1.05c79e9ad1f6bdfa",
+      "slug": "github-actions",
+      "node_id": "MDM6QXBwMTUzNjg=",
+      "owner": {
+        "login": "github",
+        "id": 9919,
+        "node_id": "MDEyOk9yZ2FuaXphdGlvbjk5MTk=",
+        "avatar_url": "https://avatars.githubusercontent.com/u/9919?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github",
+        "html_url": "https://github.com/github",
+        "followers_url": "https://api.github.com/users/github/followers",
+        "following_url": "https://api.github.com/users/github/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github/subscriptions",
+        "organizations_url": "https://api.github.com/users/github/orgs",
+        "repos_url": "https://api.github.com/users/github/repos",
+        "events_url": "https://api.github.com/users/github/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github/received_events",
+        "type": "Organization",
+        "user_view_type": "public",
+        "site_admin": false
+      },
+      "name": "GitHub Actions",
+      "description": "Automate your workflow from idea to production",
+      "external_url": "https://help.github.com/en/actions",
+      "html_url": "https://github.com/apps/github-actions",
+      "created_at": "2018-07-30T09:30:17Z",
+      "updated_at": "2025-03-07T16:35:00Z",
+      "permissions": {
+        "actions": "write",
+        "administration": "read",
+        "attestations": "write",
+        "checks": "write",
+        "contents": "write",
+        "deployments": "write",
+        "discussions": "write",
+        "issues": "write",
+        "merge_queues": "write",
+        "metadata": "read",
+        "models": "read",
+        "packages": "write",
+        "pages": "write",
+        "pull_requests": "write",
+        "repository_hooks": "write",
+        "repository_projects": "write",
+        "security_events": "write",
+        "statuses": "write",
+        "vulnerability_alerts": "read"
+      },
+      "events": [
+        "branch_protection_rule",
+        "check_run",
+        "check_suite",
+        "create",
+        "delete",
+        "deployment",
+        "deployment_status",
+        "discussion",
+        "discussion_comment",
+        "fork",
+        "gollum",
+        "issues",
+        "issue_comment",
+        "label",
+        "merge_group",
+        "milestone",
+        "page_build",
+        "project",
+        "project_card",
+        "project_column",
+        "public",
+        "pull_request",
+        "pull_request_review",
+        "pull_request_review_comment",
+        "push",
+        "registry_package",
+        "release",
+        "repository",
+        "repository_dispatch",
+        "status",
+        "watch",
+        "workflow_dispatch",
+        "workflow_run"
+      ]
+    },
+    "pull_requests": [
+      {
+        "url": "https://api.github.com/repos/keymanapp/keyman/pulls/14196",
+        "id": 2591938321,
+        "number": 14196,
+        "head": {
+          "ref": "maint/developer/support-buildLevel",
+          "sha": "825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        },
+        "base": {
+          "ref": "maint/common/pr-build-bot",
+          "sha": "81c941313bcccd8405364731ce61672588285d5d",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "id": 44090589932,
+    "name": "GitGuardian Security Checks",
+    "node_id": "CR_kwDOAY2xT88AAAAKRAEC7A",
+    "head_sha": "11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "external_id": "",
+    "url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44090589932",
+    "html_url": "https://github.com/keymanapp/keyman/runs/44090589932",
+    "details_url": "https://dashboard.gitguardian.com",
+    "status": "completed",
+    "conclusion": "success",
+    "started_at": "2025-06-14T05:23:17Z",
+    "completed_at": "2025-06-14T05:23:20Z",
+    "output": {
+      "title": "No secrets detected ✅",
+      "summary": "**1** commit was scanned without uncovering any secrets.\n",
+      "text": "Commit scanned: **1**\n\n\n\n-   Pull request #14196: `maint/developer/support-buildLevel` 👉 `maint/common/pr-build-bot`\n    \n\n🦉 [GitGuardian](https://dashboard.gitguardian.com/auth/login/?utm_medium=checkruns&amp;utm_source=github&amp;utm_campaign=cr1) detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.<br/>\n",
+      "annotations_count": 0,
+      "annotations_url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44090589932/annotations"
+    },
+    "check_suite": {
+      "id": 40118324322
+    },
+    "app": {
+      "id": 46505,
+      "client_id": "Iv1.ec3c001966b4cc5a",
+      "slug": "gitguardian",
+      "node_id": "MDM6QXBwNDY1MDU=",
+      "owner": {
+        "login": "GitGuardian",
+        "id": 27360172,
+        "node_id": "MDEyOk9yZ2FuaXphdGlvbjI3MzYwMTcy",
+        "avatar_url": "https://avatars.githubusercontent.com/u/27360172?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/GitGuardian",
+        "html_url": "https://github.com/GitGuardian",
+        "followers_url": "https://api.github.com/users/GitGuardian/followers",
+        "following_url": "https://api.github.com/users/GitGuardian/following{/other_user}",
+        "gists_url": "https://api.github.com/users/GitGuardian/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/GitGuardian/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/GitGuardian/subscriptions",
+        "organizations_url": "https://api.github.com/users/GitGuardian/orgs",
+        "repos_url": "https://api.github.com/users/GitGuardian/repos",
+        "events_url": "https://api.github.com/users/GitGuardian/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/GitGuardian/received_events",
+        "type": "Organization",
+        "user_view_type": "public",
+        "site_admin": false
+      },
+      "name": "GitGuardian",
+      "description": "# 🦉 What is GitGuardian?\r\n\r\nGitGuardian Secrets Detection detects and fixes vulnerabilities in source code at every step of the software development lifecycle, covering 350+ types of secrets like API keys, database connection strings, private keys, certificates, and more. The platform’s policy engine enables security teams to monitor and enforce rules across their VCS, DevOps tools, and infrastructure-as-code configurations. Our automated remediation playbooks and collaboration features bring security and development teams together to resolve incidents fast and in full.\r\n\r\n## 1. Scan your codebase for 350+ types of secrets\r\nGitGuardian scans your GitHub repositories and raises alerts only for critical secrets, such as API keys or other credentials. At scale, GitGuardian’s detection algorithm has been battle-tested on over three years of activity in all public GitHub repositories – totaling over 1 billion scanned commits!\r\n\r\n## 2. Quickly remediate your hard-coded secrets\r\nIf you ever experience a leak involving a credential, we have a complete remediation guide used by 100k+ developers each year. We’ll show you how to revoke the secret and remove it from your git history.\r\n\r\n##  3. Prevent secrets from reaching GitHub\r\nInstall ggshield, the GitGuardian CLI, and add secrets detection to your local development workflow using pre-commit and pre-push git hooks integrations.\r\n\r\n# 🙋‍♂️ FAQ\r\n\r\n**What is your pricing?**\r\nGitGuardian is free for teams under 25 developers and offers a 30-day trial for larger teams.\r\n\r\n**How can I be sure that GitGuardian won’t raise too many false positives?**\r\nWe have scanned billions of commits, sent millions of alerts since 2018, and integrated each feedback to improve our algorithm. Our alerts currently receive 91% “true positive” feedback from developers.\r\n\r\n**My repositories are private; why should I install automated secret detection?**\r\nImagine if there were a plain text file with all your credit card numbers inside, you wouldn’t put this file inside your company’s git repository. Secrets are just as sensitive and should be handled with special care.\r\n\r\n**Is GitGuardian available to be installed on-premise?**\r\nYes, you can contact one of our security specialists to look over the possibility of installing GitGuardian on-premise on your repositories.\r\n\r\n# ⚒️ Installation notes \r\n\r\nYou should install GitGuardian directly through your [GitGuardian](https://dashboard.gitguardian.com/) workspace on the Integration settings page. \r\n\r\nSo that you know, your GitHub organization or GitHub account can only be associated with a single GitGuardian workspace.\r\n\r\n# 👋 Support\r\n\r\nIf you experience any difficulties or have any questions, please reach out to us by email ([support@gitguardian.com](mailto:support@gitguardian.com)).",
+      "external_url": "https://dashboard.gitguardian.com",
+      "html_url": "https://github.com/apps/gitguardian",
+      "created_at": "2019-11-12T15:44:31Z",
+      "updated_at": "2023-07-18T09:06:22Z",
+      "permissions": {
+        "checks": "write",
+        "contents": "read",
+        "emails": "read",
+        "issues": "write",
+        "members": "read",
+        "metadata": "read",
+        "organization_hooks": "write",
+        "pull_requests": "write"
+      },
+      "events": [
+        "check_run",
+        "check_suite",
+        "commit_comment",
+        "create",
+        "delete",
+        "organization",
+        "public",
+        "pull_request",
+        "pull_request_review",
+        "pull_request_review_comment",
+        "push",
+        "repository"
+      ]
+    },
+    "pull_requests": [
+      {
+        "url": "https://api.github.com/repos/keymanapp/keyman/pulls/14196",
+        "id": 2591938321,
+        "number": 14196,
+        "head": {
+          "ref": "maint/developer/support-buildLevel",
+          "sha": "825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        },
+        "base": {
+          "ref": "maint/common/pr-build-bot",
+          "sha": "81c941313bcccd8405364731ce61672588285d5d",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        }
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/resources/build/pr-build-status/fixtures/11a558e926370253db37026c95b7ff5a6aa1e8fc-statuses.json b/resources/build/pr-build-status/fixtures/11a558e926370253db37026c95b7ff5a6aa1e8fc-statuses.json
new file mode 100644
index 0000000000..02f629220d
--- /dev/null
+++ b/resources/build/pr-build-status/fixtures/11a558e926370253db37026c95b7ff5a6aa1e8fc-statuses.json
@@ -0,0 +1,3005 @@
+[
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974475031,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9m3Fw",
+    "state": "failure",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Developer_Test/557042",
+    "context": "Test - Windows (Keyman - Developer)",
+    "created_at": "2025-06-14T05:58:17Z",
+    "updated_at": "2025-06-14T05:58:17Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974472547,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9mtYw",
+    "state": "failure",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Developer_Test/557042",
+    "context": "Test - Windows (Keyman - Developer)",
+    "created_at": "2025-06-14T05:57:36Z",
+    "updated_at": "2025-06-14T05:57:36Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974455323,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9lqGw",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:52:43Z",
+    "updated_at": "2025-06-14T05:52:43Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974455007,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9lo3w",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Linux_Test_Integration/557030",
+    "context": "Test:Integration (Keyman - Linux)",
+    "created_at": "2025-06-14T05:52:37Z",
+    "updated_at": "2025-06-14T05:52:37Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974447591,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9lL5w",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:50:28Z",
+    "updated_at": "2025-06-14T05:50:28Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974447340,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9lK7A",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Linux_Test_Integration/557030",
+    "context": "Test:Integration (Keyman - Linux)",
+    "created_at": "2025-06-14T05:50:24Z",
+    "updated_at": "2025-06-14T05:50:24Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974447314,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9lK0g",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanAndroid_TestSamplesAndTestProjects/557041",
+    "context": "Test: Samples and Test projects (Keyman - Android)",
+    "created_at": "2025-06-14T05:50:24Z",
+    "updated_at": "2025-06-14T05:50:24Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974436093,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9ke_Q",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:47:10Z",
+    "updated_at": "2025-06-14T05:47:10Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974435704,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9kdeA",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanAndroid_TestSamplesAndTestProjects/557041",
+    "context": "Test: Samples and Test projects (Keyman - Android)",
+    "created_at": "2025-06-14T05:47:04Z",
+    "updated_at": "2025-06-14T05:47:04Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974435663,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9kdTw",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Developer_Mac/557043",
+    "context": "Test - macOS (Keyman - Developer)",
+    "created_at": "2025-06-14T05:47:03Z",
+    "updated_at": "2025-06-14T05:47:03Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974428929,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9kDAQ",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:45:14Z",
+    "updated_at": "2025-06-14T05:45:14Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974428773,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9kCZQ",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestPullRequests/557025",
+    "context": "Test (Keyman - iOS)",
+    "created_at": "2025-06-14T05:45:12Z",
+    "updated_at": "2025-06-14T05:45:12Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974413112,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9jFOA",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:41:03Z",
+    "updated_at": "2025-06-14T05:41:03Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974413052,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9jE_A",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:41:02Z",
+    "updated_at": "2025-06-14T05:41:02Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974412786,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9jD8g",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Developer_Mac/557043",
+    "context": "Test - macOS (Keyman - Developer)",
+    "created_at": "2025-06-14T05:40:57Z",
+    "updated_at": "2025-06-14T05:40:57Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974412759,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9jD1w",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_macOS/557035",
+    "context": "Test: Keyman Core - macOS (Common)",
+    "created_at": "2025-06-14T05:40:57Z",
+    "updated_at": "2025-06-14T05:40:57Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974412521,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9jC6Q",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_WASM/557028",
+    "context": "Test: Keyman Core - WASM (Common)",
+    "created_at": "2025-06-14T05:40:53Z",
+    "updated_at": "2025-06-14T05:40:53Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974397722,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9iJGg",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:36:41Z",
+    "updated_at": "2025-06-14T05:36:41Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974397485,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9iILQ",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Developer_Linux/557044",
+    "context": "Test - Linux (Keyman - Developer)",
+    "created_at": "2025-06-14T05:36:37Z",
+    "updated_at": "2025-06-14T05:36:37Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974394397,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9h8HQ",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:35:45Z",
+    "updated_at": "2025-06-14T05:35:45Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974393913,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9h6OQ",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_macOS/557035",
+    "context": "Test: Keyman Core - macOS (Common)",
+    "created_at": "2025-06-14T05:35:38Z",
+    "updated_at": "2025-06-14T05:35:38Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974393881,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9h6GQ",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_KeymanMac_PullRequests/557034",
+    "context": "Test (Keyman - macOS)",
+    "created_at": "2025-06-14T05:35:38Z",
+    "updated_at": "2025-06-14T05:35:38Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974392050,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9hy8g",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:35:07Z",
+    "updated_at": "2025-06-14T05:35:07Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974391695,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9hxjw",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Linux/557045",
+    "context": "Test: Common - Linux (Common)",
+    "created_at": "2025-06-14T05:35:02Z",
+    "updated_at": "2025-06-14T05:35:02Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974389314,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9hoQg",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:34:21Z",
+    "updated_at": "2025-06-14T05:34:21Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974389188,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9hnxA",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Linux/557045",
+    "context": "Test: Common - Linux (Common)",
+    "created_at": "2025-06-14T05:34:19Z",
+    "updated_at": "2025-06-14T05:34:19Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974389160,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9hnqA",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanAndroid_TestPullRequests/557040",
+    "context": "Test (Keyman - Android)",
+    "created_at": "2025-06-14T05:34:19Z",
+    "updated_at": "2025-06-14T05:34:19Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974387372,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9hgrA",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_Windows/557038",
+    "context": "Test: Keyman Core - Windows (Common)",
+    "created_at": "2025-06-14T05:33:48Z",
+    "updated_at": "2025-06-14T05:33:48Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974382289,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9hM0Q",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:32:25Z",
+    "updated_at": "2025-06-14T05:32:25Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+    "id": 36974380961,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9hHoQ",
+    "state": "success",
+    "description": "API verification succeeded",
+    "target_url": "https://github.com/keymanapp/keyman/actions/runs/15648875895",
+    "context": "API Verification",
+    "created_at": "2025-06-14T05:32:07Z",
+    "updated_at": "2025-06-14T05:32:07Z",
+    "creator": {
+      "login": "github-actions[bot]",
+      "id": 41898282,
+      "node_id": "MDM6Qm90NDE4OTgyODI=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+      "html_url": "https://github.com/apps/github-actions",
+      "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974379441,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9hBsQ",
+    "state": "failure",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPullRequests/557036",
+    "context": "Test (Keyman - Windows)",
+    "created_at": "2025-06-14T05:31:44Z",
+    "updated_at": "2025-06-14T05:31:44Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974379408,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9hBkA",
+    "state": "failure",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPullRequests/557036",
+    "context": "Test (Keyman - Windows)",
+    "created_at": "2025-06-14T05:31:44Z",
+    "updated_at": "2025-06-14T05:31:44Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974377063,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9g4Zw",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:31:10Z",
+    "updated_at": "2025-06-14T05:31:10Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974376865,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9g3oQ",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_KeymanMac_PullRequests/557034",
+    "context": "Test (Keyman - macOS)",
+    "created_at": "2025-06-14T05:31:08Z",
+    "updated_at": "2025-06-14T05:31:08Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974376840,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9g3iA",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Mac/557032",
+    "context": "Test: Common - macOS (Common)",
+    "created_at": "2025-06-14T05:31:08Z",
+    "updated_at": "2025-06-14T05:31:08Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+    "id": 36974376415,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9g13w",
+    "state": "pending",
+    "description": "API verification started",
+    "target_url": "https://github.com/keymanapp/keyman/actions/runs/15648875895",
+    "context": "API Verification",
+    "created_at": "2025-06-14T05:31:03Z",
+    "updated_at": "2025-06-14T05:31:03Z",
+    "creator": {
+      "login": "github-actions[bot]",
+      "id": 41898282,
+      "node_id": "MDM6Qm90NDE4OTgyODI=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+      "html_url": "https://github.com/apps/github-actions",
+      "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974375823,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9gzjw",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:30:55Z",
+    "updated_at": "2025-06-14T05:30:55Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+    "id": 36974375684,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9gzBA",
+    "state": "success",
+    "description": "Package build succeeded",
+    "target_url": "https://github.com/keymanapp/keyman/actions/runs/15648818384",
+    "context": "Ubuntu Packaging",
+    "created_at": "2025-06-14T05:30:53Z",
+    "updated_at": "2025-06-14T05:30:53Z",
+    "creator": {
+      "login": "github-actions[bot]",
+      "id": 41898282,
+      "node_id": "MDM6Qm90NDE4OTgyODI=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+      "html_url": "https://github.com/apps/github-actions",
+      "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974375142,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9gw5g",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:30:46Z",
+    "updated_at": "2025-06-14T05:30:46Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974374835,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9gvsw",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Developer_Test/557042",
+    "context": "Test - Windows (Keyman - Developer)",
+    "created_at": "2025-06-14T05:30:42Z",
+    "updated_at": "2025-06-14T05:30:42Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974374814,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9gvng",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Web/557039",
+    "context": "Test: Common - Web (Common)",
+    "created_at": "2025-06-14T05:30:41Z",
+    "updated_at": "2025-06-14T05:30:41Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974374101,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9gs1Q",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:30:32Z",
+    "updated_at": "2025-06-14T05:30:32Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974373619,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9gq8w",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Developer_Linux/557044",
+    "context": "Test - Linux (Keyman - Developer)",
+    "created_at": "2025-06-14T05:30:26Z",
+    "updated_at": "2025-06-14T05:30:26Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974373603,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9gq4w",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keymanweb_TestPullRequests/557027",
+    "context": "Test (Keyman - Web)",
+    "created_at": "2025-06-14T05:30:25Z",
+    "updated_at": "2025-06-14T05:30:25Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974373412,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9gqJA",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:30:23Z",
+    "updated_at": "2025-06-14T05:30:23Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974373339,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9gp2w",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:30:22Z",
+    "updated_at": "2025-06-14T05:30:22Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974373229,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9gpbQ",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Mac/557032",
+    "context": "Test: Common - macOS (Common)",
+    "created_at": "2025-06-14T05:30:20Z",
+    "updated_at": "2025-06-14T05:30:20Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974373203,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9gpUw",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestSamplesAndTestProjects/557026",
+    "context": "Test:  Samples and Test Projects (Keyman - iOS)",
+    "created_at": "2025-06-14T05:30:20Z",
+    "updated_at": "2025-06-14T05:30:20Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974373081,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9go2Q",
+    "state": "success",
+    "description": "⚠️ Warning: keymanweb.js is 62 bytes (0%) larger than 19.0.57, now 428,785 bytes",
+    "target_url": null,
+    "context": "check/web/file-size",
+    "created_at": "2025-06-14T05:30:19Z",
+    "updated_at": "2025-06-14T05:30:19Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974369712,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9gbsA",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanAndroid_TestPullRequests/557040",
+    "context": "Test (Keyman - Android)",
+    "created_at": "2025-06-14T05:29:34Z",
+    "updated_at": "2025-06-14T05:29:34Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974369686,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9gblg",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_Linux/557031",
+    "context": "Test: Keyman Core - Linux (Common)",
+    "created_at": "2025-06-14T05:29:33Z",
+    "updated_at": "2025-06-14T05:29:33Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974362550,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9f_tg",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:27:38Z",
+    "updated_at": "2025-06-14T05:27:38Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974361989,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9f9hQ",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Web/557039",
+    "context": "Test: Common - Web (Common)",
+    "created_at": "2025-06-14T05:27:30Z",
+    "updated_at": "2025-06-14T05:27:30Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974361954,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9f9Yg",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Windows/557033",
+    "context": "Test: Common - Windows (Common)",
+    "created_at": "2025-06-14T05:27:29Z",
+    "updated_at": "2025-06-14T05:27:29Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974351989,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fWdQ",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:24:56Z",
+    "updated_at": "2025-06-14T05:24:56Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974351881,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fWCQ",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanLinux_TestPullRequests/557029",
+    "context": "Test (Keyman - Linux)",
+    "created_at": "2025-06-14T05:24:54Z",
+    "updated_at": "2025-06-14T05:24:54Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974351855,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fV7w",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_Linux/557031",
+    "context": "Test: Keyman Core - Linux (Common)",
+    "created_at": "2025-06-14T05:24:54Z",
+    "updated_at": "2025-06-14T05:24:54Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974351007,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fSnw",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:24:41Z",
+    "updated_at": "2025-06-14T05:24:41Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974350924,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fSTA",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_Windows/557038",
+    "context": "Test: Keyman Core - Windows (Common)",
+    "created_at": "2025-06-14T05:24:39Z",
+    "updated_at": "2025-06-14T05:24:39Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974350892,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fSLA",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPrRenderOnScreenKeyboards/557037",
+    "context": "Test: Render On Screen Keyboards (Keyman - Windows)",
+    "created_at": "2025-06-14T05:24:39Z",
+    "updated_at": "2025-06-14T05:24:39Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974350149,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fPRQ",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPullRequests/557036",
+    "context": "Test (Keyman - Windows)",
+    "created_at": "2025-06-14T05:24:27Z",
+    "updated_at": "2025-06-14T05:24:27Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+    "id": 36974348090,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fHOg",
+    "state": "pending",
+    "description": "Ubuntu packaging started",
+    "target_url": "https://github.com/keymanapp/keyman/actions/runs/15648818384",
+    "context": "Ubuntu Packaging",
+    "created_at": "2025-06-14T05:24:00Z",
+    "updated_at": "2025-06-14T05:24:00Z",
+    "creator": {
+      "login": "github-actions[bot]",
+      "id": 41898282,
+      "node_id": "MDM6Qm90NDE4OTgyODI=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+      "html_url": "https://github.com/apps/github-actions",
+      "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347889,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fGcQ",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanLinux_TestPullRequests/557029",
+    "context": "Test (Keyman - Linux)",
+    "created_at": "2025-06-14T05:23:57Z",
+    "updated_at": "2025-06-14T05:23:57Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347861,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fGVQ",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557045",
+    "context": "Test: Common - Linux (Common)",
+    "created_at": "2025-06-14T05:23:56Z",
+    "updated_at": "2025-06-14T05:23:56Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347833,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fGOQ",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557044",
+    "context": "Test - Linux (Keyman - Developer)",
+    "created_at": "2025-06-14T05:23:56Z",
+    "updated_at": "2025-06-14T05:23:56Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347805,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fGHQ",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557043",
+    "context": "Test - macOS (Keyman - Developer)",
+    "created_at": "2025-06-14T05:23:55Z",
+    "updated_at": "2025-06-14T05:23:55Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347765,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fF9Q",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557042",
+    "context": "Test - Windows (Keyman - Developer)",
+    "created_at": "2025-06-14T05:23:55Z",
+    "updated_at": "2025-06-14T05:23:55Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347736,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fF2A",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557041",
+    "context": "Test: Samples and Test projects (Keyman - Android)",
+    "created_at": "2025-06-14T05:23:54Z",
+    "updated_at": "2025-06-14T05:23:54Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347706,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fFug",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557040",
+    "context": "Test (Keyman - Android)",
+    "created_at": "2025-06-14T05:23:54Z",
+    "updated_at": "2025-06-14T05:23:54Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347679,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fFnw",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557039",
+    "context": "Test: Common - Web (Common)",
+    "created_at": "2025-06-14T05:23:54Z",
+    "updated_at": "2025-06-14T05:23:54Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347658,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fFig",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557038",
+    "context": "Test: Keyman Core - Windows (Common)",
+    "created_at": "2025-06-14T05:23:53Z",
+    "updated_at": "2025-06-14T05:23:53Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347638,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fFdg",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557036",
+    "context": "Test (Keyman - Windows)",
+    "created_at": "2025-06-14T05:23:53Z",
+    "updated_at": "2025-06-14T05:23:53Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347608,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fFWA",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPrRenderOnScreenKeyboards/557037",
+    "context": "Test: Render On Screen Keyboards (Keyman - Windows)",
+    "created_at": "2025-06-14T05:23:52Z",
+    "updated_at": "2025-06-14T05:23:52Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347589,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fFRQ",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPrRenderOnScreenKeyboards/557037",
+    "context": "Test: Render On Screen Keyboards (Keyman - Windows)",
+    "created_at": "2025-06-14T05:23:52Z",
+    "updated_at": "2025-06-14T05:23:52Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347556,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fFJA",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557035",
+    "context": "Test: Keyman Core - macOS (Common)",
+    "created_at": "2025-06-14T05:23:52Z",
+    "updated_at": "2025-06-14T05:23:52Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347542,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fFFg",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Windows/557033",
+    "context": "Test: Common - Windows (Common)",
+    "created_at": "2025-06-14T05:23:51Z",
+    "updated_at": "2025-06-14T05:23:51Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347519,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fE_w",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557034",
+    "context": "Test (Keyman - macOS)",
+    "created_at": "2025-06-14T05:23:51Z",
+    "updated_at": "2025-06-14T05:23:51Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347502,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fE7g",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Windows/557033",
+    "context": "Test: Common - Windows (Common)",
+    "created_at": "2025-06-14T05:23:51Z",
+    "updated_at": "2025-06-14T05:23:51Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347461,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fExQ",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557032",
+    "context": "Test: Common - macOS (Common)",
+    "created_at": "2025-06-14T05:23:50Z",
+    "updated_at": "2025-06-14T05:23:50Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347432,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fEqA",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557030",
+    "context": "Test:Integration (Keyman - Linux)",
+    "created_at": "2025-06-14T05:23:49Z",
+    "updated_at": "2025-06-14T05:23:49Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347412,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fElA",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557031",
+    "context": "Test: Keyman Core - Linux (Common)",
+    "created_at": "2025-06-14T05:23:49Z",
+    "updated_at": "2025-06-14T05:23:49Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347397,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fEhQ",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_WASM/557028",
+    "context": "Test: Keyman Core - WASM (Common)",
+    "created_at": "2025-06-14T05:23:49Z",
+    "updated_at": "2025-06-14T05:23:49Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347378,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fEcg",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557029",
+    "context": "Test (Keyman - Linux)",
+    "created_at": "2025-06-14T05:23:48Z",
+    "updated_at": "2025-06-14T05:23:48Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347351,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fEVw",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_WASM/557028",
+    "context": "Test: Keyman Core - WASM (Common)",
+    "created_at": "2025-06-14T05:23:48Z",
+    "updated_at": "2025-06-14T05:23:48Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347323,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fEOw",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keymanweb_TestPullRequests/557027",
+    "context": "Test (Keyman - Web)",
+    "created_at": "2025-06-14T05:23:47Z",
+    "updated_at": "2025-06-14T05:23:47Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347304,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fEKA",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestSamplesAndTestProjects/557026",
+    "context": "Test:  Samples and Test Projects (Keyman - iOS)",
+    "created_at": "2025-06-14T05:23:47Z",
+    "updated_at": "2025-06-14T05:23:47Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347268,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fEBA",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keymanweb_TestPullRequests/557027",
+    "context": "Test (Keyman - Web)",
+    "created_at": "2025-06-14T05:23:46Z",
+    "updated_at": "2025-06-14T05:23:46Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347252,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fD9A",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestSamplesAndTestProjects/557026",
+    "context": "Test:  Samples and Test Projects (Keyman - iOS)",
+    "created_at": "2025-06-14T05:23:46Z",
+    "updated_at": "2025-06-14T05:23:46Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347236,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fD5A",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestPullRequests/557025",
+    "context": "Test (Keyman - iOS)",
+    "created_at": "2025-06-14T05:23:46Z",
+    "updated_at": "2025-06-14T05:23:46Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36974347211,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9fDyw",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestPullRequests/557025",
+    "context": "Test (Keyman - iOS)",
+    "created_at": "2025-06-14T05:23:45Z",
+    "updated_at": "2025-06-14T05:23:45Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/11a558e926370253db37026c95b7ff5a6aa1e8fc",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36974345720,
+    "node_id": "SC_kwDOAY2xT88AAAAIm9e9-A",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-14T05:23:18Z",
+    "updated_at": "2025-06-14T05:23:18Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  }
+]
\ No newline at end of file
diff --git a/resources/build/pr-build-status/fixtures/153683cfb007c6066c9dcf71d25afa4c66efa17f-check-runs.json b/resources/build/pr-build-status/fixtures/153683cfb007c6066c9dcf71d25afa4c66efa17f-check-runs.json
new file mode 100644
index 0000000000..0637a088a0
--- /dev/null
+++ b/resources/build/pr-build-status/fixtures/153683cfb007c6066c9dcf71d25afa4c66efa17f-check-runs.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/resources/build/pr-build-status/fixtures/153683cfb007c6066c9dcf71d25afa4c66efa17f-statuses.json b/resources/build/pr-build-status/fixtures/153683cfb007c6066c9dcf71d25afa4c66efa17f-statuses.json
new file mode 100644
index 0000000000..0637a088a0
--- /dev/null
+++ b/resources/build/pr-build-status/fixtures/153683cfb007c6066c9dcf71d25afa4c66efa17f-statuses.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/resources/build/pr-build-status/fixtures/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1-check-runs.json b/resources/build/pr-build-status/fixtures/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1-check-runs.json
new file mode 100644
index 0000000000..6333cf0c88
--- /dev/null
+++ b/resources/build/pr-build-status/fixtures/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1-check-runs.json
@@ -0,0 +1,246 @@
+[
+  {
+    "id": 44134134750,
+    "name": "triage",
+    "node_id": "CR_kwDOAY2xT88AAAAKRplz3g",
+    "head_sha": "825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "external_id": "aece869f-5587-5930-867f-8649375f3d24",
+    "url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44134134750",
+    "html_url": "https://github.com/keymanapp/keyman/actions/runs/15667765443/job/44134134750",
+    "details_url": "https://github.com/keymanapp/keyman/actions/runs/15667765443/job/44134134750",
+    "status": "completed",
+    "conclusion": "success",
+    "started_at": "2025-06-15T21:54:36Z",
+    "completed_at": "2025-06-15T21:54:41Z",
+    "output": {
+      "title": null,
+      "summary": null,
+      "text": null,
+      "annotations_count": 0,
+      "annotations_url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44134134750/annotations"
+    },
+    "check_suite": {
+      "id": 40159371625
+    },
+    "app": {
+      "id": 15368,
+      "client_id": "Iv1.05c79e9ad1f6bdfa",
+      "slug": "github-actions",
+      "node_id": "MDM6QXBwMTUzNjg=",
+      "owner": {
+        "login": "github",
+        "id": 9919,
+        "node_id": "MDEyOk9yZ2FuaXphdGlvbjk5MTk=",
+        "avatar_url": "https://avatars.githubusercontent.com/u/9919?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github",
+        "html_url": "https://github.com/github",
+        "followers_url": "https://api.github.com/users/github/followers",
+        "following_url": "https://api.github.com/users/github/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github/subscriptions",
+        "organizations_url": "https://api.github.com/users/github/orgs",
+        "repos_url": "https://api.github.com/users/github/repos",
+        "events_url": "https://api.github.com/users/github/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github/received_events",
+        "type": "Organization",
+        "user_view_type": "public",
+        "site_admin": false
+      },
+      "name": "GitHub Actions",
+      "description": "Automate your workflow from idea to production",
+      "external_url": "https://help.github.com/en/actions",
+      "html_url": "https://github.com/apps/github-actions",
+      "created_at": "2018-07-30T09:30:17Z",
+      "updated_at": "2025-03-07T16:35:00Z",
+      "permissions": {
+        "actions": "write",
+        "administration": "read",
+        "attestations": "write",
+        "checks": "write",
+        "contents": "write",
+        "deployments": "write",
+        "discussions": "write",
+        "issues": "write",
+        "merge_queues": "write",
+        "metadata": "read",
+        "models": "read",
+        "packages": "write",
+        "pages": "write",
+        "pull_requests": "write",
+        "repository_hooks": "write",
+        "repository_projects": "write",
+        "security_events": "write",
+        "statuses": "write",
+        "vulnerability_alerts": "read"
+      },
+      "events": [
+        "branch_protection_rule",
+        "check_run",
+        "check_suite",
+        "create",
+        "delete",
+        "deployment",
+        "deployment_status",
+        "discussion",
+        "discussion_comment",
+        "fork",
+        "gollum",
+        "issues",
+        "issue_comment",
+        "label",
+        "merge_group",
+        "milestone",
+        "page_build",
+        "project",
+        "project_card",
+        "project_column",
+        "public",
+        "pull_request",
+        "pull_request_review",
+        "pull_request_review_comment",
+        "push",
+        "registry_package",
+        "release",
+        "repository",
+        "repository_dispatch",
+        "status",
+        "watch",
+        "workflow_dispatch",
+        "workflow_run"
+      ]
+    },
+    "pull_requests": [
+      {
+        "url": "https://api.github.com/repos/keymanapp/keyman/pulls/14196",
+        "id": 2591938321,
+        "number": 14196,
+        "head": {
+          "ref": "maint/developer/support-buildLevel",
+          "sha": "825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        },
+        "base": {
+          "ref": "maint/common/pr-build-bot",
+          "sha": "81c941313bcccd8405364731ce61672588285d5d",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "id": 44134134737,
+    "name": "GitGuardian Security Checks",
+    "node_id": "CR_kwDOAY2xT88AAAAKRplz0Q",
+    "head_sha": "825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "external_id": "",
+    "url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44134134737",
+    "html_url": "https://github.com/keymanapp/keyman/runs/44134134737",
+    "details_url": "https://dashboard.gitguardian.com",
+    "status": "completed",
+    "conclusion": "success",
+    "started_at": "2025-06-15T21:54:32Z",
+    "completed_at": "2025-06-15T21:54:44Z",
+    "output": {
+      "title": "No secrets detected ✅",
+      "summary": "**5** commits were scanned without uncovering any secrets.\n",
+      "text": "Commits scanned: **5**\n\n\n\n-   Pull request #14196: `maint/developer/support-buildLevel` 👉 `maint/common/pr-build-bot`\n    \n\n🦉 [GitGuardian](https://dashboard.gitguardian.com/auth/login/?utm_medium=checkruns&amp;utm_source=github&amp;utm_campaign=cr1) detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.<br/>\n",
+      "annotations_count": 0,
+      "annotations_url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44134134737/annotations"
+    },
+    "check_suite": {
+      "id": 40159371205
+    },
+    "app": {
+      "id": 46505,
+      "client_id": "Iv1.ec3c001966b4cc5a",
+      "slug": "gitguardian",
+      "node_id": "MDM6QXBwNDY1MDU=",
+      "owner": {
+        "login": "GitGuardian",
+        "id": 27360172,
+        "node_id": "MDEyOk9yZ2FuaXphdGlvbjI3MzYwMTcy",
+        "avatar_url": "https://avatars.githubusercontent.com/u/27360172?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/GitGuardian",
+        "html_url": "https://github.com/GitGuardian",
+        "followers_url": "https://api.github.com/users/GitGuardian/followers",
+        "following_url": "https://api.github.com/users/GitGuardian/following{/other_user}",
+        "gists_url": "https://api.github.com/users/GitGuardian/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/GitGuardian/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/GitGuardian/subscriptions",
+        "organizations_url": "https://api.github.com/users/GitGuardian/orgs",
+        "repos_url": "https://api.github.com/users/GitGuardian/repos",
+        "events_url": "https://api.github.com/users/GitGuardian/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/GitGuardian/received_events",
+        "type": "Organization",
+        "user_view_type": "public",
+        "site_admin": false
+      },
+      "name": "GitGuardian",
+      "description": "# 🦉 What is GitGuardian?\r\n\r\nGitGuardian Secrets Detection detects and fixes vulnerabilities in source code at every step of the software development lifecycle, covering 350+ types of secrets like API keys, database connection strings, private keys, certificates, and more. The platform’s policy engine enables security teams to monitor and enforce rules across their VCS, DevOps tools, and infrastructure-as-code configurations. Our automated remediation playbooks and collaboration features bring security and development teams together to resolve incidents fast and in full.\r\n\r\n## 1. Scan your codebase for 350+ types of secrets\r\nGitGuardian scans your GitHub repositories and raises alerts only for critical secrets, such as API keys or other credentials. At scale, GitGuardian’s detection algorithm has been battle-tested on over three years of activity in all public GitHub repositories – totaling over 1 billion scanned commits!\r\n\r\n## 2. Quickly remediate your hard-coded secrets\r\nIf you ever experience a leak involving a credential, we have a complete remediation guide used by 100k+ developers each year. We’ll show you how to revoke the secret and remove it from your git history.\r\n\r\n##  3. Prevent secrets from reaching GitHub\r\nInstall ggshield, the GitGuardian CLI, and add secrets detection to your local development workflow using pre-commit and pre-push git hooks integrations.\r\n\r\n# 🙋‍♂️ FAQ\r\n\r\n**What is your pricing?**\r\nGitGuardian is free for teams under 25 developers and offers a 30-day trial for larger teams.\r\n\r\n**How can I be sure that GitGuardian won’t raise too many false positives?**\r\nWe have scanned billions of commits, sent millions of alerts since 2018, and integrated each feedback to improve our algorithm. Our alerts currently receive 91% “true positive” feedback from developers.\r\n\r\n**My repositories are private; why should I install automated secret detection?**\r\nImagine if there were a plain text file with all your credit card numbers inside, you wouldn’t put this file inside your company’s git repository. Secrets are just as sensitive and should be handled with special care.\r\n\r\n**Is GitGuardian available to be installed on-premise?**\r\nYes, you can contact one of our security specialists to look over the possibility of installing GitGuardian on-premise on your repositories.\r\n\r\n# ⚒️ Installation notes \r\n\r\nYou should install GitGuardian directly through your [GitGuardian](https://dashboard.gitguardian.com/) workspace on the Integration settings page. \r\n\r\nSo that you know, your GitHub organization or GitHub account can only be associated with a single GitGuardian workspace.\r\n\r\n# 👋 Support\r\n\r\nIf you experience any difficulties or have any questions, please reach out to us by email ([support@gitguardian.com](mailto:support@gitguardian.com)).",
+      "external_url": "https://dashboard.gitguardian.com",
+      "html_url": "https://github.com/apps/gitguardian",
+      "created_at": "2019-11-12T15:44:31Z",
+      "updated_at": "2023-07-18T09:06:22Z",
+      "permissions": {
+        "checks": "write",
+        "contents": "read",
+        "emails": "read",
+        "issues": "write",
+        "members": "read",
+        "metadata": "read",
+        "organization_hooks": "write",
+        "pull_requests": "write"
+      },
+      "events": [
+        "check_run",
+        "check_suite",
+        "commit_comment",
+        "create",
+        "delete",
+        "organization",
+        "public",
+        "pull_request",
+        "pull_request_review",
+        "pull_request_review_comment",
+        "push",
+        "repository"
+      ]
+    },
+    "pull_requests": [
+      {
+        "url": "https://api.github.com/repos/keymanapp/keyman/pulls/14196",
+        "id": 2591938321,
+        "number": 14196,
+        "head": {
+          "ref": "maint/developer/support-buildLevel",
+          "sha": "825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        },
+        "base": {
+          "ref": "maint/common/pr-build-bot",
+          "sha": "81c941313bcccd8405364731ce61672588285d5d",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        }
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/resources/build/pr-build-status/fixtures/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1-statuses.json b/resources/build/pr-build-status/fixtures/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1-statuses.json
new file mode 100644
index 0000000000..1f4182dc20
--- /dev/null
+++ b/resources/build/pr-build-status/fixtures/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1-statuses.json
@@ -0,0 +1,2972 @@
+[
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984353753,
+    "node_id": "SC_kwDOAY2xT88AAAAInHBz2Q",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:41:11Z",
+    "updated_at": "2025-06-15T22:41:11Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984353236,
+    "node_id": "SC_kwDOAY2xT88AAAAInHBx1A",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Developer_Test/557231",
+    "context": "Test - Windows (Keyman - Developer)",
+    "created_at": "2025-06-15T22:41:03Z",
+    "updated_at": "2025-06-15T22:41:03Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984254223,
+    "node_id": "SC_kwDOAY2xT88AAAAInG7vDw",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:18:11Z",
+    "updated_at": "2025-06-15T22:18:11Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984254010,
+    "node_id": "SC_kwDOAY2xT88AAAAInG7uOg",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Developer_Mac/557232",
+    "context": "Test - macOS (Keyman - Developer)",
+    "created_at": "2025-06-15T22:18:08Z",
+    "updated_at": "2025-06-15T22:18:08Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984252185,
+    "node_id": "SC_kwDOAY2xT88AAAAInG7nGQ",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:17:41Z",
+    "updated_at": "2025-06-15T22:17:41Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984251922,
+    "node_id": "SC_kwDOAY2xT88AAAAInG7mEg",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestPullRequests/557214",
+    "context": "Test (Keyman - iOS)",
+    "created_at": "2025-06-15T22:17:38Z",
+    "updated_at": "2025-06-15T22:17:38Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984248491,
+    "node_id": "SC_kwDOAY2xT88AAAAInG7Yqw",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:16:51Z",
+    "updated_at": "2025-06-15T22:16:51Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984247979,
+    "node_id": "SC_kwDOAY2xT88AAAAInG7Wqw",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_Windows/557227",
+    "context": "Test: Keyman Core - Windows (Common)",
+    "created_at": "2025-06-15T22:16:44Z",
+    "updated_at": "2025-06-15T22:16:44Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984233127,
+    "node_id": "SC_kwDOAY2xT88AAAAInG6cpw",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:13:17Z",
+    "updated_at": "2025-06-15T22:13:17Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984232856,
+    "node_id": "SC_kwDOAY2xT88AAAAInG6bmA",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_WASM/557217",
+    "context": "Test: Keyman Core - WASM (Common)",
+    "created_at": "2025-06-15T22:13:14Z",
+    "updated_at": "2025-06-15T22:13:14Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984231138,
+    "node_id": "SC_kwDOAY2xT88AAAAInG6U4g",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:12:52Z",
+    "updated_at": "2025-06-15T22:12:52Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984230601,
+    "node_id": "SC_kwDOAY2xT88AAAAInG6SyQ",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Developer_Mac/557232",
+    "context": "Test - macOS (Keyman - Developer)",
+    "created_at": "2025-06-15T22:12:45Z",
+    "updated_at": "2025-06-15T22:12:45Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984230570,
+    "node_id": "SC_kwDOAY2xT88AAAAInG6Sqg",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_macOS/557224",
+    "context": "Test: Keyman Core - macOS (Common)",
+    "created_at": "2025-06-15T22:12:45Z",
+    "updated_at": "2025-06-15T22:12:45Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984220675,
+    "node_id": "SC_kwDOAY2xT88AAAAInG5sAw",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:10:32Z",
+    "updated_at": "2025-06-15T22:10:32Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984220470,
+    "node_id": "SC_kwDOAY2xT88AAAAInG5rNg",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanAndroid_TestSamplesAndTestProjects/557230",
+    "context": "Test: Samples and Test projects (Keyman - Android)",
+    "created_at": "2025-06-15T22:10:29Z",
+    "updated_at": "2025-06-15T22:10:29Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984218600,
+    "node_id": "SC_kwDOAY2xT88AAAAInG5j6A",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:10:08Z",
+    "updated_at": "2025-06-15T22:10:08Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984217727,
+    "node_id": "SC_kwDOAY2xT88AAAAInG5gfw",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Linux_Test_Integration/557219",
+    "context": "Test:Integration (Keyman - Linux)",
+    "created_at": "2025-06-15T22:09:57Z",
+    "updated_at": "2025-06-15T22:09:57Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984211579,
+    "node_id": "SC_kwDOAY2xT88AAAAInG5Iew",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:08:35Z",
+    "updated_at": "2025-06-15T22:08:35Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984211442,
+    "node_id": "SC_kwDOAY2xT88AAAAInG5H8g",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Developer_Linux/557233",
+    "context": "Test - Linux (Keyman - Developer)",
+    "created_at": "2025-06-15T22:08:33Z",
+    "updated_at": "2025-06-15T22:08:33Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984207708,
+    "node_id": "SC_kwDOAY2xT88AAAAInG45XA",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:07:48Z",
+    "updated_at": "2025-06-15T22:07:48Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984207645,
+    "node_id": "SC_kwDOAY2xT88AAAAInG45HQ",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:07:47Z",
+    "updated_at": "2025-06-15T22:07:47Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984207493,
+    "node_id": "SC_kwDOAY2xT88AAAAInG44hQ",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_macOS/557224",
+    "context": "Test: Keyman Core - macOS (Common)",
+    "created_at": "2025-06-15T22:07:46Z",
+    "updated_at": "2025-06-15T22:07:46Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984207460,
+    "node_id": "SC_kwDOAY2xT88AAAAInG44ZA",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_KeymanMac_PullRequests/557223",
+    "context": "Test (Keyman - macOS)",
+    "created_at": "2025-06-15T22:07:46Z",
+    "updated_at": "2025-06-15T22:07:46Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984207050,
+    "node_id": "SC_kwDOAY2xT88AAAAInG42yg",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Linux_Test_Integration/557219",
+    "context": "Test:Integration (Keyman - Linux)",
+    "created_at": "2025-06-15T22:07:42Z",
+    "updated_at": "2025-06-15T22:07:42Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984207015,
+    "node_id": "SC_kwDOAY2xT88AAAAInG42pw",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Linux/557234",
+    "context": "Test: Common - Linux (Common)",
+    "created_at": "2025-06-15T22:07:42Z",
+    "updated_at": "2025-06-15T22:07:42Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984204314,
+    "node_id": "SC_kwDOAY2xT88AAAAInG4sGg",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:07:09Z",
+    "updated_at": "2025-06-15T22:07:09Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984203436,
+    "node_id": "SC_kwDOAY2xT88AAAAInG4orA",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Linux/557234",
+    "context": "Test: Common - Linux (Common)",
+    "created_at": "2025-06-15T22:06:59Z",
+    "updated_at": "2025-06-15T22:06:59Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984203395,
+    "node_id": "SC_kwDOAY2xT88AAAAInG4ogw",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanAndroid_TestPullRequests/557229",
+    "context": "Test (Keyman - Android)",
+    "created_at": "2025-06-15T22:06:59Z",
+    "updated_at": "2025-06-15T22:06:59Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984193091,
+    "node_id": "SC_kwDOAY2xT88AAAAInG4AQw",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanAndroid_TestSamplesAndTestProjects/557230",
+    "context": "Test: Samples and Test projects (Keyman - Android)",
+    "created_at": "2025-06-15T22:04:49Z",
+    "updated_at": "2025-06-15T22:04:49Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984193063,
+    "node_id": "SC_kwDOAY2xT88AAAAInG4AJw",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPrRenderOnScreenKeyboards/557226",
+    "context": "Test: Render On Screen Keyboards (Keyman - Windows)",
+    "created_at": "2025-06-15T22:04:48Z",
+    "updated_at": "2025-06-15T22:04:48Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984191748,
+    "node_id": "SC_kwDOAY2xT88AAAAInG37BA",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:04:32Z",
+    "updated_at": "2025-06-15T22:04:32Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+    "id": 36984191351,
+    "node_id": "SC_kwDOAY2xT88AAAAInG35dw",
+    "state": "success",
+    "description": "API verification succeeded",
+    "target_url": "https://github.com/keymanapp/keyman/actions/runs/15667824216",
+    "context": "API Verification",
+    "created_at": "2025-06-15T22:04:26Z",
+    "updated_at": "2025-06-15T22:04:26Z",
+    "creator": {
+      "login": "github-actions[bot]",
+      "id": 41898282,
+      "node_id": "MDM6Qm90NDE4OTgyODI=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+      "html_url": "https://github.com/apps/github-actions",
+      "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984190410,
+    "node_id": "SC_kwDOAY2xT88AAAAInG31yg",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:04:14Z",
+    "updated_at": "2025-06-15T22:04:14Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984190004,
+    "node_id": "SC_kwDOAY2xT88AAAAInG30NA",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPrRenderOnScreenKeyboards/557226",
+    "context": "Test: Render On Screen Keyboards (Keyman - Windows)",
+    "created_at": "2025-06-15T22:04:09Z",
+    "updated_at": "2025-06-15T22:04:09Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984189970,
+    "node_id": "SC_kwDOAY2xT88AAAAInG30Eg",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPullRequests/557225",
+    "context": "Test (Keyman - Windows)",
+    "created_at": "2025-06-15T22:04:09Z",
+    "updated_at": "2025-06-15T22:04:09Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+    "id": 36984187184,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3pMA",
+    "state": "pending",
+    "description": "API verification started",
+    "target_url": "https://github.com/keymanapp/keyman/actions/runs/15667824216",
+    "context": "API Verification",
+    "created_at": "2025-06-15T22:03:30Z",
+    "updated_at": "2025-06-15T22:03:30Z",
+    "creator": {
+      "login": "github-actions[bot]",
+      "id": 41898282,
+      "node_id": "MDM6Qm90NDE4OTgyODI=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+      "html_url": "https://github.com/apps/github-actions",
+      "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984186913,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3oIQ",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:03:26Z",
+    "updated_at": "2025-06-15T22:03:26Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984186835,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3n0w",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:03:25Z",
+    "updated_at": "2025-06-15T22:03:25Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+    "id": 36984186600,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3m6A",
+    "state": "success",
+    "description": "Package build succeeded",
+    "target_url": "https://github.com/keymanapp/keyman/actions/runs/15667775701",
+    "context": "Ubuntu Packaging",
+    "created_at": "2025-06-15T22:03:21Z",
+    "updated_at": "2025-06-15T22:03:21Z",
+    "creator": {
+      "login": "github-actions[bot]",
+      "id": 41898282,
+      "node_id": "MDM6Qm90NDE4OTgyODI=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+      "html_url": "https://github.com/apps/github-actions",
+      "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984186234,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3leg",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_KeymanMac_PullRequests/557223",
+    "context": "Test (Keyman - macOS)",
+    "created_at": "2025-06-15T22:03:17Z",
+    "updated_at": "2025-06-15T22:03:17Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984186202,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3lWg",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Mac/557221",
+    "context": "Test: Common - macOS (Common)",
+    "created_at": "2025-06-15T22:03:17Z",
+    "updated_at": "2025-06-15T22:03:17Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984185678,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3jTg",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:03:11Z",
+    "updated_at": "2025-06-15T22:03:11Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984184605,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3fHQ",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Developer_Linux/557233",
+    "context": "Test - Linux (Keyman - Developer)",
+    "created_at": "2025-06-15T22:02:56Z",
+    "updated_at": "2025-06-15T22:02:56Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984184566,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3e9g",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keymanweb_TestPullRequests/557216",
+    "context": "Test (Keyman - Web)",
+    "created_at": "2025-06-15T22:02:55Z",
+    "updated_at": "2025-06-15T22:02:55Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984184251,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3duw",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:02:51Z",
+    "updated_at": "2025-06-15T22:02:51Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984184103,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3dJw",
+    "state": "success",
+    "description": "⚠️ Warning: keymanweb.js is 62 bytes (0%) larger than 19.0.57, now 428,785 bytes",
+    "target_url": null,
+    "context": "check/web/file-size",
+    "created_at": "2025-06-15T22:02:49Z",
+    "updated_at": "2025-06-15T22:02:49Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984183056,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3ZEA",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:02:35Z",
+    "updated_at": "2025-06-15T22:02:35Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984182886,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3YZg",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Mac/557221",
+    "context": "Test: Common - macOS (Common)",
+    "created_at": "2025-06-15T22:02:33Z",
+    "updated_at": "2025-06-15T22:02:33Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984182860,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3YTA",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestSamplesAndTestProjects/557215",
+    "context": "Test:  Samples and Test Projects (Keyman - iOS)",
+    "created_at": "2025-06-15T22:02:32Z",
+    "updated_at": "2025-06-15T22:02:32Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984181495,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3S9w",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:02:17Z",
+    "updated_at": "2025-06-15T22:02:17Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984181448,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3SyA",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Developer_Test/557231",
+    "context": "Test - Windows (Keyman - Developer)",
+    "created_at": "2025-06-15T22:02:17Z",
+    "updated_at": "2025-06-15T22:02:17Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984181302,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3SNg",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanAndroid_TestPullRequests/557229",
+    "context": "Test (Keyman - Android)",
+    "created_at": "2025-06-15T22:02:15Z",
+    "updated_at": "2025-06-15T22:02:15Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984181257,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3SCQ",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Web/557228",
+    "context": "Test: Common - Web (Common)",
+    "created_at": "2025-06-15T22:02:15Z",
+    "updated_at": "2025-06-15T22:02:15Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984178388,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3G1A",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Web/557228",
+    "context": "Test: Common - Web (Common)",
+    "created_at": "2025-06-15T22:01:38Z",
+    "updated_at": "2025-06-15T22:01:38Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984178364,
+    "node_id": "SC_kwDOAY2xT88AAAAInG3GvA",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_Linux/557220",
+    "context": "Test: Keyman Core - Linux (Common)",
+    "created_at": "2025-06-15T22:01:38Z",
+    "updated_at": "2025-06-15T22:01:38Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984170092,
+    "node_id": "SC_kwDOAY2xT88AAAAInG2mbA",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T22:00:10Z",
+    "updated_at": "2025-06-15T22:00:10Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984169654,
+    "node_id": "SC_kwDOAY2xT88AAAAInG2ktg",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_Windows/557227",
+    "context": "Test: Keyman Core - Windows (Common)",
+    "created_at": "2025-06-15T22:00:06Z",
+    "updated_at": "2025-06-15T22:00:06Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984169587,
+    "node_id": "SC_kwDOAY2xT88AAAAInG2kcw",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Windows/557222",
+    "context": "Test: Common - Windows (Common)",
+    "created_at": "2025-06-15T22:00:06Z",
+    "updated_at": "2025-06-15T22:00:06Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984159445,
+    "node_id": "SC_kwDOAY2xT88AAAAInG181Q",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_Linux/557220",
+    "context": "Test: Keyman Core - Linux (Common)",
+    "created_at": "2025-06-15T21:57:25Z",
+    "updated_at": "2025-06-15T21:57:25Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984159423,
+    "node_id": "SC_kwDOAY2xT88AAAAInG18vw",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanLinux_TestPullRequests/557218",
+    "context": "Test (Keyman - Linux)",
+    "created_at": "2025-06-15T21:57:25Z",
+    "updated_at": "2025-06-15T21:57:25Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+    "id": 36984156173,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1wDQ",
+    "state": "pending",
+    "description": "Ubuntu packaging started",
+    "target_url": "https://github.com/keymanapp/keyman/actions/runs/15667775701",
+    "context": "Ubuntu Packaging",
+    "created_at": "2025-06-15T21:56:36Z",
+    "updated_at": "2025-06-15T21:56:36Z",
+    "creator": {
+      "login": "github-actions[bot]",
+      "id": 41898282,
+      "node_id": "MDM6Qm90NDE4OTgyODI=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+      "html_url": "https://github.com/apps/github-actions",
+      "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155853,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1uzQ",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanLinux_TestPullRequests/557218",
+    "context": "Test (Keyman - Linux)",
+    "created_at": "2025-06-15T21:56:30Z",
+    "updated_at": "2025-06-15T21:56:30Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155827,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1usw",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557234",
+    "context": "Test: Common - Linux (Common)",
+    "created_at": "2025-06-15T21:56:30Z",
+    "updated_at": "2025-06-15T21:56:30Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155798,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1ulg",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557233",
+    "context": "Test - Linux (Keyman - Developer)",
+    "created_at": "2025-06-15T21:56:29Z",
+    "updated_at": "2025-06-15T21:56:29Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155777,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1ugQ",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557232",
+    "context": "Test - macOS (Keyman - Developer)",
+    "created_at": "2025-06-15T21:56:29Z",
+    "updated_at": "2025-06-15T21:56:29Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155742,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1uXg",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557231",
+    "context": "Test - Windows (Keyman - Developer)",
+    "created_at": "2025-06-15T21:56:28Z",
+    "updated_at": "2025-06-15T21:56:28Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155711,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1uPw",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557230",
+    "context": "Test: Samples and Test projects (Keyman - Android)",
+    "created_at": "2025-06-15T21:56:28Z",
+    "updated_at": "2025-06-15T21:56:28Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155689,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1uKQ",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557229",
+    "context": "Test (Keyman - Android)",
+    "created_at": "2025-06-15T21:56:28Z",
+    "updated_at": "2025-06-15T21:56:28Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155669,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1uFQ",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557228",
+    "context": "Test: Common - Web (Common)",
+    "created_at": "2025-06-15T21:56:27Z",
+    "updated_at": "2025-06-15T21:56:27Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155637,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1t9Q",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557227",
+    "context": "Test: Keyman Core - Windows (Common)",
+    "created_at": "2025-06-15T21:56:27Z",
+    "updated_at": "2025-06-15T21:56:27Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155605,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1t1Q",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557226",
+    "context": "Test: Render On Screen Keyboards (Keyman - Windows)",
+    "created_at": "2025-06-15T21:56:26Z",
+    "updated_at": "2025-06-15T21:56:26Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155570,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1tsg",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPullRequests/557225",
+    "context": "Test (Keyman - Windows)",
+    "created_at": "2025-06-15T21:56:26Z",
+    "updated_at": "2025-06-15T21:56:26Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155549,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1tnQ",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPullRequests/557225",
+    "context": "Test (Keyman - Windows)",
+    "created_at": "2025-06-15T21:56:26Z",
+    "updated_at": "2025-06-15T21:56:26Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155522,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1tgg",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557224",
+    "context": "Test: Keyman Core - macOS (Common)",
+    "created_at": "2025-06-15T21:56:25Z",
+    "updated_at": "2025-06-15T21:56:25Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155500,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1tbA",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Windows/557222",
+    "context": "Test: Common - Windows (Common)",
+    "created_at": "2025-06-15T21:56:25Z",
+    "updated_at": "2025-06-15T21:56:25Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155480,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1tWA",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557223",
+    "context": "Test (Keyman - macOS)",
+    "created_at": "2025-06-15T21:56:24Z",
+    "updated_at": "2025-06-15T21:56:24Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155462,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1tRg",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Windows/557222",
+    "context": "Test: Common - Windows (Common)",
+    "created_at": "2025-06-15T21:56:24Z",
+    "updated_at": "2025-06-15T21:56:24Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155426,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1tIg",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557221",
+    "context": "Test: Common - macOS (Common)",
+    "created_at": "2025-06-15T21:56:23Z",
+    "updated_at": "2025-06-15T21:56:23Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155407,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1tDw",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557220",
+    "context": "Test: Keyman Core - Linux (Common)",
+    "created_at": "2025-06-15T21:56:23Z",
+    "updated_at": "2025-06-15T21:56:23Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155384,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1s-A",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557219",
+    "context": "Test:Integration (Keyman - Linux)",
+    "created_at": "2025-06-15T21:56:23Z",
+    "updated_at": "2025-06-15T21:56:23Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155354,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1s2g",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557218",
+    "context": "Test (Keyman - Linux)",
+    "created_at": "2025-06-15T21:56:22Z",
+    "updated_at": "2025-06-15T21:56:22Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155338,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1syg",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_WASM/557217",
+    "context": "Test: Keyman Core - WASM (Common)",
+    "created_at": "2025-06-15T21:56:22Z",
+    "updated_at": "2025-06-15T21:56:22Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155309,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1srQ",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_WASM/557217",
+    "context": "Test: Keyman Core - WASM (Common)",
+    "created_at": "2025-06-15T21:56:22Z",
+    "updated_at": "2025-06-15T21:56:22Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155280,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1skA",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestSamplesAndTestProjects/557215",
+    "context": "Test:  Samples and Test Projects (Keyman - iOS)",
+    "created_at": "2025-06-15T21:56:21Z",
+    "updated_at": "2025-06-15T21:56:21Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155248,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1scA",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keymanweb_TestPullRequests/557216",
+    "context": "Test (Keyman - Web)",
+    "created_at": "2025-06-15T21:56:21Z",
+    "updated_at": "2025-06-15T21:56:21Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155224,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1sWA",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keymanweb_TestPullRequests/557216",
+    "context": "Test (Keyman - Web)",
+    "created_at": "2025-06-15T21:56:20Z",
+    "updated_at": "2025-06-15T21:56:20Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155205,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1sRQ",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestSamplesAndTestProjects/557215",
+    "context": "Test:  Samples and Test Projects (Keyman - iOS)",
+    "created_at": "2025-06-15T21:56:20Z",
+    "updated_at": "2025-06-15T21:56:20Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155182,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1sLg",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestPullRequests/557214",
+    "context": "Test (Keyman - iOS)",
+    "created_at": "2025-06-15T21:56:19Z",
+    "updated_at": "2025-06-15T21:56:19Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36984155164,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1sHA",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557214",
+    "context": "Test (Keyman - iOS)",
+    "created_at": "2025-06-15T21:56:19Z",
+    "updated_at": "2025-06-15T21:56:19Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36984148130,
+    "node_id": "SC_kwDOAY2xT88AAAAInG1Qog",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T21:54:33Z",
+    "updated_at": "2025-06-15T21:54:33Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  }
+]
\ No newline at end of file
diff --git a/resources/build/pr-build-status/fixtures/870d37f56b489ef5067b4352a06505369d9038e0-check-runs.json b/resources/build/pr-build-status/fixtures/870d37f56b489ef5067b4352a06505369d9038e0-check-runs.json
new file mode 100644
index 0000000000..9b31414480
--- /dev/null
+++ b/resources/build/pr-build-status/fixtures/870d37f56b489ef5067b4352a06505369d9038e0-check-runs.json
@@ -0,0 +1,246 @@
+[
+  {
+    "id": 44131811673,
+    "name": "GitGuardian Security Checks",
+    "node_id": "CR_kwDOAY2xT88AAAAKRnYBWQ",
+    "head_sha": "870d37f56b489ef5067b4352a06505369d9038e0",
+    "external_id": "",
+    "url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44131811673",
+    "html_url": "https://github.com/keymanapp/keyman/runs/44131811673",
+    "details_url": "https://dashboard.gitguardian.com",
+    "status": "completed",
+    "conclusion": "success",
+    "started_at": "2025-06-15T19:40:57Z",
+    "completed_at": "2025-06-15T19:41:28Z",
+    "output": {
+      "title": "No secrets detected ✅",
+      "summary": "**2** commits were scanned without uncovering any secrets.\n",
+      "text": "Commits scanned: **2**\n\n\n\n-   Pull request #14196: `maint/developer/support-buildLevel` 👉 `maint/common/pr-build-bot`\n    \n\n🦉 [GitGuardian](https://dashboard.gitguardian.com/auth/login/?utm_medium=checkruns&amp;utm_source=github&amp;utm_campaign=cr1) detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.<br/>\n",
+      "annotations_count": 0,
+      "annotations_url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44131811673/annotations"
+    },
+    "check_suite": {
+      "id": 40157100674
+    },
+    "app": {
+      "id": 46505,
+      "client_id": "Iv1.ec3c001966b4cc5a",
+      "slug": "gitguardian",
+      "node_id": "MDM6QXBwNDY1MDU=",
+      "owner": {
+        "login": "GitGuardian",
+        "id": 27360172,
+        "node_id": "MDEyOk9yZ2FuaXphdGlvbjI3MzYwMTcy",
+        "avatar_url": "https://avatars.githubusercontent.com/u/27360172?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/GitGuardian",
+        "html_url": "https://github.com/GitGuardian",
+        "followers_url": "https://api.github.com/users/GitGuardian/followers",
+        "following_url": "https://api.github.com/users/GitGuardian/following{/other_user}",
+        "gists_url": "https://api.github.com/users/GitGuardian/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/GitGuardian/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/GitGuardian/subscriptions",
+        "organizations_url": "https://api.github.com/users/GitGuardian/orgs",
+        "repos_url": "https://api.github.com/users/GitGuardian/repos",
+        "events_url": "https://api.github.com/users/GitGuardian/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/GitGuardian/received_events",
+        "type": "Organization",
+        "user_view_type": "public",
+        "site_admin": false
+      },
+      "name": "GitGuardian",
+      "description": "# 🦉 What is GitGuardian?\r\n\r\nGitGuardian Secrets Detection detects and fixes vulnerabilities in source code at every step of the software development lifecycle, covering 350+ types of secrets like API keys, database connection strings, private keys, certificates, and more. The platform’s policy engine enables security teams to monitor and enforce rules across their VCS, DevOps tools, and infrastructure-as-code configurations. Our automated remediation playbooks and collaboration features bring security and development teams together to resolve incidents fast and in full.\r\n\r\n## 1. Scan your codebase for 350+ types of secrets\r\nGitGuardian scans your GitHub repositories and raises alerts only for critical secrets, such as API keys or other credentials. At scale, GitGuardian’s detection algorithm has been battle-tested on over three years of activity in all public GitHub repositories – totaling over 1 billion scanned commits!\r\n\r\n## 2. Quickly remediate your hard-coded secrets\r\nIf you ever experience a leak involving a credential, we have a complete remediation guide used by 100k+ developers each year. We’ll show you how to revoke the secret and remove it from your git history.\r\n\r\n##  3. Prevent secrets from reaching GitHub\r\nInstall ggshield, the GitGuardian CLI, and add secrets detection to your local development workflow using pre-commit and pre-push git hooks integrations.\r\n\r\n# 🙋‍♂️ FAQ\r\n\r\n**What is your pricing?**\r\nGitGuardian is free for teams under 25 developers and offers a 30-day trial for larger teams.\r\n\r\n**How can I be sure that GitGuardian won’t raise too many false positives?**\r\nWe have scanned billions of commits, sent millions of alerts since 2018, and integrated each feedback to improve our algorithm. Our alerts currently receive 91% “true positive” feedback from developers.\r\n\r\n**My repositories are private; why should I install automated secret detection?**\r\nImagine if there were a plain text file with all your credit card numbers inside, you wouldn’t put this file inside your company’s git repository. Secrets are just as sensitive and should be handled with special care.\r\n\r\n**Is GitGuardian available to be installed on-premise?**\r\nYes, you can contact one of our security specialists to look over the possibility of installing GitGuardian on-premise on your repositories.\r\n\r\n# ⚒️ Installation notes \r\n\r\nYou should install GitGuardian directly through your [GitGuardian](https://dashboard.gitguardian.com/) workspace on the Integration settings page. \r\n\r\nSo that you know, your GitHub organization or GitHub account can only be associated with a single GitGuardian workspace.\r\n\r\n# 👋 Support\r\n\r\nIf you experience any difficulties or have any questions, please reach out to us by email ([support@gitguardian.com](mailto:support@gitguardian.com)).",
+      "external_url": "https://dashboard.gitguardian.com",
+      "html_url": "https://github.com/apps/gitguardian",
+      "created_at": "2019-11-12T15:44:31Z",
+      "updated_at": "2023-07-18T09:06:22Z",
+      "permissions": {
+        "checks": "write",
+        "contents": "read",
+        "emails": "read",
+        "issues": "write",
+        "members": "read",
+        "metadata": "read",
+        "organization_hooks": "write",
+        "pull_requests": "write"
+      },
+      "events": [
+        "check_run",
+        "check_suite",
+        "commit_comment",
+        "create",
+        "delete",
+        "organization",
+        "public",
+        "pull_request",
+        "pull_request_review",
+        "pull_request_review_comment",
+        "push",
+        "repository"
+      ]
+    },
+    "pull_requests": [
+      {
+        "url": "https://api.github.com/repos/keymanapp/keyman/pulls/14196",
+        "id": 2591938321,
+        "number": 14196,
+        "head": {
+          "ref": "maint/developer/support-buildLevel",
+          "sha": "825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        },
+        "base": {
+          "ref": "maint/common/pr-build-bot",
+          "sha": "81c941313bcccd8405364731ce61672588285d5d",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "id": 44131810574,
+    "name": "triage",
+    "node_id": "CR_kwDOAY2xT88AAAAKRnX9Dg",
+    "head_sha": "870d37f56b489ef5067b4352a06505369d9038e0",
+    "external_id": "3d143feb-b3d7-59b2-ae1b-fe551167c2b4",
+    "url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44131810574",
+    "html_url": "https://github.com/keymanapp/keyman/actions/runs/15666730139/job/44131810574",
+    "details_url": "https://github.com/keymanapp/keyman/actions/runs/15666730139/job/44131810574",
+    "status": "completed",
+    "conclusion": "success",
+    "started_at": "2025-06-15T19:40:57Z",
+    "completed_at": "2025-06-15T19:41:04Z",
+    "output": {
+      "title": null,
+      "summary": null,
+      "text": null,
+      "annotations_count": 0,
+      "annotations_url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44131810574/annotations"
+    },
+    "check_suite": {
+      "id": 40157101634
+    },
+    "app": {
+      "id": 15368,
+      "client_id": "Iv1.05c79e9ad1f6bdfa",
+      "slug": "github-actions",
+      "node_id": "MDM6QXBwMTUzNjg=",
+      "owner": {
+        "login": "github",
+        "id": 9919,
+        "node_id": "MDEyOk9yZ2FuaXphdGlvbjk5MTk=",
+        "avatar_url": "https://avatars.githubusercontent.com/u/9919?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github",
+        "html_url": "https://github.com/github",
+        "followers_url": "https://api.github.com/users/github/followers",
+        "following_url": "https://api.github.com/users/github/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github/subscriptions",
+        "organizations_url": "https://api.github.com/users/github/orgs",
+        "repos_url": "https://api.github.com/users/github/repos",
+        "events_url": "https://api.github.com/users/github/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github/received_events",
+        "type": "Organization",
+        "user_view_type": "public",
+        "site_admin": false
+      },
+      "name": "GitHub Actions",
+      "description": "Automate your workflow from idea to production",
+      "external_url": "https://help.github.com/en/actions",
+      "html_url": "https://github.com/apps/github-actions",
+      "created_at": "2018-07-30T09:30:17Z",
+      "updated_at": "2025-03-07T16:35:00Z",
+      "permissions": {
+        "actions": "write",
+        "administration": "read",
+        "attestations": "write",
+        "checks": "write",
+        "contents": "write",
+        "deployments": "write",
+        "discussions": "write",
+        "issues": "write",
+        "merge_queues": "write",
+        "metadata": "read",
+        "models": "read",
+        "packages": "write",
+        "pages": "write",
+        "pull_requests": "write",
+        "repository_hooks": "write",
+        "repository_projects": "write",
+        "security_events": "write",
+        "statuses": "write",
+        "vulnerability_alerts": "read"
+      },
+      "events": [
+        "branch_protection_rule",
+        "check_run",
+        "check_suite",
+        "create",
+        "delete",
+        "deployment",
+        "deployment_status",
+        "discussion",
+        "discussion_comment",
+        "fork",
+        "gollum",
+        "issues",
+        "issue_comment",
+        "label",
+        "merge_group",
+        "milestone",
+        "page_build",
+        "project",
+        "project_card",
+        "project_column",
+        "public",
+        "pull_request",
+        "pull_request_review",
+        "pull_request_review_comment",
+        "push",
+        "registry_package",
+        "release",
+        "repository",
+        "repository_dispatch",
+        "status",
+        "watch",
+        "workflow_dispatch",
+        "workflow_run"
+      ]
+    },
+    "pull_requests": [
+      {
+        "url": "https://api.github.com/repos/keymanapp/keyman/pulls/14196",
+        "id": 2591938321,
+        "number": 14196,
+        "head": {
+          "ref": "maint/developer/support-buildLevel",
+          "sha": "825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        },
+        "base": {
+          "ref": "maint/common/pr-build-bot",
+          "sha": "81c941313bcccd8405364731ce61672588285d5d",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        }
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/resources/build/pr-build-status/fixtures/870d37f56b489ef5067b4352a06505369d9038e0-statuses.json b/resources/build/pr-build-status/fixtures/870d37f56b489ef5067b4352a06505369d9038e0-statuses.json
new file mode 100644
index 0000000000..8d1f51ab95
--- /dev/null
+++ b/resources/build/pr-build-status/fixtures/870d37f56b489ef5067b4352a06505369d9038e0-statuses.json
@@ -0,0 +1,2906 @@
+[
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983658542,
+    "node_id": "SC_kwDOAY2xT88AAAAInGXYLg",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Developer_Mac/557139",
+    "context": "Test - macOS (Keyman - Developer)",
+    "created_at": "2025-06-15T20:01:57Z",
+    "updated_at": "2025-06-15T20:01:57Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983632832,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVzwA",
+    "state": "error",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_WASM/557124",
+    "context": "Test: Keyman Core - WASM (Common)",
+    "created_at": "2025-06-15T19:56:39Z",
+    "updated_at": "2025-06-15T19:56:39Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983632813,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVzrQ",
+    "state": "error",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanAndroid_TestPullRequests/557136",
+    "context": "Test (Keyman - Android)",
+    "created_at": "2025-06-15T19:56:39Z",
+    "updated_at": "2025-06-15T19:56:39Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983632795,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVzmw",
+    "state": "error",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_Windows/557134",
+    "context": "Test: Keyman Core - Windows (Common)",
+    "created_at": "2025-06-15T19:56:38Z",
+    "updated_at": "2025-06-15T19:56:38Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983632768,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVzgA",
+    "state": "error",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Developer_Test/557138",
+    "context": "Test - Windows (Keyman - Developer)",
+    "created_at": "2025-06-15T19:56:38Z",
+    "updated_at": "2025-06-15T19:56:38Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983632744,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVzaA",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Developer_Mac/557139",
+    "context": "Test - macOS (Keyman - Developer)",
+    "created_at": "2025-06-15T19:56:38Z",
+    "updated_at": "2025-06-15T19:56:38Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983632727,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVzVw",
+    "state": "error",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_macOS/557131",
+    "context": "Test: Keyman Core - macOS (Common)",
+    "created_at": "2025-06-15T19:56:37Z",
+    "updated_at": "2025-06-15T19:56:37Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983632705,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVzQQ",
+    "state": "error",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestPullRequests/557121",
+    "context": "Test (Keyman - iOS)",
+    "created_at": "2025-06-15T19:56:37Z",
+    "updated_at": "2025-06-15T19:56:37Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983632677,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVzJQ",
+    "state": "error",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_WASM/557124",
+    "context": "Test: Keyman Core - WASM (Common)",
+    "created_at": "2025-06-15T19:56:36Z",
+    "updated_at": "2025-06-15T19:56:36Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983632642,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVzAg",
+    "state": "error",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanAndroid_TestPullRequests/557136",
+    "context": "Test (Keyman - Android)",
+    "created_at": "2025-06-15T19:56:36Z",
+    "updated_at": "2025-06-15T19:56:36Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983632616,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVy6A",
+    "state": "error",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_Windows/557134",
+    "context": "Test: Keyman Core - Windows (Common)",
+    "created_at": "2025-06-15T19:56:36Z",
+    "updated_at": "2025-06-15T19:56:36Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983632594,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVy0g",
+    "state": "error",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestPullRequests/557121",
+    "context": "Test (Keyman - iOS)",
+    "created_at": "2025-06-15T19:56:35Z",
+    "updated_at": "2025-06-15T19:56:35Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983632571,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVyuw",
+    "state": "error",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Developer_Test/557138",
+    "context": "Test - Windows (Keyman - Developer)",
+    "created_at": "2025-06-15T19:56:35Z",
+    "updated_at": "2025-06-15T19:56:35Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983632552,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVyqA",
+    "state": "error",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_macOS/557131",
+    "context": "Test: Keyman Core - macOS (Common)",
+    "created_at": "2025-06-15T19:56:35Z",
+    "updated_at": "2025-06-15T19:56:35Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983628513,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVi4Q",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Linux_Test_Integration/557126",
+    "context": "Test:Integration (Keyman - Linux)",
+    "created_at": "2025-06-15T19:55:34Z",
+    "updated_at": "2025-06-15T19:55:34Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983625834,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVYag",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Developer_Linux/557140",
+    "context": "Test - Linux (Keyman - Developer)",
+    "created_at": "2025-06-15T19:54:56Z",
+    "updated_at": "2025-06-15T19:54:56Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36983624327,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVShw",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T19:54:35Z",
+    "updated_at": "2025-06-15T19:54:35Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983624184,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVR-A",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_macOS/557131",
+    "context": "Test: Keyman Core - macOS (Common)",
+    "created_at": "2025-06-15T19:54:33Z",
+    "updated_at": "2025-06-15T19:54:33Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983624159,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVR3w",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_KeymanMac_PullRequests/557130",
+    "context": "Test (Keyman - macOS)",
+    "created_at": "2025-06-15T19:54:32Z",
+    "updated_at": "2025-06-15T19:54:32Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36983619684,
+    "node_id": "SC_kwDOAY2xT88AAAAInGVAZA",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T19:53:27Z",
+    "updated_at": "2025-06-15T19:53:27Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983619407,
+    "node_id": "SC_kwDOAY2xT88AAAAInGU_Tw",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Linux_Test_Integration/557126",
+    "context": "Test:Integration (Keyman - Linux)",
+    "created_at": "2025-06-15T19:53:22Z",
+    "updated_at": "2025-06-15T19:53:22Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983619369,
+    "node_id": "SC_kwDOAY2xT88AAAAInGU_KQ",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanAndroid_TestSamplesAndTestProjects/557137",
+    "context": "Test: Samples and Test projects (Keyman - Android)",
+    "created_at": "2025-06-15T19:53:22Z",
+    "updated_at": "2025-06-15T19:53:22Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36983616186,
+    "node_id": "SC_kwDOAY2xT88AAAAInGUyug",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T19:52:33Z",
+    "updated_at": "2025-06-15T19:52:33Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+    "id": 36983616063,
+    "node_id": "SC_kwDOAY2xT88AAAAInGUyPw",
+    "state": "success",
+    "description": "API verification succeeded",
+    "target_url": "https://github.com/keymanapp/keyman/actions/runs/15666798530",
+    "context": "API Verification",
+    "created_at": "2025-06-15T19:52:32Z",
+    "updated_at": "2025-06-15T19:52:32Z",
+    "creator": {
+      "login": "github-actions[bot]",
+      "id": 41898282,
+      "node_id": "MDM6Qm90NDE4OTgyODI=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+      "html_url": "https://github.com/apps/github-actions",
+      "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+    "id": 36983610230,
+    "node_id": "SC_kwDOAY2xT88AAAAInGUbdg",
+    "state": "pending",
+    "description": "API verification started",
+    "target_url": "https://github.com/keymanapp/keyman/actions/runs/15666798530",
+    "context": "API Verification",
+    "created_at": "2025-06-15T19:51:16Z",
+    "updated_at": "2025-06-15T19:51:16Z",
+    "creator": {
+      "login": "github-actions[bot]",
+      "id": 41898282,
+      "node_id": "MDM6Qm90NDE4OTgyODI=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+      "html_url": "https://github.com/apps/github-actions",
+      "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+    "id": 36983609435,
+    "node_id": "SC_kwDOAY2xT88AAAAInGUYWw",
+    "state": "success",
+    "description": "Package build succeeded",
+    "target_url": "https://github.com/keymanapp/keyman/actions/runs/15666742710",
+    "context": "Ubuntu Packaging",
+    "created_at": "2025-06-15T19:51:06Z",
+    "updated_at": "2025-06-15T19:51:06Z",
+    "creator": {
+      "login": "github-actions[bot]",
+      "id": 41898282,
+      "node_id": "MDM6Qm90NDE4OTgyODI=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+      "html_url": "https://github.com/apps/github-actions",
+      "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36983605706,
+    "node_id": "SC_kwDOAY2xT88AAAAInGUJyg",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T19:50:11Z",
+    "updated_at": "2025-06-15T19:50:11Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36983605635,
+    "node_id": "SC_kwDOAY2xT88AAAAInGUJgw",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T19:50:10Z",
+    "updated_at": "2025-06-15T19:50:10Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983605090,
+    "node_id": "SC_kwDOAY2xT88AAAAInGUHYg",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanAndroid_TestSamplesAndTestProjects/557137",
+    "context": "Test: Samples and Test projects (Keyman - Android)",
+    "created_at": "2025-06-15T19:50:02Z",
+    "updated_at": "2025-06-15T19:50:02Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983605068,
+    "node_id": "SC_kwDOAY2xT88AAAAInGUHTA",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Linux/557141",
+    "context": "Test: Common - Linux (Common)",
+    "created_at": "2025-06-15T19:50:02Z",
+    "updated_at": "2025-06-15T19:50:02Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983604926,
+    "node_id": "SC_kwDOAY2xT88AAAAInGUGvg",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_KeymanMac_PullRequests/557130",
+    "context": "Test (Keyman - macOS)",
+    "created_at": "2025-06-15T19:49:59Z",
+    "updated_at": "2025-06-15T19:49:59Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983604910,
+    "node_id": "SC_kwDOAY2xT88AAAAInGUGrg",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Mac/557128",
+    "context": "Test: Common - macOS (Common)",
+    "created_at": "2025-06-15T19:49:58Z",
+    "updated_at": "2025-06-15T19:49:58Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36983603034,
+    "node_id": "SC_kwDOAY2xT88AAAAInGT_Wg",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T19:49:30Z",
+    "updated_at": "2025-06-15T19:49:30Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36983602960,
+    "node_id": "SC_kwDOAY2xT88AAAAInGT_EA",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T19:49:29Z",
+    "updated_at": "2025-06-15T19:49:29Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36983602862,
+    "node_id": "SC_kwDOAY2xT88AAAAInGT-rg",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T19:49:28Z",
+    "updated_at": "2025-06-15T19:49:28Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36983602710,
+    "node_id": "SC_kwDOAY2xT88AAAAInGT-Fg",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T19:49:26Z",
+    "updated_at": "2025-06-15T19:49:26Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36983602571,
+    "node_id": "SC_kwDOAY2xT88AAAAInGT9iw",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T19:49:24Z",
+    "updated_at": "2025-06-15T19:49:24Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983602429,
+    "node_id": "SC_kwDOAY2xT88AAAAInGT8_Q",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Linux/557141",
+    "context": "Test: Common - Linux (Common)",
+    "created_at": "2025-06-15T19:49:22Z",
+    "updated_at": "2025-06-15T19:49:22Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983602406,
+    "node_id": "SC_kwDOAY2xT88AAAAInGT85g",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keymanweb_TestPullRequests/557123",
+    "context": "Test (Keyman - Web)",
+    "created_at": "2025-06-15T19:49:22Z",
+    "updated_at": "2025-06-15T19:49:22Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983602349,
+    "node_id": "SC_kwDOAY2xT88AAAAInGT8rQ",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Developer_Linux/557140",
+    "context": "Test - Linux (Keyman - Developer)",
+    "created_at": "2025-06-15T19:49:21Z",
+    "updated_at": "2025-06-15T19:49:21Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983602329,
+    "node_id": "SC_kwDOAY2xT88AAAAInGT8mQ",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_Linux/557127",
+    "context": "Test: Keyman Core - Linux (Common)",
+    "created_at": "2025-06-15T19:49:20Z",
+    "updated_at": "2025-06-15T19:49:20Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983601809,
+    "node_id": "SC_kwDOAY2xT88AAAAInGT6kQ",
+    "state": "success",
+    "description": "⚠️ Warning: keymanweb.js is 62 bytes (0%) larger than 19.0.57, now 428,785 bytes",
+    "target_url": null,
+    "context": "check/web/file-size",
+    "created_at": "2025-06-15T19:49:13Z",
+    "updated_at": "2025-06-15T19:49:13Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983601796,
+    "node_id": "SC_kwDOAY2xT88AAAAInGT6hA",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Developer_Test/557138",
+    "context": "Test - Windows (Keyman - Developer)",
+    "created_at": "2025-06-15T19:49:13Z",
+    "updated_at": "2025-06-15T19:49:13Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983601768,
+    "node_id": "SC_kwDOAY2xT88AAAAInGT6aA",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Web/557135",
+    "context": "Test: Common - Web (Common)",
+    "created_at": "2025-06-15T19:49:13Z",
+    "updated_at": "2025-06-15T19:49:13Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983601746,
+    "node_id": "SC_kwDOAY2xT88AAAAInGT6Ug",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Mac/557128",
+    "context": "Test: Common - macOS (Common)",
+    "created_at": "2025-06-15T19:49:12Z",
+    "updated_at": "2025-06-15T19:49:12Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983601711,
+    "node_id": "SC_kwDOAY2xT88AAAAInGT6Lw",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestSamplesAndTestProjects/557122",
+    "context": "Test:  Samples and Test Projects (Keyman - iOS)",
+    "created_at": "2025-06-15T19:49:12Z",
+    "updated_at": "2025-06-15T19:49:12Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983599703,
+    "node_id": "SC_kwDOAY2xT88AAAAInGTyVw",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanAndroid_TestPullRequests/557136",
+    "context": "Test (Keyman - Android)",
+    "created_at": "2025-06-15T19:48:45Z",
+    "updated_at": "2025-06-15T19:48:45Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983599672,
+    "node_id": "SC_kwDOAY2xT88AAAAInGTyOA",
+    "state": "failure",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPullRequests/557132",
+    "context": "Test (Keyman - Windows)",
+    "created_at": "2025-06-15T19:48:44Z",
+    "updated_at": "2025-06-15T19:48:44Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983599495,
+    "node_id": "SC_kwDOAY2xT88AAAAInGTxhw",
+    "state": "failure",
+    "description": "TeamCity build failed",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPullRequests/557132",
+    "context": "Test (Keyman - Windows)",
+    "created_at": "2025-06-15T19:48:42Z",
+    "updated_at": "2025-06-15T19:48:42Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36983589963,
+    "node_id": "SC_kwDOAY2xT88AAAAInGTMSw",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T19:46:26Z",
+    "updated_at": "2025-06-15T19:46:26Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983589728,
+    "node_id": "SC_kwDOAY2xT88AAAAInGTLYA",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Web/557135",
+    "context": "Test: Common - Web (Common)",
+    "created_at": "2025-06-15T19:46:22Z",
+    "updated_at": "2025-06-15T19:46:22Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983589703,
+    "node_id": "SC_kwDOAY2xT88AAAAInGTLRw",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Windows/557129",
+    "context": "Test: Common - Windows (Common)",
+    "created_at": "2025-06-15T19:46:22Z",
+    "updated_at": "2025-06-15T19:46:22Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36983585767,
+    "node_id": "SC_kwDOAY2xT88AAAAInGS75w",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T19:45:21Z",
+    "updated_at": "2025-06-15T19:45:21Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983585609,
+    "node_id": "SC_kwDOAY2xT88AAAAInGS7SQ",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_Linux/557127",
+    "context": "Test: Keyman Core - Linux (Common)",
+    "created_at": "2025-06-15T19:45:18Z",
+    "updated_at": "2025-06-15T19:45:18Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983585591,
+    "node_id": "SC_kwDOAY2xT88AAAAInGS7Nw",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanLinux_TestPullRequests/557125",
+    "context": "Test (Keyman - Linux)",
+    "created_at": "2025-06-15T19:45:18Z",
+    "updated_at": "2025-06-15T19:45:18Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983582448,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSu8A",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_Windows/557134",
+    "context": "Test: Keyman Core - Windows (Common)",
+    "created_at": "2025-06-15T19:44:31Z",
+    "updated_at": "2025-06-15T19:44:31Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983582422,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSu1g",
+    "state": "success",
+    "description": "TeamCity build finished",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPrRenderOnScreenKeyboards/557133",
+    "context": "Test: Render On Screen Keyboards (Keyman - Windows)",
+    "created_at": "2025-06-15T19:44:30Z",
+    "updated_at": "2025-06-15T19:44:30Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+    "id": 36983576025,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSV2Q",
+    "state": "pending",
+    "description": "Ubuntu packaging started",
+    "target_url": "https://github.com/keymanapp/keyman/actions/runs/15666742710",
+    "context": "Ubuntu Packaging",
+    "created_at": "2025-06-15T19:42:56Z",
+    "updated_at": "2025-06-15T19:42:56Z",
+    "creator": {
+      "login": "github-actions[bot]",
+      "id": 41898282,
+      "node_id": "MDM6Qm90NDE4OTgyODI=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/15368?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/github-actions%5Bbot%5D",
+      "html_url": "https://github.com/apps/github-actions",
+      "followers_url": "https://api.github.com/users/github-actions%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/github-actions%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/github-actions%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/github-actions%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/github-actions%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/github-actions%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/github-actions%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/github-actions%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/github-actions%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575722,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSUqg",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanLinux_TestPullRequests/557125",
+    "context": "Test (Keyman - Linux)",
+    "created_at": "2025-06-15T19:42:51Z",
+    "updated_at": "2025-06-15T19:42:51Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575673,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSUeQ",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557141",
+    "context": "Test: Common - Linux (Common)",
+    "created_at": "2025-06-15T19:42:50Z",
+    "updated_at": "2025-06-15T19:42:50Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575616,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSUQA",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557140",
+    "context": "Test - Linux (Keyman - Developer)",
+    "created_at": "2025-06-15T19:42:49Z",
+    "updated_at": "2025-06-15T19:42:49Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575600,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSUMA",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557139",
+    "context": "Test - macOS (Keyman - Developer)",
+    "created_at": "2025-06-15T19:42:49Z",
+    "updated_at": "2025-06-15T19:42:49Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575548,
+    "node_id": "SC_kwDOAY2xT88AAAAInGST_A",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557138",
+    "context": "Test - Windows (Keyman - Developer)",
+    "created_at": "2025-06-15T19:42:49Z",
+    "updated_at": "2025-06-15T19:42:49Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575518,
+    "node_id": "SC_kwDOAY2xT88AAAAInGST3g",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557137",
+    "context": "Test: Samples and Test projects (Keyman - Android)",
+    "created_at": "2025-06-15T19:42:48Z",
+    "updated_at": "2025-06-15T19:42:48Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575497,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSTyQ",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557136",
+    "context": "Test (Keyman - Android)",
+    "created_at": "2025-06-15T19:42:48Z",
+    "updated_at": "2025-06-15T19:42:48Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575434,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSTig",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557135",
+    "context": "Test: Common - Web (Common)",
+    "created_at": "2025-06-15T19:42:47Z",
+    "updated_at": "2025-06-15T19:42:47Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575393,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSTYQ",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557134",
+    "context": "Test: Keyman Core - Windows (Common)",
+    "created_at": "2025-06-15T19:42:46Z",
+    "updated_at": "2025-06-15T19:42:46Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575369,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSTSQ",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPrRenderOnScreenKeyboards/557133",
+    "context": "Test: Render On Screen Keyboards (Keyman - Windows)",
+    "created_at": "2025-06-15T19:42:46Z",
+    "updated_at": "2025-06-15T19:42:46Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575348,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSTNA",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPrRenderOnScreenKeyboards/557133",
+    "context": "Test: Render On Screen Keyboards (Keyman - Windows)",
+    "created_at": "2025-06-15T19:42:46Z",
+    "updated_at": "2025-06-15T19:42:46Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575293,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSS_Q",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPullRequests/557132",
+    "context": "Test (Keyman - Windows)",
+    "created_at": "2025-06-15T19:42:45Z",
+    "updated_at": "2025-06-15T19:42:45Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575270,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSS5g",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/KeymanDesktop_TestPullRequests/557132",
+    "context": "Test (Keyman - Windows)",
+    "created_at": "2025-06-15T19:42:45Z",
+    "updated_at": "2025-06-15T19:42:45Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575236,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSSxA",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557131",
+    "context": "Test: Keyman Core - macOS (Common)",
+    "created_at": "2025-06-15T19:42:44Z",
+    "updated_at": "2025-06-15T19:42:44Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575200,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSSoA",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557130",
+    "context": "Test (Keyman - macOS)",
+    "created_at": "2025-06-15T19:42:44Z",
+    "updated_at": "2025-06-15T19:42:44Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575170,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSSgg",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Windows/557129",
+    "context": "Test: Common - Windows (Common)",
+    "created_at": "2025-06-15T19:42:44Z",
+    "updated_at": "2025-06-15T19:42:44Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575149,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSSbQ",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Test_Common_Windows/557129",
+    "context": "Test: Common - Windows (Common)",
+    "created_at": "2025-06-15T19:42:43Z",
+    "updated_at": "2025-06-15T19:42:43Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575110,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSSRg",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557128",
+    "context": "Test: Common - macOS (Common)",
+    "created_at": "2025-06-15T19:42:43Z",
+    "updated_at": "2025-06-15T19:42:43Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575083,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSSKw",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557127",
+    "context": "Test: Keyman Core - Linux (Common)",
+    "created_at": "2025-06-15T19:42:42Z",
+    "updated_at": "2025-06-15T19:42:42Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575057,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSSEQ",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557126",
+    "context": "Test:Integration (Keyman - Linux)",
+    "created_at": "2025-06-15T19:42:42Z",
+    "updated_at": "2025-06-15T19:42:42Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575027,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSR8w",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/build/557125",
+    "context": "Test (Keyman - Linux)",
+    "created_at": "2025-06-15T19:42:41Z",
+    "updated_at": "2025-06-15T19:42:41Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983575008,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSR4A",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_WASM/557124",
+    "context": "Test: Keyman Core - WASM (Common)",
+    "created_at": "2025-06-15T19:42:41Z",
+    "updated_at": "2025-06-15T19:42:41Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983574980,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSRxA",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_Common_KPAPI_TestPullRequests_WASM/557124",
+    "context": "Test: Keyman Core - WASM (Common)",
+    "created_at": "2025-06-15T19:42:41Z",
+    "updated_at": "2025-06-15T19:42:41Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983574948,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSRpA",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keymanweb_TestPullRequests/557123",
+    "context": "Test (Keyman - Web)",
+    "created_at": "2025-06-15T19:42:40Z",
+    "updated_at": "2025-06-15T19:42:40Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983574923,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSRiw",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keymanweb_TestPullRequests/557123",
+    "context": "Test (Keyman - Web)",
+    "created_at": "2025-06-15T19:42:40Z",
+    "updated_at": "2025-06-15T19:42:40Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983574902,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSRdg",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestSamplesAndTestProjects/557122",
+    "context": "Test:  Samples and Test Projects (Keyman - iOS)",
+    "created_at": "2025-06-15T19:42:39Z",
+    "updated_at": "2025-06-15T19:42:39Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983574872,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSRWA",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestSamplesAndTestProjects/557122",
+    "context": "Test:  Samples and Test Projects (Keyman - iOS)",
+    "created_at": "2025-06-15T19:42:39Z",
+    "updated_at": "2025-06-15T19:42:39Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983574841,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSROQ",
+    "state": "pending",
+    "description": "TeamCity build started",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestPullRequests/557121",
+    "context": "Test (Keyman - iOS)",
+    "created_at": "2025-06-15T19:42:39Z",
+    "updated_at": "2025-06-15T19:42:39Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+    "id": 36983574807,
+    "node_id": "SC_kwDOAY2xT88AAAAInGSRFw",
+    "state": "pending",
+    "description": "TeamCity build was queued",
+    "target_url": "https://build.palaso.org/buildConfiguration/Keyman_iOS_TestPullRequests/557121",
+    "context": "Test (Keyman - iOS)",
+    "created_at": "2025-06-15T19:42:38Z",
+    "updated_at": "2025-06-15T19:42:38Z",
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  },
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/870d37f56b489ef5067b4352a06505369d9038e0",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 36983566808,
+    "node_id": "SC_kwDOAY2xT88AAAAInGRx2A",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14196#issuecomment-2972280376",
+    "context": "user_testing",
+    "created_at": "2025-06-15T19:40:53Z",
+    "updated_at": "2025-06-15T19:40:53Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  }
+]
\ No newline at end of file
diff --git a/resources/build/pr-build-status/fixtures/8fd5ccc9026b85d6a780d8bcf862380e7a89aefb-check-runs.json b/resources/build/pr-build-status/fixtures/8fd5ccc9026b85d6a780d8bcf862380e7a89aefb-check-runs.json
new file mode 100644
index 0000000000..c7a120e18f
--- /dev/null
+++ b/resources/build/pr-build-status/fixtures/8fd5ccc9026b85d6a780d8bcf862380e7a89aefb-check-runs.json
@@ -0,0 +1,246 @@
+[
+  {
+    "id": 44207248981,
+    "name": "triage",
+    "node_id": "CR_kwDOAY2xT88AAAAKSvUWVQ",
+    "head_sha": "8fd5ccc9026b85d6a780d8bcf862380e7a89aefb",
+    "external_id": "08ccda57-e306-5823-a607-291b5482a6f2",
+    "url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44207248981",
+    "html_url": "https://github.com/keymanapp/keyman/actions/runs/15691412642/job/44207248981",
+    "details_url": "https://github.com/keymanapp/keyman/actions/runs/15691412642/job/44207248981",
+    "status": "completed",
+    "conclusion": "success",
+    "started_at": "2025-06-16T20:38:08Z",
+    "completed_at": "2025-06-16T20:38:12Z",
+    "output": {
+      "title": null,
+      "summary": null,
+      "text": null,
+      "annotations_count": 0,
+      "annotations_url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44207248981/annotations"
+    },
+    "check_suite": {
+      "id": 40219154773
+    },
+    "app": {
+      "id": 15368,
+      "client_id": "Iv1.05c79e9ad1f6bdfa",
+      "slug": "github-actions",
+      "node_id": "MDM6QXBwMTUzNjg=",
+      "owner": {
+        "login": "github",
+        "id": 9919,
+        "node_id": "MDEyOk9yZ2FuaXphdGlvbjk5MTk=",
+        "avatar_url": "https://avatars.githubusercontent.com/u/9919?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/github",
+        "html_url": "https://github.com/github",
+        "followers_url": "https://api.github.com/users/github/followers",
+        "following_url": "https://api.github.com/users/github/following{/other_user}",
+        "gists_url": "https://api.github.com/users/github/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/github/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/github/subscriptions",
+        "organizations_url": "https://api.github.com/users/github/orgs",
+        "repos_url": "https://api.github.com/users/github/repos",
+        "events_url": "https://api.github.com/users/github/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/github/received_events",
+        "type": "Organization",
+        "user_view_type": "public",
+        "site_admin": false
+      },
+      "name": "GitHub Actions",
+      "description": "Automate your workflow from idea to production",
+      "external_url": "https://help.github.com/en/actions",
+      "html_url": "https://github.com/apps/github-actions",
+      "created_at": "2018-07-30T09:30:17Z",
+      "updated_at": "2025-03-07T16:35:00Z",
+      "permissions": {
+        "actions": "write",
+        "administration": "read",
+        "attestations": "write",
+        "checks": "write",
+        "contents": "write",
+        "deployments": "write",
+        "discussions": "write",
+        "issues": "write",
+        "merge_queues": "write",
+        "metadata": "read",
+        "models": "read",
+        "packages": "write",
+        "pages": "write",
+        "pull_requests": "write",
+        "repository_hooks": "write",
+        "repository_projects": "write",
+        "security_events": "write",
+        "statuses": "write",
+        "vulnerability_alerts": "read"
+      },
+      "events": [
+        "branch_protection_rule",
+        "check_run",
+        "check_suite",
+        "create",
+        "delete",
+        "deployment",
+        "deployment_status",
+        "discussion",
+        "discussion_comment",
+        "fork",
+        "gollum",
+        "issues",
+        "issue_comment",
+        "label",
+        "merge_group",
+        "milestone",
+        "page_build",
+        "project",
+        "project_card",
+        "project_column",
+        "public",
+        "pull_request",
+        "pull_request_review",
+        "pull_request_review_comment",
+        "push",
+        "registry_package",
+        "release",
+        "repository",
+        "repository_dispatch",
+        "status",
+        "watch",
+        "workflow_dispatch",
+        "workflow_run"
+      ]
+    },
+    "pull_requests": [
+      {
+        "url": "https://api.github.com/repos/keymanapp/keyman/pulls/14199",
+        "id": 2594414200,
+        "number": 14199,
+        "head": {
+          "ref": "maint/resources/14172-pr-build-status-2",
+          "sha": "c0d28233302cbc22c7d7625dfba5930006ad7d0b",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        },
+        "base": {
+          "ref": "maint/developer/support-buildLevel",
+          "sha": "825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        }
+      }
+    ]
+  },
+  {
+    "id": 44207248005,
+    "name": "GitGuardian Security Checks",
+    "node_id": "CR_kwDOAY2xT88AAAAKSvUShQ",
+    "head_sha": "8fd5ccc9026b85d6a780d8bcf862380e7a89aefb",
+    "external_id": "",
+    "url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44207248005",
+    "html_url": "https://github.com/keymanapp/keyman/runs/44207248005",
+    "details_url": "https://dashboard.gitguardian.com",
+    "status": "completed",
+    "conclusion": "success",
+    "started_at": "2025-06-16T20:38:03Z",
+    "completed_at": "2025-06-16T20:38:06Z",
+    "output": {
+      "title": "No secrets detected ✅",
+      "summary": "**8** commits were scanned without uncovering any secrets.\n",
+      "text": "Commits scanned: **8**\n\n\n\n-   Pull request #14199: `maint/resources/14172-pr-build-status-2` 👉 `maint/developer/support-buildLevel`\n    \n\n🦉 [GitGuardian](https://dashboard.gitguardian.com/auth/login/?utm_medium=checkruns&amp;utm_source=github&amp;utm_campaign=cr1) detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.<br/>\n",
+      "annotations_count": 0,
+      "annotations_url": "https://api.github.com/repos/keymanapp/keyman/check-runs/44207248005/annotations"
+    },
+    "check_suite": {
+      "id": 40219152500
+    },
+    "app": {
+      "id": 46505,
+      "client_id": "Iv1.ec3c001966b4cc5a",
+      "slug": "gitguardian",
+      "node_id": "MDM6QXBwNDY1MDU=",
+      "owner": {
+        "login": "GitGuardian",
+        "id": 27360172,
+        "node_id": "MDEyOk9yZ2FuaXphdGlvbjI3MzYwMTcy",
+        "avatar_url": "https://avatars.githubusercontent.com/u/27360172?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/GitGuardian",
+        "html_url": "https://github.com/GitGuardian",
+        "followers_url": "https://api.github.com/users/GitGuardian/followers",
+        "following_url": "https://api.github.com/users/GitGuardian/following{/other_user}",
+        "gists_url": "https://api.github.com/users/GitGuardian/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/GitGuardian/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/GitGuardian/subscriptions",
+        "organizations_url": "https://api.github.com/users/GitGuardian/orgs",
+        "repos_url": "https://api.github.com/users/GitGuardian/repos",
+        "events_url": "https://api.github.com/users/GitGuardian/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/GitGuardian/received_events",
+        "type": "Organization",
+        "user_view_type": "public",
+        "site_admin": false
+      },
+      "name": "GitGuardian",
+      "description": "# 🦉 What is GitGuardian?\r\n\r\nGitGuardian Secrets Detection detects and fixes vulnerabilities in source code at every step of the software development lifecycle, covering 350+ types of secrets like API keys, database connection strings, private keys, certificates, and more. The platform’s policy engine enables security teams to monitor and enforce rules across their VCS, DevOps tools, and infrastructure-as-code configurations. Our automated remediation playbooks and collaboration features bring security and development teams together to resolve incidents fast and in full.\r\n\r\n## 1. Scan your codebase for 350+ types of secrets\r\nGitGuardian scans your GitHub repositories and raises alerts only for critical secrets, such as API keys or other credentials. At scale, GitGuardian’s detection algorithm has been battle-tested on over three years of activity in all public GitHub repositories – totaling over 1 billion scanned commits!\r\n\r\n## 2. Quickly remediate your hard-coded secrets\r\nIf you ever experience a leak involving a credential, we have a complete remediation guide used by 100k+ developers each year. We’ll show you how to revoke the secret and remove it from your git history.\r\n\r\n##  3. Prevent secrets from reaching GitHub\r\nInstall ggshield, the GitGuardian CLI, and add secrets detection to your local development workflow using pre-commit and pre-push git hooks integrations.\r\n\r\n# 🙋‍♂️ FAQ\r\n\r\n**What is your pricing?**\r\nGitGuardian is free for teams under 25 developers and offers a 30-day trial for larger teams.\r\n\r\n**How can I be sure that GitGuardian won’t raise too many false positives?**\r\nWe have scanned billions of commits, sent millions of alerts since 2018, and integrated each feedback to improve our algorithm. Our alerts currently receive 91% “true positive” feedback from developers.\r\n\r\n**My repositories are private; why should I install automated secret detection?**\r\nImagine if there were a plain text file with all your credit card numbers inside, you wouldn’t put this file inside your company’s git repository. Secrets are just as sensitive and should be handled with special care.\r\n\r\n**Is GitGuardian available to be installed on-premise?**\r\nYes, you can contact one of our security specialists to look over the possibility of installing GitGuardian on-premise on your repositories.\r\n\r\n# ⚒️ Installation notes \r\n\r\nYou should install GitGuardian directly through your [GitGuardian](https://dashboard.gitguardian.com/) workspace on the Integration settings page. \r\n\r\nSo that you know, your GitHub organization or GitHub account can only be associated with a single GitGuardian workspace.\r\n\r\n# 👋 Support\r\n\r\nIf you experience any difficulties or have any questions, please reach out to us by email ([support@gitguardian.com](mailto:support@gitguardian.com)).",
+      "external_url": "https://dashboard.gitguardian.com",
+      "html_url": "https://github.com/apps/gitguardian",
+      "created_at": "2019-11-12T15:44:31Z",
+      "updated_at": "2023-07-18T09:06:22Z",
+      "permissions": {
+        "checks": "write",
+        "contents": "read",
+        "emails": "read",
+        "issues": "write",
+        "members": "read",
+        "metadata": "read",
+        "organization_hooks": "write",
+        "pull_requests": "write"
+      },
+      "events": [
+        "check_run",
+        "check_suite",
+        "commit_comment",
+        "create",
+        "delete",
+        "organization",
+        "public",
+        "pull_request",
+        "pull_request_review",
+        "pull_request_review_comment",
+        "push",
+        "repository"
+      ]
+    },
+    "pull_requests": [
+      {
+        "url": "https://api.github.com/repos/keymanapp/keyman/pulls/14199",
+        "id": 2594414200,
+        "number": 14199,
+        "head": {
+          "ref": "maint/resources/14172-pr-build-status-2",
+          "sha": "c0d28233302cbc22c7d7625dfba5930006ad7d0b",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        },
+        "base": {
+          "ref": "maint/developer/support-buildLevel",
+          "sha": "825f7d2df0069fa56a8f2a534b42a49ee1f21ca1",
+          "repo": {
+            "id": 26063183,
+            "url": "https://api.github.com/repos/keymanapp/keyman",
+            "name": "keyman"
+          }
+        }
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/resources/build/pr-build-status/fixtures/8fd5ccc9026b85d6a780d8bcf862380e7a89aefb-statuses.json b/resources/build/pr-build-status/fixtures/8fd5ccc9026b85d6a780d8bcf862380e7a89aefb-statuses.json
new file mode 100644
index 0000000000..1d1798bdd3
--- /dev/null
+++ b/resources/build/pr-build-status/fixtures/8fd5ccc9026b85d6a780d8bcf862380e7a89aefb-statuses.json
@@ -0,0 +1,35 @@
+[
+  {
+    "url": "https://api.github.com/repos/keymanapp/keyman/statuses/8fd5ccc9026b85d6a780d8bcf862380e7a89aefb",
+    "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+    "id": 37011551277,
+    "node_id": "SC_kwDOAY2xT88AAAAIng90LQ",
+    "state": "success",
+    "description": "User tests are not required",
+    "target_url": "https://github.com/keymanapp/keyman/pull/14199#issuecomment-2975084272",
+    "context": "user_testing",
+    "created_at": "2025-06-16T20:38:04Z",
+    "updated_at": "2025-06-16T20:38:04Z",
+    "creator": {
+      "login": "keymanapp-test-bot[bot]",
+      "id": 89363325,
+      "node_id": "MDM6Qm90ODkzNjMzMjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/in/133554?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D",
+      "html_url": "https://github.com/apps/keymanapp-test-bot",
+      "followers_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/followers",
+      "following_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/repos",
+      "events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp-test-bot%5Bbot%5D/received_events",
+      "type": "Bot",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  }
+]
\ No newline at end of file
diff --git a/resources/build/pr-build-status/package-lock.json b/resources/build/pr-build-status/package-lock.json
new file mode 100644
index 0000000000..ff65ee2506
--- /dev/null
+++ b/resources/build/pr-build-status/package-lock.json
@@ -0,0 +1,1528 @@
+{
+  "name": "@keymanapp/pr-build-status",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@keymanapp/pr-build-status",
+      "license": "MIT",
+      "dependencies": {
+        "@actions/core": "^1.9.1",
+        "@actions/github": "^6.0.1"
+      },
+      "devDependencies": {
+        "chai": "^5.1.0",
+        "mocha": "^11.2.2",
+        "mocha-teamcity-reporter": "^4.0.0"
+      }
+    },
+    "node_modules/@actions/core": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz",
+      "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==",
+      "license": "MIT",
+      "dependencies": {
+        "@actions/exec": "^1.1.1",
+        "@actions/http-client": "^2.0.1"
+      }
+    },
+    "node_modules/@actions/exec": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.1.1.tgz",
+      "integrity": "sha512-+sCcHHbVdk93a0XT19ECtO/gIXoxvdsgQLzb2fE2/5sIZmWQuluYyjPQtrtTHdU1YzTZ7bAPN4sITq2xi1679w==",
+      "license": "MIT",
+      "dependencies": {
+        "@actions/io": "^1.0.1"
+      }
+    },
+    "node_modules/@actions/github": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@actions/github/-/github-6.0.1.tgz",
+      "integrity": "sha512-xbZVcaqD4XnQAe35qSQqskb3SqIAfRyLBrHMd/8TuL7hJSz2QtbDwnNM8zWx4zO5l2fnGtseNE3MbEvD7BxVMw==",
+      "license": "MIT",
+      "dependencies": {
+        "@actions/http-client": "^2.2.0",
+        "@octokit/core": "^5.0.1",
+        "@octokit/plugin-paginate-rest": "^9.2.2",
+        "@octokit/plugin-rest-endpoint-methods": "^10.4.0",
+        "@octokit/request": "^8.4.1",
+        "@octokit/request-error": "^5.1.1",
+        "undici": "^5.28.5"
+      }
+    },
+    "node_modules/@actions/http-client": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.3.tgz",
+      "integrity": "sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA==",
+      "license": "MIT",
+      "dependencies": {
+        "tunnel": "^0.0.6",
+        "undici": "^5.25.4"
+      }
+    },
+    "node_modules/@actions/io": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz",
+      "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==",
+      "license": "MIT"
+    },
+    "node_modules/@fastify/busboy": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz",
+      "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@octokit/auth-token": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
+      "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/core": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.1.tgz",
+      "integrity": "sha512-dKYCMuPO1bmrpuogcjQ8z7ICCH3FP6WmxpwC03yjzGfZhj9fTJg6+bS1+UAplekbN2C+M61UNllGOOoAfGCrdQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/auth-token": "^4.0.0",
+        "@octokit/graphql": "^7.1.0",
+        "@octokit/request": "^8.4.1",
+        "@octokit/request-error": "^5.1.1",
+        "@octokit/types": "^13.0.0",
+        "before-after-hook": "^2.2.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/endpoint": {
+      "version": "9.0.6",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.6.tgz",
+      "integrity": "sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^13.1.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/graphql": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.1.tgz",
+      "integrity": "sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/request": "^8.4.1",
+        "@octokit/types": "^13.0.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/openapi-types": {
+      "version": "24.2.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
+      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
+      "license": "MIT"
+    },
+    "node_modules/@octokit/plugin-paginate-rest": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-9.2.2.tgz",
+      "integrity": "sha512-u3KYkGF7GcZnSD/3UP0S7K5XUFT2FkOQdcfXZGZQPGv3lm4F2Xbf71lvjldr8c1H3nNbF+33cLEkWYbokGWqiQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^12.6.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": "5"
+      }
+    },
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
+      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
+      "license": "MIT"
+    },
+    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
+      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^20.0.0"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods": {
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-10.4.1.tgz",
+      "integrity": "sha512-xV1b+ceKV9KytQe3zCVqjg+8GTGfDYwaT1ATU5isiUyVtlVAO3HNdzpS4sr4GBx4hxQ46s7ITtZrAsxG22+rVg==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^12.6.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "@octokit/core": "5"
+      }
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
+      "version": "20.0.0",
+      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-20.0.0.tgz",
+      "integrity": "sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==",
+      "license": "MIT"
+    },
+    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-12.6.0.tgz",
+      "integrity": "sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^20.0.0"
+      }
+    },
+    "node_modules/@octokit/request": {
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.1.tgz",
+      "integrity": "sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/endpoint": "^9.0.6",
+        "@octokit/request-error": "^5.1.1",
+        "@octokit/types": "^13.1.0",
+        "universal-user-agent": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/request-error": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.1.tgz",
+      "integrity": "sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/types": "^13.1.0",
+        "deprecation": "^2.0.0",
+        "once": "^1.4.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/@octokit/types": {
+      "version": "13.10.0",
+      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
+      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
+      "license": "MIT",
+      "dependencies": {
+        "@octokit/openapi-types": "^24.2.0"
+      }
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/assertion-error": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/before-after-hook": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
+      "integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
+      "license": "Apache-2.0"
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/chai": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz",
+      "integrity": "sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "assertion-error": "^2.0.1",
+        "check-error": "^2.1.1",
+        "deep-eql": "^5.0.1",
+        "loupe": "^3.1.0",
+        "pathval": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/chalk/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/check-error": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
+      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 16"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/cliui/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cliui/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cliui/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
+      "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/deep-eql": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
+      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/deprecation": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
+      "integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
+      "license": "ISC"
+    },
+    "node_modules/diff": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz",
+      "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/flat": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
+      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "bin": {
+        "flat": "cli.js"
+      }
+    },
+    "node_modules/foreground-child": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "cross-spawn": "^7.0.6",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "he": "bin/he"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/js-yaml": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/loupe": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.4.tgz",
+      "integrity": "sha512-wJzkKwJrheKtknCOKNEtDK4iqg/MxmZheEMtSTYvnzRdEYaZzmgH976nenp8WdJRdx5Vc1X/9MO0Oszl6ezeXg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/mocha": {
+      "version": "11.6.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.6.0.tgz",
+      "integrity": "sha512-i0JVb+OUBqw63X/1pC3jCyJsqYisgxySBbsQa8TKvefpA1oEnw7JXxXnftfMHRsw7bEEVGRtVlHcDYXBa7FzVw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browser-stdout": "^1.3.1",
+        "chokidar": "^4.0.1",
+        "debug": "^4.3.5",
+        "diff": "^7.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "find-up": "^5.0.0",
+        "glob": "^10.4.5",
+        "he": "^1.2.0",
+        "js-yaml": "^4.1.0",
+        "log-symbols": "^4.1.0",
+        "minimatch": "^9.0.5",
+        "ms": "^2.1.3",
+        "picocolors": "^1.1.1",
+        "serialize-javascript": "^6.0.2",
+        "strip-json-comments": "^3.1.1",
+        "supports-color": "^8.1.1",
+        "workerpool": "^9.2.0",
+        "yargs": "^17.7.2",
+        "yargs-parser": "^21.1.1",
+        "yargs-unparser": "^2.0.0"
+      },
+      "bin": {
+        "_mocha": "bin/_mocha",
+        "mocha": "bin/mocha.js"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/mocha-teamcity-reporter": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/mocha-teamcity-reporter/-/mocha-teamcity-reporter-4.2.0.tgz",
+      "integrity": "sha512-H08IvAIsiCcdXAEObzp/VvJHFfLummxt5wpr0gU4yxx6pTb7ZmKnVjyXkFi+3gYi3bu/j2iJdoK9Aknz16mbBg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "mocha": ">=6"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "license": "ISC",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0"
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/pathval": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
+      "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.16"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.18.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/serialize-javascript": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "randombytes": "^2.1.0"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
+      }
+    },
+    "node_modules/undici": {
+      "version": "5.29.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz",
+      "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==",
+      "license": "MIT",
+      "dependencies": {
+        "@fastify/busboy": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.0"
+      }
+    },
+    "node_modules/universal-user-agent": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
+      "integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
+      "license": "ISC"
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/workerpool": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.2.tgz",
+      "integrity": "sha512-Xz4Nm9c+LiBHhDR5bDLnNzmj6+5F+cyEAWPMkbs2awq/dYazR/efelZzUAjB/y3kNHL+uzkHvxVVpaOfGCPV7A==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "license": "ISC"
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-unparser": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
+      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "camelcase": "^6.0.0",
+        "decamelize": "^4.0.0",
+        "flat": "^5.0.2",
+        "is-plain-obj": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/yargs/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    }
+  }
+}
diff --git a/resources/build/pr-build-status/package.json b/resources/build/pr-build-status/package.json
new file mode 100644
index 0000000000..5e9dc1bc70
--- /dev/null
+++ b/resources/build/pr-build-status/package.json
@@ -0,0 +1,20 @@
+{
+  "description": "CHeck pull request build status - development area",
+  "type": "module",
+  "dependencies": {
+    "@actions/core": "^1.9.1",
+    "@actions/github": "^6.0.1"
+  },
+  "devDependencies": {
+    "mocha": "^11.2.2",
+    "mocha-teamcity-reporter": "^4.0.0",
+    "chai": "^5.1.0"
+  },
+  "license": "MIT",
+  "main": "pr-build-status.mjs",
+  "name": "@keymanapp/pr-build-status",
+  "private": true,
+  "scripts": {
+    "test": "mocha pr-build-status.tests.mjs"
+  }
+}
diff --git a/resources/build/pr-build-status/pr-build-status.mjs b/resources/build/pr-build-status/pr-build-status.mjs
new file mode 100644
index 0000000000..091377d942
--- /dev/null
+++ b/resources/build/pr-build-status/pr-build-status.mjs
@@ -0,0 +1,190 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ *
+ * Source script of pr-build-status.yml file for unit testing and development.
+ * The indented section of this file below is copied verbatim into
+ * .github/workflows/pr-build-status.yml by `build.sh build`, and allows us to
+ * develop the YAML script without introducing a dependency on the repository.
+ */
+
+// CLONE:START
+            // This code is copied out of resources/build/pr-build-status/pr-build-status.mjs
+            // where it is tested. It is copied inline here in order to avoid requiring the
+            // repository to be checked out, which dramatically reduces the run time of the
+            // check.
+            //
+            // Note: we don't currently look at check runs, only statuses
+            //
+            // Verify the following statuses:
+            //   'user_testing'
+            //   'API Verification' (github-actions[bot])
+            //
+            // At least 1 of the following statuses must be found:
+            //   'Test*' (keyman-server), e.g. 'Test Build (Keyman)'
+            //   'Ubuntu Packaging' (github-actions[bot])
+            //
+            // Ignore the following statuses:
+            //   check/web/file-size
+            //
+
+            function reduceStatuses(statuses) {
+              const filtered_statuses = statuses.reduce((o, status) => {
+                if(status.creator?.login == 'keyman-server' && status.context.startsWith('Test')) {
+                  if(!o[status.context]) o[status.context] = {type: 'build', state: status.state};
+                } else if(status.creator?.login == 'keymanapp-test-bot[bot]' && status.context == 'user_testing') {
+                  if(!o[status.context]) o[status.context] = {type: 'user-test', state: status.state};;
+                } else if(status.context == 'API Verification') {
+                  if(!o[status.context]) o[status.context] = {type: 'check', state: status.state};
+                } else if(status.context == 'Ubuntu Packaging') {
+                  if(!o[status.context]) o[status.context] = {type: 'build', state: status.state};
+                } else if(status.context == 'check/web/file-size') {
+                  // Ignore check/web/file-size -- we won't block automerge for this at this point
+                } else {
+                  // We fail with an 'unknown status' response if we get a new status check
+                  // so we can be sure we are not skipping known status checks
+                  o[status.context] = {type: 'unknown', state: status.state};
+                }
+                return o;
+
+              }, {});
+              return filtered_statuses;
+            }
+
+            //
+            // Given the collection of status checks we care about, return
+            // an aggregate status -- error, failed, pending, or success,
+            // and a summary description
+            //
+            function calculateFinalStatus(filtered_statuses) {
+              const counts = {};
+              let hasBuilds = false;
+              for(const context of Object.keys(filtered_statuses)) {
+                const { state, type } = filtered_statuses[context];
+                if(type == 'unknown') {
+                  // We special-case for unknown status checks, and never permit them
+                  return [
+                    'error', `An unknown context ${context} was found, cannot calculate build status.`
+                  ];
+                }
+                if(type == 'build') {
+                  hasBuilds = true;
+                }
+                counts[state] = counts[state] ? counts[state] + 1 : 1;
+              }
+
+              // If we do not have any statuses yet, we wait
+              if(Object.keys(filtered_statuses).length == 0 || !hasBuilds) {
+                return ['pending', 'Builds have not yet been triggered ⌛'];
+              }
+
+              const state =
+                counts.error ? 'error' :
+                counts.failed ? 'failed' :
+                counts.pending ? 'pending' :
+                'success';
+
+              let description = '';
+              function appendDescription(count, state) {
+                if(!count) return;
+                if(description != '') description += '; ';
+                description += `${count} check${count == 1 ? '' : 's'} ${state}`;
+              }
+              appendDescription(counts.error, 'in an error state ❌');
+              appendDescription(counts.failed, 'failed ❌');
+              appendDescription(counts.pending, 'pending ⌛');
+              appendDescription(counts.success, 'completed successfully ✅');
+
+              return [ state, description ];
+            }
+
+            async function getCommitStatuses(github, owner, repo, sha) {
+              const statuses = await github.paginate('GET /repos/{owner}/{repo}/commits/{sha}/statuses', {
+                owner,
+                repo,
+                sha,
+                headers: {
+                  'X-GitHub-Api-Version': '2022-11-28'
+                }
+              });
+              return statuses;
+            }
+
+            async function getCommitCheckRuns(github, owner, repo, sha) {
+              const statuses = await github.paginate('GET /repos/{owner}/{repo}/commits/{sha}/check-runs', {
+                owner,
+                repo,
+                sha,
+                headers: {
+                  'X-GitHub-Api-Version': '2022-11-28'
+                }
+              });
+              return statuses;
+            }
+
+            function calculateCheckResult(statuses) {
+              if(!Array.isArray(statuses)) {
+                return ['error', 'Failed to retrieve status checks from GitHub ❌'];
+              }
+
+              const filtered_statuses = reduceStatuses(statuses);
+
+              const result = calculateFinalStatus(filtered_statuses);
+              return result;
+            }
+
+            async function test(github, owner, repo, sha) {
+              // Get statuses from sha
+              const statuses = await getCommitStatuses(github, owner, repo, sha);
+              return calculateCheckResult(statuses);
+            }
+
+            async function createCheck(github, owner, repo, sha) {
+              const check = await github.rest.checks.create({
+                owner,
+                repo,
+                head_sha: sha,
+                name: 'Build Outcome',
+                status: 'in_progress',
+              });
+              return check.data.id;
+            }
+
+            async function updateCheck(github, owner, repo, checkRunId, status, description) {
+              const checkStatus = status == 'pending' ? 'in_progress' : 'completed';
+              const conclusion = checkStatus == 'in_progress' ? undefined : (status == 'success' ? 'success' : 'failure');
+
+              await github.rest.checks.update({
+                owner,
+                repo,
+                check_run_id: checkRunId,
+                status: checkStatus,
+                conclusion,
+                output: {
+                  title: description,
+                  summary: ''
+                }
+              });
+            }
+
+// CLONE:END
+// CLONE-COMMENTED:START
+
+            // const { owner, repo } = context.repo;
+            // const sha =
+            //   context.payload?.check_suite?.sha ||    /* check run completed */
+            //   context.payload?.inputs?.commit ||      /* manual run */
+            //   context.payload?.after ||               /* push */
+            //   context.payload?.commit?.sha ||         /* status */
+            //   context.sha;                            /* probably 'master'! */
+
+            // const checkRunId = await createCheck(github, owner, repo, sha);
+            // const res = await test(github, owner, repo, sha);
+            // await updateCheck(github, owner, repo, checkRunId, res[0], res[1]);
+
+// CLONE-COMMENTED:END
+
+// Following code is used only for unit testing; do not include in the .yml
+
+export const unitTestEndpoints = {
+  getCommitStatuses, calculateCheckResult, getCommitCheckRuns
+};
\ No newline at end of file
diff --git a/resources/build/pr-build-status/pr-build-status.prefix.yml b/resources/build/pr-build-status/pr-build-status.prefix.yml
new file mode 100644
index 0000000000..cbeba112a1
--- /dev/null
+++ b/resources/build/pr-build-status/pr-build-status.prefix.yml
@@ -0,0 +1,37 @@
+#
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# Do not modify the script in .github/workflows/pr-build-status.yml directly;
+# instead work on the sources in resources/build/pr-build-status and use the
+# build.sh script to rebuild the .github/workflows/pr-build-status.yml file from
+# them.
+#
+# build.sh will append the relevant portions of
+# resources/build/pr-build-status/pr-build-status.mjs to the content in
+# resources/build/pr-build-status/pr-build-status.prefix.yml to form the .github
+# workflow file.
+#
+name: Keyman Build Summary
+on:
+  status:
+  push:
+    branches-ignore:
+      - master
+      - beta
+      - stable-*
+  workflow_dispatch:
+    inputs:
+      commit:
+        description: 'Commit sha'
+        required: true
+        type: string
+jobs:
+  run_pr_build_status:
+    name: Summarize build status checks
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check PR build status
+        id: run_pr_build_status_script
+        uses: actions/github-script@v7
+        with:
+          script: |
diff --git a/resources/build/pr-build-status/pr-build-status.tests.mjs b/resources/build/pr-build-status/pr-build-status.tests.mjs
new file mode 100644
index 0000000000..bfb49fe64b
--- /dev/null
+++ b/resources/build/pr-build-status/pr-build-status.tests.mjs
@@ -0,0 +1,44 @@
+import * as fs from 'node:fs';
+import 'mocha';
+import { assert } from 'chai';
+
+import { unitTestEndpoints } from './pr-build-status.mjs';
+
+// debug only
+import { getOctokit } from '@actions/github';
+import * as process from 'node:process';
+
+const commits = {
+  '825f7d2df0069fa56a8f2a534b42a49ee1f21ca1': [ 'success', '24 checks completed successfully ✅' ],
+  '870d37f56b489ef5067b4352a06505369d9038e0': [ 'error', '6 checks in an error state ❌; 17 checks completed successfully ✅' ],
+  '11a558e926370253db37026c95b7ff5a6aa1e8fc': [ 'success', '22 checks completed successfully ✅' ],
+  '8fd5ccc9026b85d6a780d8bcf862380e7a89aefb': [ 'pending', 'Builds have not yet been triggered ⌛' ],
+  '153683cfb007c6066c9dcf71d25afa4c66efa17f': [ 'pending', 'Builds have not yet been triggered ⌛' ],
+};
+
+// When adding new SHAs to test, run this to collect data from GitHub
+const debug = false;
+if(debug) {
+
+  async function writeTestFile(sha) {
+    fs.writeFileSync('fixtures/' + sha + '-statuses.json',
+      JSON.stringify(await unitTestEndpoints.getCommitStatuses(octokit, 'keymanapp', 'keyman', sha), null, 2), 'utf-8');
+    fs.writeFileSync('fixtures/' + sha + '-check-runs.json',
+      JSON.stringify(await unitTestEndpoints.getCommitCheckRuns(octokit, 'keymanapp', 'keyman', sha), null, 2), 'utf-8');
+  }
+
+  const octokit = getOctokit(process.env['GITHUB_TOKEN']);
+  for(const sha of Object.keys(commits)) await writeTestFile(sha);
+}
+
+describe('pr-build-status', function () {
+  for(const sha of Object.keys(commits)) {
+    it(`should return '${commits[sha][1]}' for sha ${sha}`, function () {
+      const json = JSON.parse(fs.readFileSync(`fixtures/${sha}-statuses.json`,'utf-8'));
+      const status = unitTestEndpoints.calculateCheckResult(json);
+      assert.isNotNull(status);
+      assert.isArray(status);
+      assert.deepStrictEqual(status, commits[sha]);
+    });
+  }
+});
diff --git a/resources/build/publish-minimum-versions.sh b/resources/build/publish-minimum-versions.sh
index 4a65c3352d..5da012737a 100755
--- a/resources/build/publish-minimum-versions.sh
+++ b/resources/build/publish-minimum-versions.sh
@@ -8,7 +8,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${KEYMAN_ROOT}/resources/build/minimum-versions.inc.sh"
diff --git a/resources/build/report-history.sh b/resources/build/report-history.sh
index 44eaa5843c..146c665542 100755
--- a/resources/build/report-history.sh
+++ b/resources/build/report-history.sh
@@ -9,10 +9,10 @@ set -u
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 BUILD=false
 BASE=`git branch --show-current`
diff --git a/resources/build/run-required-test-builds.sh b/resources/build/run-required-test-builds.sh
index c0b3ce8680..0ccffd69a2 100755
--- a/resources/build/run-required-test-builds.sh
+++ b/resources/build/run-required-test-builds.sh
@@ -1,22 +1,51 @@
 #!/usr/bin/env bash
 #
 # Determine if we need to do a build based on rules in
-# trigger-definitions.inc.sh, rather than calculating changes in
-# TeamCity. If a build is needed, then we ask TeamCity to
-# start the build.
+# trigger-definitions.inc.sh and based on commit trailers and PR body comments,
+# rather than calculating changes in TeamCity. If a build is needed, then we ask
+# TeamCity / GHA to start the build.
 #
 
-set -e
-set -u
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
 
-if [[ $# -lt 1 ]]; then
-  echo 'Usage: run-required-test-build.sh pull-request-number|branch'
-  echo '  where branch can be master, beta'
-  exit 1
+. "${THIS_SCRIPT%/*}/trigger-definitions.inc.sh"
+. "${THIS_SCRIPT%/*}/trigger-builds.inc.sh"
+. "${THIS_SCRIPT%/*}/trigger-build-bot.inc.sh"
+. "${THIS_SCRIPT%/*}/jq.inc.sh"
+
+builder_describe "Run test builds for the given pull request/primary branch" \
+  "--dry-run,-n       Only report back which builds would be started" \
+  "--branch,-b=PRNUM  Branch (master,beta,stable-x.y) or pull-request to test"
+
+if [[ $# -eq 1 ]] && [[ "$1" =~ ^([0-9]+|master|beta|stable-[0-9]+\.[0-9]+)$ ]]; then
+  # For transitional period, when build configuration on TC needs to support
+  # both forms, we will pass a modified set of params to builder_parse
+  #
+  # TODO: remove this condition once all branches have received this change,
+  #       and update TC build configuration to pass -b parameter
+  #
+  builder_parse -b "$1"
 else
-  PRNUM="$1"
+  builder_parse "$@"
 fi
 
+# Validate parameters
+
+if ! builder_has_option --branch; then
+  builder_die "--branch parameter is required"
+fi
+
+if [[ ! "$PRNUM" =~ ^([0-9]+|master|beta|stable-[0-9]+\.[0-9]+)$ ]]; then
+  builder_die "Invalid parameter --branch '$PRNUM'; expected 'master', 'beta', 'stable-x.y', or PR number"
+fi
+
+#
+# Debug logging
+#
 function debug_echo() {
   if [ ! -z ${DEBUG:-} ]; then
     echo "DEBUG: $1"
@@ -25,48 +54,77 @@ function debug_echo() {
 }
 
 #
-# This must be run under a TeamCity environment in order to receive all variables
-#
-
-## START STANDARD BUILD SCRIPT INCLUDE
-# adjust relative paths as necessary
-THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-. "${THIS_SCRIPT%/*}/trigger-definitions.inc.sh"
-. "${THIS_SCRIPT%/*}/trigger-builds.inc.sh"
-. "${THIS_SCRIPT%/*}/jq.inc.sh"
-
-#
-# Iterate through the platforms 'array' passed in and
+# Iterate through the platforms array passed in and
 # run builds associated with each platform found
 #
-
+# Parameters:
+#   1: name of associative array of platforms, platform=skip|build|release|[fulltest?]
+#   2: branch name or PR number
+#
 function triggerTestBuilds() {
-  # Note: we always run builds for 'all' platforms
-  local platforms=( `echo "all $1"` )
+  local -n platforms=$1
   local branch="$2"
-  local force="${3:-false}"
+
+  local found_build=false
 
   # Cancel any already running builds for this branch
-  node "$THIS_SCRIPT_PATH/ci/cancel-builds/cancel-test-builds.mjs" "$branch" "$TEAMCITY_TOKEN"
+  if builder_has_option --dry-run; then
+    builder_echo "DRY RUN: cancel current builds for $branch"
+  else
+    node "$THIS_SCRIPT_PATH/ci/cancel-builds/cancel-test-builds.mjs" "$branch" "$TEAMCITY_TOKEN"
+  fi
 
-  for platform in "${platforms[@]}"; do
-    echo "# $platform: checking for changes"
+  for platform in "${!platforms[@]}"; do
+    local platformBuildLevel=${platforms[$platform]}
+    if [[ $platformBuildLevel == skip ]]; then
+      builder_echo heading "$platform: skipping build"
+      continue
+    fi
+
+    builder_echo heading "$platform: checking for git changes"
     eval test_builds='(${'bc_test_$platform'[@]})'
     for test_build in "${test_builds[@]}"; do
       if [[ $test_build == "" ]]; then continue; fi
+      found_build=true
       if [ "${test_build:(-7)}" == "_GitHub" ]; then
         local job=${test_build%_GitHub}
-        echo "  -- Triggering GitHub action build $job/$branch"
-        triggerGitHubActionsBuild true "$job" "$branch"
+
+        if builder_has_option --dry-run; then
+          builder_echo "DRY RUN: Triggering GitHub action build $job/$branch, level = $platformBuildLevel"
+        else
+          builder_echo "Triggering GitHub action build $job/$branch, level = $platformBuildLevel"
+          triggerGitHubActionsBuild true $platformBuildLevel "$job" "$branch"
+        fi
       else
-        echo "  -- Triggering build configuration $test_build on teamcity"
-        triggerTeamCityBuild true "$test_build" "$vcs_test" "$branch"
+        if builder_has_option --dry-run; then
+          builder_echo "DRY RUN: Triggering build configuration $test_build on teamcity for $branch, level = $platformBuildLevel"
+        else
+          builder_echo "Triggering build configuration $test_build on teamcity for $branch, level = $platformBuildLevel"
+          triggerTeamCityBuild true $platformBuildLevel "$test_build" "$vcs_test" "$branch"
+        fi
       fi
     done
   done
+
+  if [[ $found_build == false ]]; then
+    postSkippedBuildsStatusResult
+  fi
+}
+
+#
+# Add a 'Test Build (Keyman)' successful status check to the commit
+#
+function postSkippedBuildsStatusResult() {
+  if builder_has_option --dry-run; then
+    builder_echo "DRY RUN: write successful status check 'Skipping since no platform builds necessary'"
+  else
+    curl --silent --write-out '\n' \
+      --request POST \
+      --header "Accept: application/vnd.github+json" \
+      --header "Authorization: token $GITHUB_TOKEN" \
+      --data '{"state":"success","description":"Skipping since no platform builds necessary","context":"Test Build (Keyman)"}' \
+      "https://api.github.com/repos/keymanapp/keyman/statuses/${BUILD_VCS_NUMBER}"
+  fi
 }
 
 #
@@ -75,9 +133,9 @@ function triggerTestBuilds() {
 #
 
 if [[ ! "$PRNUM" =~ ^[[:digit:]]+$ ]]; then
-  # branch name is 'master', 'beta' [, or 'stable' -- in the future]
-  echo ". Branch $PRNUM needs to pass tests on all platforms."
-  triggerTestBuilds "`echo ${available_platforms[@]}`" "$PRNUM" "true"
+  # branch name is 'master', 'beta', or 'stable-x.y'
+  builder_echo "Branch $PRNUM needs to pass tests on all platforms."
+  triggerTestBuilds main_branch_platform_build_levels $PRNUM
   exit 0
 fi
 
@@ -88,7 +146,7 @@ fi
 # targeted by the PR other than to ask GitHub, anyway.)
 #
 
-echo ". Get information about pull request #$PRNUM from GitHub"
+builder_echo grey "# Get information about pull request #$PRNUM from GitHub"
 prinfo=`curl -s -H "User-Agent: @keymanapp" -H "Authorization: Bearer $GITHUB_TOKEN" https://api.github.com/repos/keymanapp/keyman/pulls/$PRNUM`
 prbase=`echo ${prinfo} | "$JQ" -r '.base.ref'`
 prhead=`echo ${prinfo} | "$JQ" -r '.head.ref'`
@@ -111,7 +169,7 @@ fi
 #
 
 # (Ensure we are within the repository before running git calls)
-echo ". Ensure our local branch is up to date"
+builder_echo grey "# Ensure our local branch is up to date"
 pushd "$KEYMAN_ROOT" > /dev/null
 git fetch origin > /dev/null
 
@@ -132,7 +190,7 @@ fi
 # We work from origin so we don't need the branches in our local copy
 #
 
-echo ". Get list of changed files in the pull request"
+builder_echo grey "# Get list of changed files in the pull request"
 prfiles=`git diff --name-only "origin/$prbase"..."$prremote/$prhead" || ( if [ $? == 128 ]; then echo abort; else exit $?; fi )`
 if [ "$prfiles" == "abort" ]; then
   # Don't trigger any builds, exit with success
@@ -155,43 +213,58 @@ popd > /dev/null
 # Find the platforms that have changes based on the watch_ variables in trigger-definitions.inc.sh
 #
 
-echo ". Find platforms that have changes"
-build_platforms=()
+function find_platform_changes() {
+  builder_echo grey "# Find platforms that have changes"
+  declare -gA build_platforms
+  local platform watch
 
-# Scan the files found
-while IFS= read -r line; do
-  # for each platform
-  for platform in "${available_platforms[@]}"; do
-    if [[ ! " ${build_platforms[@]} " =~ " $platform " ]]; then
-      # Which platform are we watching?
-      eval watch='$'watch_$platform
-      # Add common patterns to the watch list
-      watch="^(${platform}|(oem/[^/]+/${platform})|resources/((?!teamcity)|teamcity/(${platform}|includes))|${watch})"
-      # Since bash doesn't support negative look-aheads we use perl to test
-      # (grep has a --perl-regexp option, but not the version on macOS)
-      if perl -e 'exit($ARGV[0] =~ /$ARGV[1]/ ? 0 : 1)' "${line}" "${watch}"; then
-        build_platforms+=($platform)
+  # Scan the files found
+  while IFS= read -r line; do
+    # for each platform
+    for platform in "${available_platforms[@]}"; do
+      if [[ ! " ${!build_platforms[@]} " =~ " $platform " ]]; then
+        # Which platform are we watching?
+        eval watch='$'watch_$platform
+
+        # Add common patterns to the watch list
+        watch="^(${platform}|(oem/[^/]+/${platform})|resources/((?!teamcity)|teamcity/(${platform}|includes))|${watch})"
+        # Since bash doesn't support negative look-aheads we use perl to test
+        # (grep has a --perl-regexp option, but not the version on macOS)
+        if perl -e 'exit($ARGV[0] =~ /$ARGV[1]/ ? 0 : 1)' "${line}" "${watch}"; then
+          # By default, we'll build a 'release' test build for touched platforms
+          build_platforms[$platform]=$build_level_release
+        fi
       fi
-    fi
-  done
-done <<< "$prfiles"
+    done
+  done <<< "$prfiles"
 
-debug_echo "Build platforms: ${build_platforms[*]}"
+  debug_echo "Default build platforms: ${!build_platforms[@]}"
+}
 
-if (( ${#build_platforms[@]} > 0)); then
-  #
-  # Start the test builds
-  #
-  echo ". Start test builds"
-  triggerTestBuilds "`echo ${build_platforms[@]}`" "$PRNUM"
+find_platform_changes
+
+#
+# Now check PR commits for Build-bot: commands
+# This will modify the build_platforms array
+#
+
+if [ "$prremote" == "origin" ]; then
+  # We only accept Build-bot commands on trusted local origin PRs
+  prcommits=`curl -s -H "User-Agent: @keymanapp"  -H "Authorization: Bearer $GITHUB_TOKEN" https://api.github.com/repos/keymanapp/keyman/pulls/$PRNUM/commits`
+  test_bot_check_pr_body "$PRNUM" "$prinfo"
+  build_bot_check_messages $PRNUM "$prinfo" "$prcommits"
+fi
+
+#
+# Start test builds as required
+#
+
+if [[ ! -z "${build_platforms[*]:-}" ]] && (( ${#build_platforms[@]} > 0)); then
+  builder_echo heading "Start test builds"
+  triggerTestBuilds build_platforms $PRNUM
 else
-  echo ". No builds to start"
-  curl --silent --write-out '\n' \
-    --request POST \
-    --header "Accept: application/vnd.github+json" \
-    --header "Authorization: token $GITHUB_TOKEN" \
-    --data '{"state":"success","description":"Skipping since no platform builds necessary","context":"Test Build (Keyman)"}' \
-    "https://api.github.com/repos/keymanapp/keyman/statuses/${BUILD_VCS_NUMBER}"
+  builder_echo heading "No builds to start"
+  postSkippedBuildsStatusResult
 fi
 
 exit 0
diff --git a/resources/build/sentry-dsym-upload.sh b/resources/build/sentry-dsym-upload.sh
deleted file mode 100755
index 47f73b7a77..0000000000
--- a/resources/build/sentry-dsym-upload.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Calls resource script to perform the dSYM upload
-
-source "$KEYMAN_ROOT/resources/build/xcode-utils.sh"
-phaseSentryDsymUpload "keyman-ios"
\ No newline at end of file
diff --git a/resources/build/set-bundle-versions-untagged.sh b/resources/build/set-bundle-versions-untagged.sh
deleted file mode 100755
index 85ea09f9c3..0000000000
--- a/resources/build/set-bundle-versions-untagged.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Calls script in xcode-utils to update the version
-
-source "$KEYMAN_ROOT/resources/build/xcode-utils.sh"
-phaseSetBundleVersions
\ No newline at end of file
diff --git a/resources/build/test/build-bot/pr-14013-commits.txt b/resources/build/test/build-bot/pr-14013-commits.txt
new file mode 100644
index 0000000000..9573e23bcb
--- /dev/null
+++ b/resources/build/test/build-bot/pr-14013-commits.txt
@@ -0,0 +1,171 @@
+[
+  {
+    "sha": "b7970d439cdd18e84fd754bf0f06a8878c18bb97",
+    "node_id": "C_kwDOAY2xT9oAKGI3OTcwZDQzOWNkZDE4ZTg0ZmQ3NTRiZjBmMDZhODg3OGMxOGJiOTc",
+    "commit": {
+      "author": {
+        "name": "Marc Durdin",
+        "email": "marc@durdin.net",
+        "date": "2025-04-30T01:59:27Z"
+      },
+      "committer": {
+        "name": "Marc Durdin",
+        "email": "marc@durdin.net",
+        "date": "2025-04-30T01:59:27Z"
+      },
+      "message": "maint(common): consolidate VC++ environment setup for meson\n\nUse the automated environment setup that we built for Windows and\nDeveloper builds in our meson build configurations, so we don't need to\ncall out to vsdevcmd.bat for every build step. This makes the build\nfaster, more consistent across the various ways we call VC++, and\nsimplifies the shell scripts. Removes the complicated build.bat wrappers.\n\nAlso removes the `cleanup_visual_studio_path` function which should no\nlonger be necessary, as our environment builder does the job for us.\n\nMinor complication in that `$TARGET_PATH` variable in kmcmplib/build.sh\nis also used in the Windows environment setup, so eliminated its use in\nkmcmplib/build.sh.\n\nFinally, removes the `$MESON_LOW_VERSION` variable as we know we are\nalways on Meson 1.0 or later now.\n\nBuild-bot: skip:developer skip:windows\nBuild-bot: build:windows",
+      "tree": {
+        "sha": "df937f0cb23e2e3736d92cf39b3b7f62ce20bcc1",
+        "url": "https://api.github.com/repos/keymanapp/keyman/git/trees/df937f0cb23e2e3736d92cf39b3b7f62ce20bcc1"
+      },
+      "url": "https://api.github.com/repos/keymanapp/keyman/git/commits/b7970d439cdd18e84fd754bf0f06a8878c18bb97",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null,
+        "verified_at": null
+      }
+    },
+    "url": "https://api.github.com/repos/keymanapp/keyman/commits/b7970d439cdd18e84fd754bf0f06a8878c18bb97",
+    "html_url": "https://github.com/keymanapp/keyman/commit/b7970d439cdd18e84fd754bf0f06a8878c18bb97",
+    "comments_url": "https://api.github.com/repos/keymanapp/keyman/commits/b7970d439cdd18e84fd754bf0f06a8878c18bb97/comments",
+    "author": {
+      "login": "mcdurdin",
+      "id": 4498365,
+      "node_id": "MDQ6VXNlcjQ0OTgzNjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4498365?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/mcdurdin",
+      "html_url": "https://github.com/mcdurdin",
+      "followers_url": "https://api.github.com/users/mcdurdin/followers",
+      "following_url": "https://api.github.com/users/mcdurdin/following{/other_user}",
+      "gists_url": "https://api.github.com/users/mcdurdin/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/mcdurdin/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/mcdurdin/subscriptions",
+      "organizations_url": "https://api.github.com/users/mcdurdin/orgs",
+      "repos_url": "https://api.github.com/users/mcdurdin/repos",
+      "events_url": "https://api.github.com/users/mcdurdin/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/mcdurdin/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "mcdurdin",
+      "id": 4498365,
+      "node_id": "MDQ6VXNlcjQ0OTgzNjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4498365?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/mcdurdin",
+      "html_url": "https://github.com/mcdurdin",
+      "followers_url": "https://api.github.com/users/mcdurdin/followers",
+      "following_url": "https://api.github.com/users/mcdurdin/following{/other_user}",
+      "gists_url": "https://api.github.com/users/mcdurdin/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/mcdurdin/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/mcdurdin/subscriptions",
+      "organizations_url": "https://api.github.com/users/mcdurdin/orgs",
+      "repos_url": "https://api.github.com/users/mcdurdin/repos",
+      "events_url": "https://api.github.com/users/mcdurdin/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/mcdurdin/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "926be6e9463e0497dbf1d32d4ef908ae2aad20db",
+        "url": "https://api.github.com/repos/keymanapp/keyman/commits/926be6e9463e0497dbf1d32d4ef908ae2aad20db",
+        "html_url": "https://github.com/keymanapp/keyman/commit/926be6e9463e0497dbf1d32d4ef908ae2aad20db"
+      }
+    ]
+  },
+  {
+    "sha": "0230010a509e317f835d18e1d3be116c30047cf9",
+    "node_id": "C_kwDOAY2xT9oAKDAyMzAwMTBhNTA5ZTMxN2Y4MzVkMThlMWQzYmUxMTZjMzAwNDdjZjk",
+    "commit": {
+      "author": {
+        "name": "Marc Durdin",
+        "email": "marc@durdin.net",
+        "date": "2025-04-30T02:18:26Z"
+      },
+      "committer": {
+        "name": "GitHub",
+        "email": "noreply@github.com",
+        "date": "2025-04-30T02:18:26Z"
+      },
+      "message": "Merge branch 'maint/meson-versioning-improvements' into maint/core-developer/12639-meson-no-batch-wrappers\n\nBuild-bot: skip:all",
+      "tree": {
+        "sha": "47bb7ca6f52998e8a14e478f5e9f5d7ba415ace3",
+        "url": "https://api.github.com/repos/keymanapp/keyman/git/trees/47bb7ca6f52998e8a14e478f5e9f5d7ba415ace3"
+      },
+      "url": "https://api.github.com/repos/keymanapp/keyman/git/commits/0230010a509e317f835d18e1d3be116c30047cf9",
+      "comment_count": 0,
+      "verification": {
+        "verified": true,
+        "reason": "valid",
+        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsFcBAABCAAQBQJoEYhyCRC1aQ7uu5UhlAAAg4MQAFxQGq7WPhHNzlspVIFv5k8W\nJPmC2SP+eUXyDKpO38MqnAPlMqaNrleB071BtE9i2DeWHwYvGwJ87ki95aAtg00F\ne4RbhJYy5sW/F/0fNzHgGNFPNb3EcRyt6I7X3xRB+i1k0PgTSVIpnLzXn3gj9GwU\n7PuLgNO0CUpcgWc6X7a259RAlLInEJ+I8p9XhW827eRalogwgALt4IuJmWyJALFL\nJFeWGlCKdVfbHEgBgEyA98zNnvtoxQ+FlJn1V1jJEBpCY+MPB5tyCXZ4LZbn/n7V\n0+2Pp3c5lnZKmaOyUykwQw7P8s4R2+aQnghRHEHa5Fm6hjQkHMiCOwgTwpIrUV+U\n4AWzPjZSw71cBmAUJBUe7SIBv51r1TUeuNy9x3/0r588znBItR12C91KQD8u9o3/\nMqcWTkpEuGgD2nYbhTdb9PNF4Ik/wbBKLDvjQg180b/ocklVaGAAqjOHdvkyQ4in\nIBRqiaeI3zD5TQ7936Sk1JQPil97PWzk27vde0KAeCR59yL8lCnHr2Rtp8hEpytX\nGrlL14GIaVK6YEvumloPFXrWnbdETu0yRllVa4T2RbWskZUtPG93l/fmOV6tiAr2\np79lgJQ0eEJ1fBNm9UsvjDXU478fSU5Dobg1pwv+wxr10u43tPbqmMI6VLxOjt7i\nz44SZyX8udppGuASFSsw\n=3UIv\n-----END PGP SIGNATURE-----\n",
+        "payload": "tree 47bb7ca6f52998e8a14e478f5e9f5d7ba415ace3\nparent b7970d439cdd18e84fd754bf0f06a8878c18bb97\nparent e976b5563589a9e38c778f3c06e404e82526358a\nauthor Marc Durdin <marc@durdin.net> 1745979506 +0700\ncommitter GitHub <noreply@github.com> 1745979506 +0700\n\nMerge branch 'maint/meson-versioning-improvements' into maint/core-developer/12639-meson-no-batch-wrappers",
+        "verified_at": "2025-04-30T02:18:29Z"
+      }
+    },
+    "url": "https://api.github.com/repos/keymanapp/keyman/commits/0230010a509e317f835d18e1d3be116c30047cf9",
+    "html_url": "https://github.com/keymanapp/keyman/commit/0230010a509e317f835d18e1d3be116c30047cf9",
+    "comments_url": "https://api.github.com/repos/keymanapp/keyman/commits/0230010a509e317f835d18e1d3be116c30047cf9/comments",
+    "author": {
+      "login": "mcdurdin",
+      "id": 4498365,
+      "node_id": "MDQ6VXNlcjQ0OTgzNjU=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4498365?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/mcdurdin",
+      "html_url": "https://github.com/mcdurdin",
+      "followers_url": "https://api.github.com/users/mcdurdin/followers",
+      "following_url": "https://api.github.com/users/mcdurdin/following{/other_user}",
+      "gists_url": "https://api.github.com/users/mcdurdin/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/mcdurdin/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/mcdurdin/subscriptions",
+      "organizations_url": "https://api.github.com/users/mcdurdin/orgs",
+      "repos_url": "https://api.github.com/users/mcdurdin/repos",
+      "events_url": "https://api.github.com/users/mcdurdin/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/mcdurdin/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "web-flow",
+      "id": 19864447,
+      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19864447?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/web-flow",
+      "html_url": "https://github.com/web-flow",
+      "followers_url": "https://api.github.com/users/web-flow/followers",
+      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
+      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
+      "organizations_url": "https://api.github.com/users/web-flow/orgs",
+      "repos_url": "https://api.github.com/users/web-flow/repos",
+      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/web-flow/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "b7970d439cdd18e84fd754bf0f06a8878c18bb97",
+        "url": "https://api.github.com/repos/keymanapp/keyman/commits/b7970d439cdd18e84fd754bf0f06a8878c18bb97",
+        "html_url": "https://github.com/keymanapp/keyman/commit/b7970d439cdd18e84fd754bf0f06a8878c18bb97"
+      },
+      {
+        "sha": "e976b5563589a9e38c778f3c06e404e82526358a",
+        "url": "https://api.github.com/repos/keymanapp/keyman/commits/e976b5563589a9e38c778f3c06e404e82526358a",
+        "html_url": "https://github.com/keymanapp/keyman/commit/e976b5563589a9e38c778f3c06e404e82526358a"
+      }
+    ]
+  }
+]
diff --git a/resources/build/test/build-bot/pr-14013-data.txt b/resources/build/test/build-bot/pr-14013-data.txt
new file mode 100644
index 0000000000..fc3f96a725
--- /dev/null
+++ b/resources/build/test/build-bot/pr-14013-data.txt
@@ -0,0 +1,534 @@
+{
+  "url": "https://api.github.com/repos/keymanapp/keyman/pulls/14013",
+  "id": 2533896821,
+  "node_id": "PR_kwDOAY2xT86XCDJ1",
+  "html_url": "https://github.com/keymanapp/keyman/pull/14013",
+  "diff_url": "https://github.com/keymanapp/keyman/pull/14013.diff",
+  "patch_url": "https://github.com/keymanapp/keyman/pull/14013.patch",
+  "issue_url": "https://api.github.com/repos/keymanapp/keyman/issues/14013",
+  "number": 14013,
+  "state": "open",
+  "locked": false,
+  "title": "feat(developer): kmc-convert validate keylayout file 😎",
+  "user": {
+    "login": "SabineSIL",
+    "id": 86713187,
+    "node_id": "MDQ6VXNlcjg2NzEzMTg3",
+    "avatar_url": "https://avatars.githubusercontent.com/u/86713187?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/SabineSIL",
+    "html_url": "https://github.com/SabineSIL",
+    "followers_url": "https://api.github.com/users/SabineSIL/followers",
+    "following_url": "https://api.github.com/users/SabineSIL/following{/other_user}",
+    "gists_url": "https://api.github.com/users/SabineSIL/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/SabineSIL/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/SabineSIL/subscriptions",
+    "organizations_url": "https://api.github.com/users/SabineSIL/orgs",
+    "repos_url": "https://api.github.com/users/SabineSIL/repos",
+    "events_url": "https://api.github.com/users/SabineSIL/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/SabineSIL/received_events",
+    "type": "User",
+    "user_view_type": "public",
+    "site_admin": false
+  },
+  "body": "\r\n\r\n**The setup:** \r\n- The xsd-file  :  `resources\\standards-data\\keylayout\\dtd\\keylayout.xsd`\r\n- The  `resources\\standards-data\\keylayout\\create_keylayout_schema.sh`  exists and creates `resources\\standards-data\\keylayout\\keylayout.schema.json`\r\n-  The `common/web/types/build.sh configure` creates a `common\\web\\types\\src\\schemas\\keylayout.schema.validator.mjs` file  \r\n- The .mjs is then used in validate() function of  `keylayout-file-reader.ts`   (`...SchemaValidators.default.keylayout(source)`) \r\n\r\n**The problem:** \r\nAll the above works but while using the `validate20()` function of `keylayout.schema.validator.mjs` ,  **key0 will be \"?xml\"** which then produces the error.\r\n \r\n> \r\n> for (const **key0** in data) {\r\n>               if (!(key0 === \"keyboard\")) {\r\n>                 validate20.errors = [{ instancePath, schemaPath: \"#/additionalProperties\", keyword: \"additionalProperties\", params: { additionalProperty: key0 }, message: \"must NOT have additional properties\" }];\r\n>                 return false;\r\n>                 break;\r\n>               }\r\n>             }\r\n\r\n**The error:** \r\n![image](https://github.com/user-attachments/assets/efa4a0ba-a53a-419f-9d39-15c61ce26fe5)\r\n\r\n**So the question is: Why is `?xml `treated as an element tag and how can we prevent this**\r\n\r\n@keymanapp-test-bot skip\r\n\r\nBuild-bot: skip",
+  "created_at": "2025-05-21T10:02:29Z",
+  "updated_at": "2025-05-26T01:30:35Z",
+  "closed_at": null,
+  "merged_at": null,
+  "merge_commit_sha": null,
+  "assignee": {
+    "login": "SabineSIL",
+    "id": 86713187,
+    "node_id": "MDQ6VXNlcjg2NzEzMTg3",
+    "avatar_url": "https://avatars.githubusercontent.com/u/86713187?v=4",
+    "gravatar_id": "",
+    "url": "https://api.github.com/users/SabineSIL",
+    "html_url": "https://github.com/SabineSIL",
+    "followers_url": "https://api.github.com/users/SabineSIL/followers",
+    "following_url": "https://api.github.com/users/SabineSIL/following{/other_user}",
+    "gists_url": "https://api.github.com/users/SabineSIL/gists{/gist_id}",
+    "starred_url": "https://api.github.com/users/SabineSIL/starred{/owner}{/repo}",
+    "subscriptions_url": "https://api.github.com/users/SabineSIL/subscriptions",
+    "organizations_url": "https://api.github.com/users/SabineSIL/orgs",
+    "repos_url": "https://api.github.com/users/SabineSIL/repos",
+    "events_url": "https://api.github.com/users/SabineSIL/events{/privacy}",
+    "received_events_url": "https://api.github.com/users/SabineSIL/received_events",
+    "type": "User",
+    "user_view_type": "public",
+    "site_admin": false
+  },
+  "assignees": [
+    {
+      "login": "SabineSIL",
+      "id": 86713187,
+      "node_id": "MDQ6VXNlcjg2NzEzMTg3",
+      "avatar_url": "https://avatars.githubusercontent.com/u/86713187?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/SabineSIL",
+      "html_url": "https://github.com/SabineSIL",
+      "followers_url": "https://api.github.com/users/SabineSIL/followers",
+      "following_url": "https://api.github.com/users/SabineSIL/following{/other_user}",
+      "gists_url": "https://api.github.com/users/SabineSIL/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/SabineSIL/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/SabineSIL/subscriptions",
+      "organizations_url": "https://api.github.com/users/SabineSIL/orgs",
+      "repos_url": "https://api.github.com/users/SabineSIL/repos",
+      "events_url": "https://api.github.com/users/SabineSIL/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/SabineSIL/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    }
+  ],
+  "requested_reviewers": [
+
+  ],
+  "requested_teams": [
+
+  ],
+  "labels": [
+    {
+      "id": 648605999,
+      "node_id": "MDU6TGFiZWw2NDg2MDU5OTk=",
+      "url": "https://api.github.com/repos/keymanapp/keyman/labels/developer/",
+      "name": "developer/",
+      "color": "f9d0c4",
+      "default": false,
+      "description": ""
+    },
+    {
+      "id": 1095223705,
+      "node_id": "MDU6TGFiZWwxMDk1MjIzNzA1",
+      "url": "https://api.github.com/repos/keymanapp/keyman/labels/common/",
+      "name": "common/",
+      "color": "006b75",
+      "default": false,
+      "description": ""
+    },
+    {
+      "id": 1298035273,
+      "node_id": "MDU6TGFiZWwxMjk4MDM1Mjcz",
+      "url": "https://api.github.com/repos/keymanapp/keyman/labels/developer/compilers/",
+      "name": "developer/compilers/",
+      "color": "f9d0c4",
+      "default": false,
+      "description": ""
+    },
+    {
+      "id": 1608627704,
+      "node_id": "MDU6TGFiZWwxNjA4NjI3NzA0",
+      "url": "https://api.github.com/repos/keymanapp/keyman/labels/common/resources/",
+      "name": "common/resources/",
+      "color": "006b75",
+      "default": false,
+      "description": "Build infrastructure"
+    },
+    {
+      "id": 2058996244,
+      "node_id": "MDU6TGFiZWwyMDU4OTk2MjQ0",
+      "url": "https://api.github.com/repos/keymanapp/keyman/labels/feat",
+      "name": "feat",
+      "color": "84b6eb",
+      "default": false,
+      "description": ""
+    },
+    {
+      "id": 2073602939,
+      "node_id": "MDU6TGFiZWwyMDczNjAyOTM5",
+      "url": "https://api.github.com/repos/keymanapp/keyman/labels/common/web/",
+      "name": "common/web/",
+      "color": "006b75",
+      "default": false,
+      "description": ""
+    },
+    {
+      "id": 7333596907,
+      "node_id": "LA_kwDOAY2xT88AAAABtR3O6w",
+      "url": "https://api.github.com/repos/keymanapp/keyman/labels/epic-kmc-convert",
+      "name": "epic-kmc-convert",
+      "color": "F9C2EE",
+      "default": false,
+      "description": ""
+    }
+  ],
+  "milestone": {
+    "url": "https://api.github.com/repos/keymanapp/keyman/milestones/229",
+    "html_url": "https://github.com/keymanapp/keyman/milestone/229",
+    "labels_url": "https://api.github.com/repos/keymanapp/keyman/milestones/229/labels",
+    "id": 12655812,
+    "node_id": "MI_kwDOAY2xT84AwRzE",
+    "number": 229,
+    "title": "A19S4",
+    "description": null,
+    "creator": {
+      "login": "keyman-server",
+      "id": 7018967,
+      "node_id": "MDQ6VXNlcjcwMTg5Njc=",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7018967?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keyman-server",
+      "html_url": "https://github.com/keyman-server",
+      "followers_url": "https://api.github.com/users/keyman-server/followers",
+      "following_url": "https://api.github.com/users/keyman-server/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keyman-server/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keyman-server/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keyman-server/subscriptions",
+      "organizations_url": "https://api.github.com/users/keyman-server/orgs",
+      "repos_url": "https://api.github.com/users/keyman-server/repos",
+      "events_url": "https://api.github.com/users/keyman-server/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keyman-server/received_events",
+      "type": "User",
+      "user_view_type": "public",
+      "site_admin": false
+    },
+    "open_issues": 108,
+    "closed_issues": 34,
+    "state": "open",
+    "created_at": "2025-04-02T03:26:05Z",
+    "updated_at": "2025-05-31T00:48:44Z",
+    "due_on": "2025-06-06T07:00:00Z",
+    "closed_at": null
+  },
+  "draft": true,
+  "commits_url": "https://api.github.com/repos/keymanapp/keyman/pulls/14013/commits",
+  "review_comments_url": "https://api.github.com/repos/keymanapp/keyman/pulls/14013/comments",
+  "review_comment_url": "https://api.github.com/repos/keymanapp/keyman/pulls/comments{/number}",
+  "comments_url": "https://api.github.com/repos/keymanapp/keyman/issues/14013/comments",
+  "statuses_url": "https://api.github.com/repos/keymanapp/keyman/statuses/00158fdeeefc98e7d2b507729e91fab845415f6f",
+  "head": {
+    "label": "keymanapp:feat/developer/kmc-convert-validateKeylayout",
+    "ref": "feat/developer/kmc-convert-validateKeylayout",
+    "sha": "00158fdeeefc98e7d2b507729e91fab845415f6f",
+    "user": {
+      "login": "keymanapp",
+      "id": 12402926,
+      "node_id": "MDEyOk9yZ2FuaXphdGlvbjEyNDAyOTI2",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12402926?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp",
+      "html_url": "https://github.com/keymanapp",
+      "followers_url": "https://api.github.com/users/keymanapp/followers",
+      "following_url": "https://api.github.com/users/keymanapp/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp/repos",
+      "events_url": "https://api.github.com/users/keymanapp/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp/received_events",
+      "type": "Organization",
+      "user_view_type": "public",
+      "site_admin": false
+    },
+    "repo": {
+      "id": 26063183,
+      "node_id": "MDEwOlJlcG9zaXRvcnkyNjA2MzE4Mw==",
+      "name": "keyman",
+      "full_name": "keymanapp/keyman",
+      "private": false,
+      "owner": {
+        "login": "keymanapp",
+        "id": 12402926,
+        "node_id": "MDEyOk9yZ2FuaXphdGlvbjEyNDAyOTI2",
+        "avatar_url": "https://avatars.githubusercontent.com/u/12402926?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/keymanapp",
+        "html_url": "https://github.com/keymanapp",
+        "followers_url": "https://api.github.com/users/keymanapp/followers",
+        "following_url": "https://api.github.com/users/keymanapp/following{/other_user}",
+        "gists_url": "https://api.github.com/users/keymanapp/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/keymanapp/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/keymanapp/subscriptions",
+        "organizations_url": "https://api.github.com/users/keymanapp/orgs",
+        "repos_url": "https://api.github.com/users/keymanapp/repos",
+        "events_url": "https://api.github.com/users/keymanapp/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/keymanapp/received_events",
+        "type": "Organization",
+        "user_view_type": "public",
+        "site_admin": false
+      },
+      "html_url": "https://github.com/keymanapp/keyman",
+      "description": "Keyman cross platform input methods system running on Android, iOS, Linux, macOS, Windows and mobile and desktop web",
+      "fork": false,
+      "url": "https://api.github.com/repos/keymanapp/keyman",
+      "forks_url": "https://api.github.com/repos/keymanapp/keyman/forks",
+      "keys_url": "https://api.github.com/repos/keymanapp/keyman/keys{/key_id}",
+      "collaborators_url": "https://api.github.com/repos/keymanapp/keyman/collaborators{/collaborator}",
+      "teams_url": "https://api.github.com/repos/keymanapp/keyman/teams",
+      "hooks_url": "https://api.github.com/repos/keymanapp/keyman/hooks",
+      "issue_events_url": "https://api.github.com/repos/keymanapp/keyman/issues/events{/number}",
+      "events_url": "https://api.github.com/repos/keymanapp/keyman/events",
+      "assignees_url": "https://api.github.com/repos/keymanapp/keyman/assignees{/user}",
+      "branches_url": "https://api.github.com/repos/keymanapp/keyman/branches{/branch}",
+      "tags_url": "https://api.github.com/repos/keymanapp/keyman/tags",
+      "blobs_url": "https://api.github.com/repos/keymanapp/keyman/git/blobs{/sha}",
+      "git_tags_url": "https://api.github.com/repos/keymanapp/keyman/git/tags{/sha}",
+      "git_refs_url": "https://api.github.com/repos/keymanapp/keyman/git/refs{/sha}",
+      "trees_url": "https://api.github.com/repos/keymanapp/keyman/git/trees{/sha}",
+      "statuses_url": "https://api.github.com/repos/keymanapp/keyman/statuses/{sha}",
+      "languages_url": "https://api.github.com/repos/keymanapp/keyman/languages",
+      "stargazers_url": "https://api.github.com/repos/keymanapp/keyman/stargazers",
+      "contributors_url": "https://api.github.com/repos/keymanapp/keyman/contributors",
+      "subscribers_url": "https://api.github.com/repos/keymanapp/keyman/subscribers",
+      "subscription_url": "https://api.github.com/repos/keymanapp/keyman/subscription",
+      "commits_url": "https://api.github.com/repos/keymanapp/keyman/commits{/sha}",
+      "git_commits_url": "https://api.github.com/repos/keymanapp/keyman/git/commits{/sha}",
+      "comments_url": "https://api.github.com/repos/keymanapp/keyman/comments{/number}",
+      "issue_comment_url": "https://api.github.com/repos/keymanapp/keyman/issues/comments{/number}",
+      "contents_url": "https://api.github.com/repos/keymanapp/keyman/contents/{+path}",
+      "compare_url": "https://api.github.com/repos/keymanapp/keyman/compare/{base}...{head}",
+      "merges_url": "https://api.github.com/repos/keymanapp/keyman/merges",
+      "archive_url": "https://api.github.com/repos/keymanapp/keyman/{archive_format}{/ref}",
+      "downloads_url": "https://api.github.com/repos/keymanapp/keyman/downloads",
+      "issues_url": "https://api.github.com/repos/keymanapp/keyman/issues{/number}",
+      "pulls_url": "https://api.github.com/repos/keymanapp/keyman/pulls{/number}",
+      "milestones_url": "https://api.github.com/repos/keymanapp/keyman/milestones{/number}",
+      "notifications_url": "https://api.github.com/repos/keymanapp/keyman/notifications{?since,all,participating}",
+      "labels_url": "https://api.github.com/repos/keymanapp/keyman/labels{/name}",
+      "releases_url": "https://api.github.com/repos/keymanapp/keyman/releases{/id}",
+      "deployments_url": "https://api.github.com/repos/keymanapp/keyman/deployments",
+      "created_at": "2014-11-01T21:01:44Z",
+      "updated_at": "2025-05-31T18:02:06Z",
+      "pushed_at": "2025-05-31T18:02:03Z",
+      "git_url": "git://github.com/keymanapp/keyman.git",
+      "ssh_url": "git@github.com:keymanapp/keyman.git",
+      "clone_url": "https://github.com/keymanapp/keyman.git",
+      "svn_url": "https://github.com/keymanapp/keyman",
+      "homepage": "https://keyman.com/",
+      "size": 489713,
+      "stargazers_count": 456,
+      "watchers_count": 456,
+      "language": "Pascal",
+      "has_issues": true,
+      "has_projects": true,
+      "has_downloads": true,
+      "has_wiki": true,
+      "has_pages": false,
+      "has_discussions": false,
+      "forks_count": 120,
+      "mirror_url": null,
+      "archived": false,
+      "disabled": false,
+      "open_issues_count": 1043,
+      "license": {
+        "key": "other",
+        "name": "Other",
+        "spdx_id": "NOASSERTION",
+        "url": null,
+        "node_id": "MDc6TGljZW5zZTA="
+      },
+      "allow_forking": true,
+      "is_template": false,
+      "web_commit_signoff_required": false,
+      "topics": [
+        "android",
+        "css",
+        "hacktoberfest",
+        "ios",
+        "javascript",
+        "keyboard",
+        "keyboard-layouts",
+        "keyman",
+        "linux",
+        "macos",
+        "unicode",
+        "web",
+        "windows"
+      ],
+      "visibility": "public",
+      "forks": 120,
+      "open_issues": 1043,
+      "watchers": 456,
+      "default_branch": "master"
+    }
+  },
+  "base": {
+    "label": "keymanapp:feat/developer/kmc-convert",
+    "ref": "feat/developer/kmc-convert",
+    "sha": "c7f6d15105920d8df18d8973b4f24846fa14ea27",
+    "user": {
+      "login": "keymanapp",
+      "id": 12402926,
+      "node_id": "MDEyOk9yZ2FuaXphdGlvbjEyNDAyOTI2",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12402926?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/keymanapp",
+      "html_url": "https://github.com/keymanapp",
+      "followers_url": "https://api.github.com/users/keymanapp/followers",
+      "following_url": "https://api.github.com/users/keymanapp/following{/other_user}",
+      "gists_url": "https://api.github.com/users/keymanapp/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/keymanapp/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/keymanapp/subscriptions",
+      "organizations_url": "https://api.github.com/users/keymanapp/orgs",
+      "repos_url": "https://api.github.com/users/keymanapp/repos",
+      "events_url": "https://api.github.com/users/keymanapp/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/keymanapp/received_events",
+      "type": "Organization",
+      "user_view_type": "public",
+      "site_admin": false
+    },
+    "repo": {
+      "id": 26063183,
+      "node_id": "MDEwOlJlcG9zaXRvcnkyNjA2MzE4Mw==",
+      "name": "keyman",
+      "full_name": "keymanapp/keyman",
+      "private": false,
+      "owner": {
+        "login": "keymanapp",
+        "id": 12402926,
+        "node_id": "MDEyOk9yZ2FuaXphdGlvbjEyNDAyOTI2",
+        "avatar_url": "https://avatars.githubusercontent.com/u/12402926?v=4",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/keymanapp",
+        "html_url": "https://github.com/keymanapp",
+        "followers_url": "https://api.github.com/users/keymanapp/followers",
+        "following_url": "https://api.github.com/users/keymanapp/following{/other_user}",
+        "gists_url": "https://api.github.com/users/keymanapp/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/keymanapp/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/keymanapp/subscriptions",
+        "organizations_url": "https://api.github.com/users/keymanapp/orgs",
+        "repos_url": "https://api.github.com/users/keymanapp/repos",
+        "events_url": "https://api.github.com/users/keymanapp/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/keymanapp/received_events",
+        "type": "Organization",
+        "user_view_type": "public",
+        "site_admin": false
+      },
+      "html_url": "https://github.com/keymanapp/keyman",
+      "description": "Keyman cross platform input methods system running on Android, iOS, Linux, macOS, Windows and mobile and desktop web",
+      "fork": false,
+      "url": "https://api.github.com/repos/keymanapp/keyman",
+      "forks_url": "https://api.github.com/repos/keymanapp/keyman/forks",
+      "keys_url": "https://api.github.com/repos/keymanapp/keyman/keys{/key_id}",
+      "collaborators_url": "https://api.github.com/repos/keymanapp/keyman/collaborators{/collaborator}",
+      "teams_url": "https://api.github.com/repos/keymanapp/keyman/teams",
+      "hooks_url": "https://api.github.com/repos/keymanapp/keyman/hooks",
+      "issue_events_url": "https://api.github.com/repos/keymanapp/keyman/issues/events{/number}",
+      "events_url": "https://api.github.com/repos/keymanapp/keyman/events",
+      "assignees_url": "https://api.github.com/repos/keymanapp/keyman/assignees{/user}",
+      "branches_url": "https://api.github.com/repos/keymanapp/keyman/branches{/branch}",
+      "tags_url": "https://api.github.com/repos/keymanapp/keyman/tags",
+      "blobs_url": "https://api.github.com/repos/keymanapp/keyman/git/blobs{/sha}",
+      "git_tags_url": "https://api.github.com/repos/keymanapp/keyman/git/tags{/sha}",
+      "git_refs_url": "https://api.github.com/repos/keymanapp/keyman/git/refs{/sha}",
+      "trees_url": "https://api.github.com/repos/keymanapp/keyman/git/trees{/sha}",
+      "statuses_url": "https://api.github.com/repos/keymanapp/keyman/statuses/{sha}",
+      "languages_url": "https://api.github.com/repos/keymanapp/keyman/languages",
+      "stargazers_url": "https://api.github.com/repos/keymanapp/keyman/stargazers",
+      "contributors_url": "https://api.github.com/repos/keymanapp/keyman/contributors",
+      "subscribers_url": "https://api.github.com/repos/keymanapp/keyman/subscribers",
+      "subscription_url": "https://api.github.com/repos/keymanapp/keyman/subscription",
+      "commits_url": "https://api.github.com/repos/keymanapp/keyman/commits{/sha}",
+      "git_commits_url": "https://api.github.com/repos/keymanapp/keyman/git/commits{/sha}",
+      "comments_url": "https://api.github.com/repos/keymanapp/keyman/comments{/number}",
+      "issue_comment_url": "https://api.github.com/repos/keymanapp/keyman/issues/comments{/number}",
+      "contents_url": "https://api.github.com/repos/keymanapp/keyman/contents/{+path}",
+      "compare_url": "https://api.github.com/repos/keymanapp/keyman/compare/{base}...{head}",
+      "merges_url": "https://api.github.com/repos/keymanapp/keyman/merges",
+      "archive_url": "https://api.github.com/repos/keymanapp/keyman/{archive_format}{/ref}",
+      "downloads_url": "https://api.github.com/repos/keymanapp/keyman/downloads",
+      "issues_url": "https://api.github.com/repos/keymanapp/keyman/issues{/number}",
+      "pulls_url": "https://api.github.com/repos/keymanapp/keyman/pulls{/number}",
+      "milestones_url": "https://api.github.com/repos/keymanapp/keyman/milestones{/number}",
+      "notifications_url": "https://api.github.com/repos/keymanapp/keyman/notifications{?since,all,participating}",
+      "labels_url": "https://api.github.com/repos/keymanapp/keyman/labels{/name}",
+      "releases_url": "https://api.github.com/repos/keymanapp/keyman/releases{/id}",
+      "deployments_url": "https://api.github.com/repos/keymanapp/keyman/deployments",
+      "created_at": "2014-11-01T21:01:44Z",
+      "updated_at": "2025-05-31T18:02:06Z",
+      "pushed_at": "2025-05-31T18:02:03Z",
+      "git_url": "git://github.com/keymanapp/keyman.git",
+      "ssh_url": "git@github.com:keymanapp/keyman.git",
+      "clone_url": "https://github.com/keymanapp/keyman.git",
+      "svn_url": "https://github.com/keymanapp/keyman",
+      "homepage": "https://keyman.com/",
+      "size": 489713,
+      "stargazers_count": 456,
+      "watchers_count": 456,
+      "language": "Pascal",
+      "has_issues": true,
+      "has_projects": true,
+      "has_downloads": true,
+      "has_wiki": true,
+      "has_pages": false,
+      "has_discussions": false,
+      "forks_count": 120,
+      "mirror_url": null,
+      "archived": false,
+      "disabled": false,
+      "open_issues_count": 1043,
+      "license": {
+        "key": "other",
+        "name": "Other",
+        "spdx_id": "NOASSERTION",
+        "url": null,
+        "node_id": "MDc6TGljZW5zZTA="
+      },
+      "allow_forking": true,
+      "is_template": false,
+      "web_commit_signoff_required": false,
+      "topics": [
+        "android",
+        "css",
+        "hacktoberfest",
+        "ios",
+        "javascript",
+        "keyboard",
+        "keyboard-layouts",
+        "keyman",
+        "linux",
+        "macos",
+        "unicode",
+        "web",
+        "windows"
+      ],
+      "visibility": "public",
+      "forks": 120,
+      "open_issues": 1043,
+      "watchers": 456,
+      "default_branch": "master"
+    }
+  },
+  "_links": {
+    "self": {
+      "href": "https://api.github.com/repos/keymanapp/keyman/pulls/14013"
+    },
+    "html": {
+      "href": "https://github.com/keymanapp/keyman/pull/14013"
+    },
+    "issue": {
+      "href": "https://api.github.com/repos/keymanapp/keyman/issues/14013"
+    },
+    "comments": {
+      "href": "https://api.github.com/repos/keymanapp/keyman/issues/14013/comments"
+    },
+    "review_comments": {
+      "href": "https://api.github.com/repos/keymanapp/keyman/pulls/14013/comments"
+    },
+    "review_comment": {
+      "href": "https://api.github.com/repos/keymanapp/keyman/pulls/comments{/number}"
+    },
+    "commits": {
+      "href": "https://api.github.com/repos/keymanapp/keyman/pulls/14013/commits"
+    },
+    "statuses": {
+      "href": "https://api.github.com/repos/keymanapp/keyman/statuses/00158fdeeefc98e7d2b507729e91fab845415f6f"
+    }
+  },
+  "author_association": "CONTRIBUTOR",
+  "auto_merge": null,
+  "active_lock_reason": null,
+  "merged": false,
+  "mergeable": false,
+  "rebaseable": false,
+  "mergeable_state": "dirty",
+  "merged_by": null,
+  "comments": 1,
+  "review_comments": 0,
+  "maintainer_can_modify": false,
+  "commits": 5,
+  "additions": 639,
+  "deletions": 12,
+  "changed_files": 13
+}
\ No newline at end of file
diff --git a/resources/build/test/build-bot/pr-9999-commits.txt b/resources/build/test/build-bot/pr-9999-commits.txt
new file mode 100644
index 0000000000..ac257dfa8e
--- /dev/null
+++ b/resources/build/test/build-bot/pr-9999-commits.txt
@@ -0,0 +1,17 @@
+[
+  {
+    "commit": {
+      "message": "maint(common): test\nBuild-bot: build windows\n"
+    }
+  },
+  {
+    "commit": {
+      "message": "maint(common): test\nBuild-bot: release windows\n"
+    }
+  },
+  {
+    "commit": {
+      "message": "maint(common): test\nBuild-bot: skip windows\n"
+    }
+  }
+]
diff --git a/resources/build/test/build-bot/pr-9999-data.txt b/resources/build/test/build-bot/pr-9999-data.txt
new file mode 100644
index 0000000000..2894897ccf
--- /dev/null
+++ b/resources/build/test/build-bot/pr-9999-data.txt
@@ -0,0 +1,3 @@
+{
+  "body": "Build-bot: release developer\r\nBuild-bot: skip windows\r\n"
+}
\ No newline at end of file
diff --git a/resources/build/test/build-bot/trigger-build-bot.test.sh b/resources/build/test/build-bot/trigger-build-bot.test.sh
new file mode 100755
index 0000000000..de2f3d5214
--- /dev/null
+++ b/resources/build/test/build-bot/trigger-build-bot.test.sh
@@ -0,0 +1,212 @@
+#!/usr/bin/env bash
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
+# END STANDARD BUILD SCRIPT INCLUDE
+
+. "${THIS_SCRIPT_PATH}/../../trigger-definitions.inc.sh"
+. "${THIS_SCRIPT_PATH}/../../trigger-build-bot.inc.sh"
+. "${THIS_SCRIPT_PATH}/../test-utils.inc.sh"
+. "${KEYMAN_ROOT}/resources/build/jq.inc.sh"
+
+# Initialize builder, no input parameters needed for these tests
+builder_parse ""
+
+readonly ALL_BUILD_PLATFORMS_SKIP_EXPECTED='[ios]="skip" [web]="skip" [linux]="skip" [common_mac]="skip" [common_windows]="skip" [mac]="skip" [windows]="skip" [common_web]="skip" [android]="skip" [developer]="skip" [common_linux]="skip"'
+readonly ALL_BUILD_PLATFORMS_BUILD_EXPECTED='[ios]="build" [web]="build" [linux]="build" [common_mac]="build" [common_windows]="build" [mac]="build" [windows]="build" [common_web]="build" [android]="build" [developer]="build" [common_linux]="build"'
+
+#----------------------------------------------------------------------------------------------------
+# Test build bot message parsing (e2e)
+#----------------------------------------------------------------------------------------------------
+
+test_build_bot_check_messages() {
+  builder_echo start test_build_bot_check_messages 'START TEST: build_bot_check_messages'
+
+  # Mostly real data (only Build-bot commands edited for test)
+  _do_test_build_bot_check_messages_file 14013 "[windows]=release" "$ALL_BUILD_PLATFORMS_SKIP_EXPECTED"
+  # Simplified data for testing Build-bot command sequences only
+  _do_test_build_bot_check_messages_file 9999 "[windows]=release" '[windows]="skip" [developer]="release"'
+
+  # test another sequence of commands
+  _do_test_build_bot_check_messages_inline 8 "[windows]=release" '[common]="release" [windows]="skip" [developer]="build"' '{ "body": "Build-bot: skip windows\nBuild-bot: build developer\nBuild-bot: release common" }' '[]'
+  _do_test_build_bot_check_messages_inline 9 "[windows]=release" '[common]="release" [windows]="skip" [developer]="build"' '{ "body": "Build-bot: skip:windows build:developer release:common" }' '[]'
+  _do_test_build_bot_check_messages_inline 10 "[windows]=release" '[common]="release" [windows]="build"' '{ "body": "Build-bot: skip:windows build release:common" }' '[]'
+
+  # Test some bad inputs
+  _do_test_build_bot_check_messages_inline 1 "[windows]=release" '[windows]="release"' '{}' '[{ "commit": { "message": "maint(common): test\nBuild-bot: foo windows\n" }}]'
+  # empty body, 'foo windows' in commit
+  _do_test_build_bot_check_messages_inline 2 "[windows]=release" '[windows]="release"' '{  "body": "" }' '[{ "commit": { "message": "maint(common): test\nBuild-bot: foo windows\n" }}]'
+  # attempts to escape jail
+  _do_test_build_bot_check_messages_inline 3 "[windows]=release" '[windows]="release"' '{  "body": "Build-bot: '"'"'echo foo" }' '[{ "commit": { "message": "maint(common): test\n" }}]'
+  _do_test_build_bot_check_messages_inline 4 "[windows]=release" '[windows]="release"' '{  "body": "Build-bot: echo *" }' '[{ "commit": { "message": "maint(common): test\n" }}]'
+  _do_test_build_bot_check_messages_inline 5 "[windows]=release" '[windows]="release"' '{  "body": "Build-bot: \\0" }' '[{ "commit": { "message": "maint(common): test\n" }}]'
+  _do_test_build_bot_check_messages_inline 5 "[windows]=release" '[windows]="release"' '{  "body": "Build-bot: `echo escaped`" }' '[{ "commit": { "message": "maint(common): test\n" }}]'
+  _do_test_build_bot_check_messages_inline 6 "[windows]=release" '[windows]="release"' '{  "body": "Build-bot: ' '[{ "commit": { "message": "maint(common): test\n" }}]'
+  # incomplete command
+  _do_test_build_bot_check_messages_inline 7 "[windows]=release" '[windows]="release"' '{  "body": "Build-bot: " }' '[{ "commit": { "message": "maint(common): test\n" }}]'
+
+  builder_echo end test_build_bot_check_messages success 'SUCCESS: build_bot_check_messages'
+}
+
+#
+# Test a set of Build-bot commands from a file
+#
+# Parameters:
+#   1: PR number
+#   2: Input build platforms based on touched files in PR
+#   3: Expected build command
+_do_test_build_bot_check_messages_file() {
+  local prnum=$1
+  eval "declare -gA build_platforms=($2)"
+  eval "declare -A expected_build_platforms=($3)"
+
+  build_bot_check_messages $prnum "$(cat ${THIS_SCRIPT_PATH}/pr-$prnum-data.txt)" "$(cat ${THIS_SCRIPT_PATH}/pr-$prnum-commits.txt)"
+
+  for i in "${!expected_build_platforms[@]}"; do
+    assert-equal "${build_platforms[$i]:-missing}" "${expected_build_platforms[$i]:-missing}" "PR #$prnum: build_platforms[$i]"
+  done
+  for i in "${!build_platforms[@]}"; do
+    assert-equal "${build_platforms[$i]:-missing}" "${expected_build_platforms[$i]:-missing}" "PR #$prnum: build_platforms[$i]"
+  done
+}
+
+#
+# Test a set of Build-bot commands from parameters
+#
+# Parameters:
+#   1: PR number
+#   2: Input build platforms based on touched files in PR
+#   3: Expected build command
+#   4: JSON PR details (GitHub PR format)
+#   5: JSON commit messages (GitHub PR format)
+_do_test_build_bot_check_messages_inline() {
+  local prnum=$1
+  eval "declare -gA build_platforms=($2)"
+  eval "declare -A expected_build_platforms=($3)"
+
+  local prinfo="$4"
+  local prcommits="$5"
+
+  build_bot_check_messages $prnum "$prinfo" "$prcommits"
+
+  for i in "${!expected_build_platforms[@]}"; do
+    assert-equal "${build_platforms[$i]:-missing}" "${expected_build_platforms[$i]:-missing}" "PR #$prnum: build_platforms[$i]"
+  done
+  for i in "${!build_platforms[@]}"; do
+    assert-equal "${build_platforms[$i]:-missing}" "${expected_build_platforms[$i]:-missing}" "PR #$prnum: build_platforms[$i]"
+  done
+}
+
+#----------------------------------------------------------------------------------------------------
+# Test parsing of a single Build-bot command
+#----------------------------------------------------------------------------------------------------
+
+test_build_bot_update_commands() {
+  builder_echo start test_build_bot_update_commands 'START TEST: build_bot_update_commands'
+  _do_test_build_bot_update_commands '[windows]="release"' "skip:windows" '[windows]="skip"'
+  _do_test_build_bot_update_commands '[windows]="release"' "skip windows" '[windows]="skip"'
+  _do_test_build_bot_update_commands '[windows]="release"' "skip:windows,developer" '[windows]="skip" [developer]="skip"'
+  _do_test_build_bot_update_commands '[windows]="release"' "skip windows,developer" '[windows]="skip" [developer]="skip"'
+  _do_test_build_bot_update_commands '[windows]="release"' "build:developer" '[windows]="release" [developer]="build"'
+  _do_test_build_bot_update_commands '[windows]="release"' "build developer" '[windows]="release" [developer]="build"'
+  _do_test_build_bot_update_commands '[windows]="release"' "skip:windows" '[windows]="skip"'
+  _do_test_build_bot_update_commands '[windows]="release"' "skip windows" '[windows]="skip"'
+  _do_test_build_bot_update_commands '[windows]="release"' "access:foo" '[windows]="release"'
+  # not testing invalid legacy command: _do_test_build_bot_update_commands '[windows]="release"' "access foo" '[windows]="release"'
+  _do_test_build_bot_update_commands '[windows]="release"' "build:foo" '[windows]="release"'
+  # not testing invalid legacy command: _do_test_build_bot_update_commands '[windows]="release"' "build foo" '[windows]="release"'
+  _do_test_build_bot_update_commands '[windows]="release"' "build:common" '[common]="build" [windows]="release"'
+  _do_test_build_bot_update_commands '[windows]="release"' "build common" '[common]="build" [windows]="release"'
+  _do_test_build_bot_update_commands '[windows]="release"' "build:all" "$ALL_BUILD_PLATFORMS_BUILD_EXPECTED"
+  _do_test_build_bot_update_commands '[windows]="release"' "build all" "$ALL_BUILD_PLATFORMS_BUILD_EXPECTED"
+  builder_echo end test_build_bot_update_commands success 'SUCCESS: build_bot_update_commands'
+}
+
+#
+# Test a command
+#
+# Parameters:
+#   1: starting build array based on PR files changed
+#   2: build-bot command
+#   3: expected finishing build array
+#
+_do_test_build_bot_update_commands() {
+  eval "declare -gA build_platforms=($1)"
+  local update_command="$2"
+  eval "declare -A expected_build_platforms=($3)"
+
+  build_bot_update_commands $update_command
+
+  for i in "${!expected_build_platforms[@]}"; do
+    assert-equal "${build_platforms[$i]}" "${expected_build_platforms[$i]}" "build_platforms[$i]"
+  done
+  for i in "${!build_platforms[@]}"; do
+    assert-equal "${build_platforms[$i]}" "${expected_build_platforms[$i]}" "build_platforms[$i]"
+  done
+}
+
+#----------------------------------------------------------------------------------------------------
+
+test_build_bot_verify_platforms() {
+  builder_echo start test_build_bot_verify_platforms 'START TEST: build_bot_verify_platforms'
+  _do_test_build_bot_verify_platforms "windows mac" "windows mac"
+  _do_test_build_bot_verify_platforms "windows foo" "windows"
+  _do_test_build_bot_verify_platforms "core" "core"
+  _do_test_build_bot_verify_platforms "all" "${available_platforms[*]}"
+  builder_echo end test_build_bot_verify_platforms success 'SUCCESS: build_bot_verify_platforms'
+}
+
+_do_test_build_bot_verify_platforms() {
+  local platforms=($1)
+  local expected_platforms=($2)
+
+  build_bot_verify_platforms platforms
+
+  assert-equal ${#platforms[@]} ${#expected_platforms[@]} "#platforms[@]"
+  for i in "${!expected_platforms[@]}"; do
+    assert-equal "${platforms[$i]}" "${expected_platforms[$i]}" "platforms[$i]"
+  done
+}
+
+#----------------------------------------------------------------------------------------------------
+
+# If we have a Test-bot: skip, or no Test-bot: command, then we downgrade
+# 'release' to a 'build'
+
+test_test_bot_check_pr_body() {
+  builder_echo start test_test_bot_check_pr_body 'START TEST: test_bot_check_pr_body'
+  # Test-bot: skip means that we should only do a build+test, not a release build
+  _do_test_test_bot_check_pr_body 1 '[windows]="release"' '{ "body": "Test-bot: skip" }' '[windows]="build"'
+  # Empty body means that we should only do a build+test, not a release build
+  _do_test_test_bot_check_pr_body 2 '[windows]="release"' '{ "body": "" }' '[windows]="build"'
+  # '# User Testing' we will assume means there are unit tests
+  _do_test_test_bot_check_pr_body 3 '[windows]="release"' '{ "body": "Some text\n# User Testing\n" }' '[windows]="release"'
+  # Invalid test-bot command, treat as a skip
+  _do_test_test_bot_check_pr_body 4 '[windows]="release"' '{ "body": "Test-bot: " }' '[windows]="build"'
+  builder_echo end test_test_bot_check_pr_body success 'SUCCESS: test_bot_check_pr_body'
+}
+
+_do_test_test_bot_check_pr_body() {
+  local prnum=$1
+  eval "declare -gA build_platforms=($2)"
+  local prinfo="$3"
+  eval "declare -A expected_build_platforms=($4)"
+
+  test_bot_check_pr_body $prnum "$prinfo"
+
+  for i in "${!expected_build_platforms[@]}"; do
+    assert-equal "${build_platforms[$i]}" "${expected_build_platforms[$i]}" "PR #$prnum: build_platforms[$i]"
+  done
+  for i in "${!build_platforms[@]}"; do
+    assert-equal "${build_platforms[$i]}" "${expected_build_platforms[$i]}" "PR #$prnum: build_platforms[$i]"
+  done
+}
+
+#----------------------------------------------------------------------------------------------------
+
+test_build_bot_verify_platforms
+test_build_bot_update_commands
+test_build_bot_check_messages
+test_test_bot_check_pr_body
\ No newline at end of file
diff --git a/resources/build/test/build-utils-traps.test.sh b/resources/build/test/build-utils-traps.test.sh
index 3ed6d89a37..472990102b 100755
--- a/resources/build/test/build-utils-traps.test.sh
+++ b/resources/build/test/build-utils-traps.test.sh
@@ -5,10 +5,10 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 ##############
 
@@ -16,7 +16,7 @@ CHECK="${COLOR_GREEN}✔${COLOR_RESET}" # ✔
 CROSS="${COLOR_RED}❌${COLOR_RESET}" # ❌
 
 builder_describe \
-  "Provides actions useful for build-utils.sh trap-functionality unit testing.\nOnly one action may be set at a time." \
+  "Provides actions useful for builder-basic.inc.sh trap-functionality unit testing.\nOnly one action may be set at a time." \
   "error" \
   "error-in-function" \
   "incomplete"
diff --git a/resources/build/test/build.sh b/resources/build/test/build.sh
new file mode 100755
index 0000000000..d1dec4a505
--- /dev/null
+++ b/resources/build/test/build.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+################################ Main script ################################
+
+builder_describe \
+  "Run unit tests (defined in *.test*.sh or test.sh) for builder scripts" \
+  "test"
+
+builder_parse "$@"
+
+do_test() {
+  set +e
+
+  # TODO: return non-0 exit code if any of the tests fail
+  while IFS= read -r -d '' file
+  do
+    builder_echo start "${file}" "Running tests for ${file}"
+    "${file}"
+    builder_echo end "${file}" success "Finished running tests for ${file}"
+  done < <(find . -name \*.test*.sh -o -name test.sh -print0)
+}
+
+builder_run_action test  do_test
diff --git a/resources/build/test/builder-deps.test.sh b/resources/build/test/builder-deps.test.sh
index 926142c973..f4d4fd949e 100755
--- a/resources/build/test/builder-deps.test.sh
+++ b/resources/build/test/builder-deps.test.sh
@@ -5,10 +5,10 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 builder_describe \
   "Tests dependency builds" \
@@ -41,7 +41,7 @@ function test_dep_should_build() {
   if ! _builder_should_build_dep "$at" "resources/build/test/$dep"; then
     builder_die "FAIL: expecting to build dependency $dep for $at"
   else
-    echo "PASS: will build dependency $dep for $at"
+    builder_echo green "  ✓ PASS: will build dependency $dep for $at"
   fi
 }
 
@@ -52,7 +52,7 @@ function test_dep_should_not_build() {
   if _builder_should_build_dep "$at" "resources/build/test/$dep"; then
     builder_die "FAIL: not expecting to build dependency $dep for $at"
   else
-    echo "PASS: will not build dependency $dep for $at"
+    builder_echo green "  ✓ PASS: will not build dependency $dep for $at"
   fi
 }
 
@@ -119,7 +119,7 @@ test_dep_should_build     test:project       dep7
 # is missing
 builder_parse test
 if [[ "${_builder_chosen_action_targets[@]}" == "test:project test:bar build:project build:bar" ]]; then
-  echo "PASS: 'build' actions automatically added"
+  builder_echo green "  ✓ PASS: 'build' actions automatically added"
 else
   echo "All targets: ${_builder_chosen_action_targets[@]}"
   builder_die "FAIL: 'build' actions not automatically added, or unexpected action:targets added"
diff --git a/resources/build/test/builder-invalid-script-1.test.sh b/resources/build/test/builder-invalid-script-1.test.sh
index 098760ec63..e5b5c6c9d0 100755
--- a/resources/build/test/builder-invalid-script-1.test.sh
+++ b/resources/build/test/builder-invalid-script-1.test.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test that missing builder_describe causes an error exit 1
diff --git a/resources/build/test/builder-invalid-script-2.test.sh b/resources/build/test/builder-invalid-script-2.test.sh
index 5b3886d2e0..f68f57d7de 100755
--- a/resources/build/test/builder-invalid-script-2.test.sh
+++ b/resources/build/test/builder-invalid-script-2.test.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test that missing builder_parse causes an error exit 1
diff --git a/resources/build/test/builder-invalid-script-3.test.sh b/resources/build/test/builder-invalid-script-3.test.sh
index 811b4b43ef..40575cc4d8 100755
--- a/resources/build/test/builder-invalid-script-3.test.sh
+++ b/resources/build/test/builder-invalid-script-3.test.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test that error exit does not occur, should exit 0
diff --git a/resources/build/test/debug-deps/child/build.sh b/resources/build/test/debug-deps/child/build.sh
index a21fed0709..36dce11e3c 100755
--- a/resources/build/test/debug-deps/child/build.sh
+++ b/resources/build/test/debug-deps/child/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
@@ -12,10 +12,10 @@ builder_describe \
 function do_build() {
   # Test the debug flag
   builder_is_debug_build || builder_die "FAIL: child: expecting builder_is_debug_build to be true"
-  echo "PASS: child: builder_is_debug_build is true"
+  builder_echo green "  ✓ PASS: child: builder_is_debug_build is true"
 
   builder_has_option --debug || builder_die "FAIL: child: expecting builder_has_option --debug to be true"
-  echo "PASS: child: builder_has_option --debug is true"
+  builder_echo green "  ✓ PASS: child: builder_has_option --debug is true"
 }
 
 builder_parse "$@"
diff --git a/resources/build/test/debug-deps/child/dep/build.sh b/resources/build/test/debug-deps/child/dep/build.sh
index 477e05603f..8880752687 100755
--- a/resources/build/test/debug-deps/child/dep/build.sh
+++ b/resources/build/test/debug-deps/child/dep/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
@@ -12,10 +12,10 @@ builder_describe \
 function do_build() {
   # Test the debug flag
   builder_is_debug_build || builder_die "FAIL: child/dep: expecting builder_is_debug_build to be true"
-  echo "PASS: child/dep: builder_is_debug_build is true"
+  builder_echo green "  ✓ PASS: child/dep: builder_is_debug_build is true"
 
   builder_has_option --debug || builder_die "FAIL: child/dep: expecting builder_has_option --debug to be true"
-  echo "PASS: child/dep: builder_has_option --debug is true"
+  builder_echo green "  ✓ PASS: child/dep: builder_has_option --debug is true"
 }
 
 builder_parse "$@"
diff --git a/resources/build/test/debug-deps/dep/build.sh b/resources/build/test/debug-deps/dep/build.sh
index a9ae70a28e..ad25f89ad0 100755
--- a/resources/build/test/debug-deps/dep/build.sh
+++ b/resources/build/test/debug-deps/dep/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
@@ -13,10 +13,10 @@ builder_describe \
 function do_build() {
   # Test the debug flag
   builder_is_debug_build || builder_die "FAIL: dep: expecting builder_is_debug_build to be true"
-  echo "PASS: dep: builder_is_debug_build is true"
+  builder_echo green "  ✓ PASS: dep: builder_is_debug_build is true"
 
   builder_has_option --debug || builder_die "FAIL: dep: expecting builder_has_option --debug to be true"
-  echo "PASS: dep: builder_has_option --debug is true"
+  builder_echo green "  ✓ PASS: dep: builder_has_option --debug is true"
 }
 
 builder_parse "$@"
diff --git a/resources/build/test/debug-deps/dep/child/build.sh b/resources/build/test/debug-deps/dep/child/build.sh
index 6537857373..334f715640 100755
--- a/resources/build/test/debug-deps/dep/child/build.sh
+++ b/resources/build/test/debug-deps/dep/child/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
@@ -12,10 +12,10 @@ builder_describe \
 function do_build() {
   # Test the debug flag
   builder_is_debug_build || builder_die "FAIL: child/dep: expecting builder_is_debug_build to be true"
-  echo "PASS: child/dep: builder_is_debug_build is true"
+  builder_echo green "  ✓ PASS: child/dep: builder_is_debug_build is true"
 
   builder_has_option --debug || builder_die "FAIL: child/dep: expecting builder_has_option --debug to be true"
-  echo "PASS: child/dep: builder_has_option --debug is true"
+  builder_echo green "  ✓ PASS: child/dep: builder_has_option --debug is true"
 }
 
 builder_parse "$@"
diff --git a/resources/build/test/debug-deps/test.sh b/resources/build/test/debug-deps/test.sh
index 9ac32d474a..1ccbd45641 100755
--- a/resources/build/test/debug-deps/test.sh
+++ b/resources/build/test/debug-deps/test.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
@@ -11,10 +11,10 @@ builder_describe \
 
 function do_build() {
   builder_is_debug_build || builder_die "FAIL: parent: expecting builder_is_debug_build to be true"
-  echo "PASS: parent: builder_is_debug_build is true"
+  builder_echo green "  ✓ PASS: parent: builder_is_debug_build is true"
 
   builder_has_option --debug || builder_die "FAIL: parent: expecting builder_has_option --debug to be true"
-  echo "PASS: parent: builder_has_option --debug is true"
+  builder_echo green "  ✓ PASS: parent: builder_has_option --debug is true"
 }
 
 builder_parse build:child --debug
diff --git a/resources/build/test/dependencies/basic/app/build.sh b/resources/build/test/dependencies/basic/app/build.sh
index a8995d072a..452f957e0a 100755
--- a/resources/build/test/dependencies/basic/app/build.sh
+++ b/resources/build/test/dependencies/basic/app/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/dependencies/basic/library/build.sh b/resources/build/test/dependencies/basic/library/build.sh
index e0f5a58113..8d7aa9db37 100755
--- a/resources/build/test/dependencies/basic/library/build.sh
+++ b/resources/build/test/dependencies/basic/library/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/dependencies/error/app/build.sh b/resources/build/test/dependencies/error/app/build.sh
index 916da067b8..244365e1fa 100755
--- a/resources/build/test/dependencies/error/app/build.sh
+++ b/resources/build/test/dependencies/error/app/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/dependencies/error/error/build.sh b/resources/build/test/dependencies/error/error/build.sh
index d5ab14c44f..9c02a32888 100755
--- a/resources/build/test/dependencies/error/error/build.sh
+++ b/resources/build/test/dependencies/error/error/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/dependencies/targets/app/build.sh b/resources/build/test/dependencies/targets/app/build.sh
index 123b878f9a..e01c40f34f 100755
--- a/resources/build/test/dependencies/targets/app/build.sh
+++ b/resources/build/test/dependencies/targets/app/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/dependencies/targets/library/build.sh b/resources/build/test/dependencies/targets/library/build.sh
index 9239018258..7ad939a10b 100755
--- a/resources/build/test/dependencies/targets/library/build.sh
+++ b/resources/build/test/dependencies/targets/library/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/dependencies/test.sh b/resources/build/test/dependencies/test.sh
index ec9c65bea7..74a727721b 100755
--- a/resources/build/test/dependencies/test.sh
+++ b/resources/build/test/dependencies/test.sh
@@ -5,7 +5,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$THIS_SCRIPT_PATH"
@@ -43,4 +43,4 @@ echo ------------------------------------------------------------------
     fi
   ) || exit $?
 
-echo "PASS: all dependency tests ran as expected"
+builder_echo green "  ✓ PASS: all dependency tests ran as expected"
diff --git a/resources/build/test/ignored-flags/build.sh b/resources/build/test/ignored-flags/build.sh
index 4202cb538d..a4c75443e9 100755
--- a/resources/build/test/ignored-flags/build.sh
+++ b/resources/build/test/ignored-flags/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/ignored-flags/child/build.sh b/resources/build/test/ignored-flags/child/build.sh
index b891c7cb20..aba203c03f 100755
--- a/resources/build/test/ignored-flags/child/build.sh
+++ b/resources/build/test/ignored-flags/child/build.sh
@@ -5,7 +5,7 @@ echo "Params: $@"
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test missing actions and options
diff --git a/resources/build/test/ignored-flags/test.sh b/resources/build/test/ignored-flags/test.sh
index bb4660f294..b84ba5cc89 100755
--- a/resources/build/test/ignored-flags/test.sh
+++ b/resources/build/test/ignored-flags/test.sh
@@ -5,7 +5,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$THIS_SCRIPT_PATH"
diff --git a/resources/build/test/locate_emscripten.tests.sh b/resources/build/test/locate_emscripten.tests.sh
new file mode 100755
index 0000000000..2914510756
--- /dev/null
+++ b/resources/build/test/locate_emscripten.tests.sh
@@ -0,0 +1,284 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# Unit tests for locate_emscripten.inc.sh
+
+shopt -s inherit_errexit
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
+# END STANDARD BUILD SCRIPT INCLUDE
+
+# shellcheck disable=SC2154
+. "${KEYMAN_ROOT}/resources/locate_emscripten.inc.sh"
+. "${KEYMAN_ROOT}/resources/build/test/testing-framework.inc.sh"
+
+# Mocks
+
+function mocked_builder_die() {
+  echo "DIE: $*" 2>&1
+  exit 99
+}
+
+# Setup/Teardown
+
+function setup_file() {
+  # create a temporary directory where we create simulated emsdk files/folders
+  BASE_DIR=$(mktemp -d)
+
+  # start with clean environment
+  unset EMSCRIPTEN_BASE
+  unset EMCC
+}
+
+function setup() {
+  mkdir -p "${BASE_DIR}"
+  create_mock  builder_die  mocked_builder_die
+  create_mock  verify_emscripten_version
+}
+
+function teardown() {
+  [[ -v EMSCRIPTEN_BASE ]] && rm -rf "${EMSCRIPTEN_BASE}"
+  [[ -v EMCC ]] && rm -f "${EMCC}"
+  unset EMSCRIPTEN_BASE
+  unset EMCC
+  rm -rf "${BASE_DIR:-}"
+  unmock builder_die
+  unmock verify_emscripten_version
+}
+
+# Tests
+
+function test_locate_emscripten__with_EMSCRIPTEN_BASE_and_executable() {
+  # Setup
+  export EMSCRIPTEN_BASE="${BASE_DIR}/emsdk"
+  mkdir -p "${EMSCRIPTEN_BASE}"
+  touch "${EMSCRIPTEN_BASE}/emcc"
+  chmod +x "${EMSCRIPTEN_BASE}/emcc"
+
+  # Execute
+  result=$(locate_emscripten 2>&1)
+
+  # Verify
+  assert-succeeded $?
+  assert-equal "${result}" "verify_emscripten_version called"
+}
+
+function test_locate_emscripten__with_EMCC_set_and_executable() {
+  # Setup
+  export EMCC="${BASE_DIR}/emcc"
+  touch "${EMCC}"
+  chmod +x "${EMCC}"
+
+  # Execute
+  result=$(locate_emscripten 2>&1)
+
+  # Verify
+  assert-succeeded $?
+  assert-equal "${result}" "verify_emscripten_version called"
+}
+
+function test_locate_emscripten__with_emcc_on_path() {
+  # Setup
+  export PATH="${BASE_DIR}:${PATH}"
+  echo -e '#!/bin/sh\necho emcc called' > "${BASE_DIR}/emcc"
+  chmod +x "${BASE_DIR}/emcc"
+
+  # Execute
+  result=$(locate_emscripten 2>&1)
+
+  # Verify
+  assert-succeeded $?
+  assert-equal "${result}" "verify_emscripten_version called"
+}
+
+function test_locate_emscripten__not_found() {
+  # Execute
+  result=$(locate_emscripten 2>&1)
+
+  # Verify
+  assert-failed $?
+  assert-contains "${result}" "Could not locate emscripten" "result"
+}
+
+function test_locate_emscripten__not_executable() {
+  # Setup
+  export EMCC="${BASE_DIR}/emcc"
+  touch "${EMCC}"
+  chmod -x "${EMCC}"
+
+  # Execute
+  result=$(locate_emscripten 2>&1)
+
+  # Verify
+  assert-failed $?
+  assert-contains "${result}" "points to emcc but it is not executable" "result"
+}
+
+function test_locate_emscripten__with_EMSCRIPTEN_BASE_not_executable() {
+  # Setup
+  export EMSCRIPTEN_BASE="${BASE_DIR}/emsdk"
+  mkdir -p "${EMSCRIPTEN_BASE}"
+  touch "${EMSCRIPTEN_BASE}/emcc"
+  chmod -x "${EMSCRIPTEN_BASE}/emcc"
+
+  # Execute
+  result=$(locate_emscripten 2>&1)
+
+  # Verify
+  assert-failed $?
+  assert-contains "${result}" "contains emcc but it is not executable" "result"
+}
+
+function test_locate_emscripten__with_EMSCRIPTEN_BASE_missing_emcc() {
+  # Setup
+  export EMSCRIPTEN_BASE="${BASE_DIR}/emsdk"
+  mkdir -p "${EMSCRIPTEN_BASE}"
+
+  # Execute
+  result=$(locate_emscripten 2>&1)
+
+  # Verify
+  assert-failed $?
+  assert-contains "${result}" "does not point to emcc's folder" "result"
+}
+
+function test_locate_emscripten__with_EMSCRIPTEN_BASE_missing_dir() {
+  # Setup
+  EMSCRIPTEN_BASE="${BASE_DIR}/emsdk/upstream"
+  mkdir -p "${EMSCRIPTEN_BASE}"
+  export EMSCRIPTEN_BASE="${EMSCRIPTEN_BASE}/emscripten"
+
+  # Execute
+  result=$(locate_emscripten 2>&1)
+
+  # Verify
+  assert-failed $?
+  assert-contains "${result}" "Variable EMSCRIPTEN_BASE (${EMSCRIPTEN_BASE}) points to a non-existent directory" "result"
+}
+
+function test_locate_emscripten__with_EMSCRIPTEN_BASE_nonexistent_but_emsdk_exists() {
+  # Setup
+  local EMSDK_DIR="${BASE_DIR}/emsdk"
+  mkdir -p "${EMSDK_DIR}/upstream"
+  export EMSCRIPTEN_BASE="${EMSDK_DIR}/upstream/emscripten"
+  touch "${EMSDK_DIR}/emsdk"
+  chmod +x "${EMSDK_DIR}/emsdk"
+
+  # Execute
+  result=$(locate_emscripten 2>&1)
+
+  # Verify
+  assert-succeeded $?
+  assert-equal "${result}" "verify_emscripten_version called"
+}
+
+run_tests 1 "${LINENO}"
+
+#------------------------------------------------------------------------------
+
+NEW_START=${LINENO}
+
+function setup() {
+  mkdir -p "${BASE_DIR}"
+}
+
+function teardown() {
+  unset EMSCRIPTEN_BASE
+  unset KEYMAN_MIN_VERSION_EMSCRIPTEN
+  unmock git
+  unmock npm
+  unset _builder_offline
+  rm -rf "${BASE_DIR:-}"
+}
+
+function setup_file() {
+  BASE_DIR=$(mktemp -d)
+  teardown
+}
+
+function test_select_emscripten_version_with_emsdk__no_EMSCRIPTEN_BASE() {
+  # Execute
+  result=$(_select_emscripten_version_with_emsdk)
+
+  # Verify
+  assert-failed $?
+  assert-contains "${result}" "Variable EMSCRIPTEN_BASE must be set"
+}
+
+function test_select_emscripten_version_with_emsdk__no_MIN_VERSION_EMSCRIPTEN() {
+  # Setup
+  local EMSCRIPTEN_DIR="${BASE_DIR}/emsdk/upstream"
+  mkdir -p "${EMSCRIPTEN_DIR}"
+  export EMSCRIPTEN_BASE="${EMSCRIPTEN_DIR}/emscripten"
+
+  # Execute
+  result=$(_select_emscripten_version_with_emsdk)
+
+  # Verify
+  assert-failed $?
+  assert-contains "${result}" "Variable KEYMAN_MIN_VERSION_EMSCRIPTEN must be set"
+}
+
+function test_select_emscripten_version_with_emsdk__no_emsdk() {
+  # Setup
+  export EMSCRIPTEN_BASE="${BASE_DIR}/upstream/emscripten"
+  mkdir -p "${EMSCRIPTEN_BASE}"
+  KEYMAN_MIN_VERSION_EMSCRIPTEN="4.0.10"
+
+  # Execute
+  result=$(_select_emscripten_version_with_emsdk)
+
+  # Verify
+  assert-failed $?
+  assert-contains "${result}" "emsdk[.bat] should be in ${BASE_DIR}"
+}
+
+function test_select_emscripten_version_with_emsdk__emsdk() {
+  # Setup
+  export EMSCRIPTEN_BASE="${BASE_DIR}/upstream/emscripten"
+  mkdir -p "${EMSCRIPTEN_BASE}"
+  KEYMAN_MIN_VERSION_EMSCRIPTEN="4.0.10"
+  create_mock git
+  create_mock npm
+  echo -e '#!/bin/sh\necho "emsdk $* called"' > "${BASE_DIR}/emsdk"
+  chmod +x "${BASE_DIR}/emsdk"
+  _builder_offline=""
+
+  # Execute
+  result=$(_select_emscripten_version_with_emsdk)
+
+  # Verify
+  assert-succeeded $?
+  assert-contains "${result}" "emsdk install 4.0.10 called"
+  assert-contains "${result}" "git called"
+  assert-contains "${result}" "npm called"
+}
+
+function test_select_emscripten_version_with_emsdk__EMSCRIPTEN_BASE_nonexistent_but_emsdk_exists() {
+  # Setup
+  local EMSDK_DIR="${BASE_DIR}/emsdk"
+  mkdir -p "${EMSDK_DIR}/upstream"
+  export EMSCRIPTEN_BASE="${EMSDK_DIR}/upstream/emscripten"
+  KEYMAN_MIN_VERSION_EMSCRIPTEN="4.0.10"
+  create_mock git
+  create_mock npm
+  echo -e '#!/bin/sh\nmkdir -p ${EMSCRIPTEN_BASE} ; echo "emsdk $* called"' > "${EMSDK_DIR}/emsdk"
+  chmod +x "${EMSDK_DIR}/emsdk"
+  _builder_offline=""
+
+  # Execute
+  result=$(_select_emscripten_version_with_emsdk)
+
+  # Verify
+  assert-succeeded $?
+  assert-contains "${result}" "emsdk install 4.0.10 called"
+  assert-contains "${result}" "git called"
+  assert-contains "${result}" "npm called"
+}
+
+# TODO: write test for offline branch
+
+run_tests "${NEW_START}" "${LINENO}"
diff --git a/resources/build/test/test-utils.inc.sh b/resources/build/test/test-utils.inc.sh
index 47f0aca33e..48569bedae 100644
--- a/resources/build/test/test-utils.inc.sh
+++ b/resources/build/test/test-utils.inc.sh
@@ -1,14 +1,20 @@
+# shellcheck shell=bash
+
 function assert-equal() {
   local actual="$1"
   local expected="$2"
   local message=
+  local actual_to_show="'${actual}' "
   if [[ $# -gt 2 ]]; then
     message="$3: "
   fi
+  if [[ $# -gt 3 ]]; then
+    actual_to_show=""
+  fi
 
-  if [[ "$actual" != "$expected" ]]; then
-    builder_die "FAIL: ${message}expected actual '$actual' to equal expected '$expected'"
+  if [[ "${actual}" != "${expected}" ]]; then
+    builder_die "  ✕ FAIL: ${message}actual result '${actual}' should equal expected '${expected}'"
   else
-    builder_echo green "PASS: ${message}expected actual '$actual' to be equal to expected '$expected'"
+    builder_echo green "  ✓ PASS: ${message}result ${actual_to_show}is correct"
   fi
 }
diff --git a/resources/build/test/test.sh b/resources/build/test/test.sh
index 75bffe4637..12530335af 100755
--- a/resources/build/test/test.sh
+++ b/resources/build/test/test.sh
@@ -5,10 +5,10 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 cd "$THIS_SCRIPT_PATH"
 
@@ -109,7 +109,7 @@ builder_parse_test() {
 }
 
 builder_describe \
-  "Tests the build-utils.sh builder functions. This is merely an example." \
+  "Tests the builder-basic.inc.sh builder functions. This is merely an example." \
   "clean        Cleans up any build artifacts" \
   "build        Do some building" \
   "test         Does some test stuff" \
@@ -127,7 +127,7 @@ builder_describe \
 builder_parse_test "clean:app test:engine" "--power" clean:app test:engine --power
 
 if builder_has_option --power; then
-  echo "PASS: --power option found"
+  builder_echo green "  ✓ PASS: --power option found"
 else
   builder_die "FAIL: --power option not found"
 fi
@@ -135,7 +135,7 @@ fi
 builder_parse_test "clean:app test:engine" "--zoom" clean:app test:engine -z
 
 if builder_has_option --zoom; then
-  echo "PASS: --zoom option found"
+  builder_echo green "  ✓ PASS: --zoom option found"
 else
   builder_die "FAIL: --zoom option not found"
 fi
@@ -143,13 +143,13 @@ fi
 function verify_option() {
   local OPTIONNAME=$1
   local VARIABLE=$2
-  local EXCPECTED=$3
+  local EXPECTED=$3
 
   if builder_has_option ${OPTIONNAME}; then
-    if [[ ${!VARIABLE} == ${EXCPECTED} ]]; then
-      echo "PASS: ${OPTIONNAME} option variable \$${VARIABLE} has expected value '${EXCPECTED}'"
+    if [[ ${!VARIABLE} == ${EXPECTED} ]]; then
+      builder_echo green "  ✓ PASS: ${OPTIONNAME} option variable \$${VARIABLE} has expected value '${EXPECTED}'"
     else
-      builder_die "FAIL: ${OPTIONNAME} option variable \$${VARIABLE} had value '${!VARIABLE}' but should have had '${EXCPECTED}'"
+      builder_die "FAIL: ${OPTIONNAME} option variable \$${VARIABLE} had value '${!VARIABLE}' but should have had '${EXPECTED}'"
     fi
   else
     builder_die "FAIL: ${OPTIONNAME} option not found"
@@ -185,6 +185,53 @@ if [[ ${builder_extra_params[2]} != "three four five" ]]; then
   builder_die "FAIL: -- extra parameter 'three four five' not found"
 fi
 
+#----------------------------------------------------------------------
+# Test handling of unknown options
+echo -e "${COLOR_BLUE}## Running 'unknown options' tests${COLOR_RESET}"
+
+# Test long form option with --builder-ignore-unknown-options
+builder_parse --builder-ignore-unknown-options --some-other-option
+if ! builder_ignore_unknown_options; then
+  builder_die "FAIL: builder_ignore_unknown_options should be set"
+fi
+if [[ "${builder_ignored_options[@]}" != "--some-other-option" ]]; then
+  builder_die "FAIL: --builder-ignore-unknown-options did not collect --some-other-option"
+fi
+builder_echo green "  ✓ PASS: --builder-ignore-unknown-options, --some-other-option was collected but ignored"
+
+# Test short form option with --builder-ignore-unknown-options
+builder_parse --builder-ignore-unknown-options -x
+if ! builder_ignore_unknown_options; then
+  builder_die "FAIL: builder_ignore_unknown_options should be set"
+fi
+if [[ "${builder_ignored_options[@]}" != "-x" ]]; then
+  builder_die "FAIL: --builder-ignore-unknown-options '${builder_ignored_options[@]}' did not collect -x"
+fi
+builder_echo green "  ✓ PASS: --builder-ignore-unknown-options, -x was collected but ignored"
+
+# Test long form option without --builder-ignore-unknown-options
+(builder_parse --some-other-option >/dev/null) && EXIT_CODE=0 || EXIT_CODE=$?
+if [[ $EXIT_CODE != 64 ]]; then
+  builder_die "FAIL: without --builder-ignore-unknown-options, --some-other-option parameter should not have been recognized"
+fi
+builder_echo green "  ✓ PASS: without --builder-ignore-unknown-options, --some-other-option was not a recognized parameter"
+
+# Test short form option without --builder-ignore-unknown-options
+(builder_parse -x >/dev/null) && EXIT_CODE=0 || EXIT_CODE=$?
+if [[ $EXIT_CODE != 64 ]]; then
+  builder_die "FAIL: without --builder-ignore-unknown-options, -x parameter should not have been recognized"
+fi
+builder_echo green "  ✓ PASS: without --builder-ignore-unknown-options, -x was not a recognized parameter"
+
+# Test that ignored options variables are correct without --builder-ignore-unknown-options
+builder_parse test
+if builder_ignore_unknown_options; then
+  builder_die "FAIL: without --builder-ignore-unknown-options, builder_ignore_unknown_options() should not be set"
+fi
+if [[ ! -z "${builder_ignored_options[@]}" ]]; then
+  builder_die "FAIL: without --builder-ignore-unknown-options, builder_ignored_options should be empty"
+fi
+
 #----------------------------------------------------------------------
 # Test output of: --feature <foo> --bar <bar> --baz <baz> (#11676)
 echo -e "${COLOR_BLUE}## Testing output of: builder_parse --feature xyzzy --bar abc --baz def test${COLOR_RESET}"
diff --git a/resources/build/test/testing-framework.inc.sh b/resources/build/test/testing-framework.inc.sh
new file mode 100644
index 0000000000..ef1932630c
--- /dev/null
+++ b/resources/build/test/testing-framework.inc.sh
@@ -0,0 +1,264 @@
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# Simple bash unit testing framework
+
+assert-equal() {
+  local actual="$1"
+  local expected="$2"
+  local variable=
+  if [[ $# -gt 2 ]]; then
+    variable="$3 "
+  fi
+
+  if [[ "${actual}" != "${expected}" ]]; then
+    messages+=("- Actual ${variable}should equal expected:
+                             Actual  : '${actual}'
+                             Expected: '${expected}'
+
+                          ")
+    ((test_failures++))
+  fi
+}
+
+assert-contains() {
+  local actual="$1"
+  local expected="$2"
+  local variable=
+  if [[ $# -gt 2 ]]; then
+    variable="$3 "
+  fi
+
+  if [[ "${actual}" != *"${expected}"* ]]; then
+    messages+=("- Actual ${variable}should contain expected:
+                             Actual  : '${actual}'
+                             Expected: '${expected}'
+
+                          ")
+    ((test_failures++))
+  fi
+}
+
+assert-not-contains() {
+  local actual="$1"
+  local expected="$2"
+  local variable=
+  if [[ $# -gt 2 ]]; then
+    variable="$3 "
+  fi
+
+  if [[ "${actual}" == *"${expected}"* ]]; then
+    messages+=("- Actual ${variable}should not contain expected:
+                             Actual  : '${actual}'
+                             Expected: '${expected}'
+
+                          ")
+    ((test_failures++))
+  fi
+}
+
+assert-failed() {
+  local status="$1"
+
+  if [[ "${status}" == 0 ]]; then
+    messages+=("- Expected test to fail but it succeeded
+                          ")
+    ((test_failures++))
+  fi
+}
+
+assert-succeeded() {
+  local status="$1"
+
+  if [[ "${status}" != 0 ]]; then
+    messages+=("- Expected test to succeed but it failed
+                          ")
+    ((test_failures++))
+  fi
+}
+
+# setup() will run before each test
+# can be overriden in test script
+setup() {
+  true
+}
+
+# teardown() will run after each test
+# can be overriden in test script
+teardown() {
+  true
+}
+
+# setup_file() will run once before all tests in the file
+# can be overriden in test script
+setup_file() {
+  true
+}
+
+# teardown_file() will run once after all tests in the file
+# can be overriden in test script
+teardown_file() {
+  true
+}
+
+# Discover and run all tests in the current script
+#
+# Parameters:
+#  [$1 [$2]] / [first [last]] - optional range of lines in the tests script to search for tests.
+#                           This helps to split a test file into several sections where
+#                           each section can have separate setup/teardown functions.
+#  [$3] / test_file         Name of the test file. Usually unset. Defaults to BASH_ARGV0.
+#
+# 'run_tests' looks for tests that follow the following pattern:
+#   function test_name() {
+#     test code
+#   }
+run_tests() {
+  local test_count test_fail_count line func
+  local first="${1:-1}"
+  local last="${2:-$(wc -l < "${BASH_ARGV0}")}"
+  local file="${3:-${BASH_ARGV0}}"
+
+  test_count=0
+  test_fail_count=0
+
+  setup_file
+
+  # shellcheck disable=SC2312
+  while read -r line; do
+    func="$(_get_test_func "${line}")"
+    _run_single_test "${func}"
+  done < <(sed -n "${first},${last}p" "${file}" | grep -e "^\s*function\s*test_")
+
+  teardown_file
+
+  builder_echo green "Total of ${test_count} tests run, $((test_count - test_fail_count)) passed, ${test_fail_count} failed"
+
+  return "${test_fail_count}"
+}
+
+# Replace $FUNC with $MOCK
+#
+# Parameters:
+#   $1 FUNC - function/command to mock
+#   $2 MOCK - name of the mock function that replaces $FUNC
+create_mock() {
+  local FUNC="$1"
+  local MOCK="${2:-}"
+  local original_func_var="__original_${FUNC}"
+
+  if [[ -z "${MOCK}" ]]; then
+    MOCK="__default_mocked_${FUNC}"
+    _create_default_mock_func "${FUNC}" "${MOCK}"
+  fi
+
+  if ! builtin declare -F "${original_func_var}" >/dev/null 2>&1; then
+    # Save the original function
+    case "$(builtin type -t "${FUNC}")" in
+      function)
+        builtin eval "${original_func_var}() $(builtin declare -f "${FUNC}" | tail -n +2)"
+        ;;
+      builtin)
+        builtin eval "${original_func_var}() { builtin ${FUNC} \"\$@\"; }"
+        ;;
+      file)
+        builtin eval "${original_func_var}() { $(builtin command -v "${FUNC}") \"\$@\"; }"
+        ;;
+      *)
+        builder_echo error "Unhandled type for ${FUNC}: $(builtin type -t "${FUNC}")"
+        return 1
+        ;;
+    esac
+  fi
+
+  builtin eval "${FUNC}() $(builtin declare -f "${MOCK}" | tail -n +2)"
+}
+
+# Remove the mock for $FUNC and replace it with the original implementation
+#
+# Parameters:
+#   $1 FUNC - function/command to mock
+unmock() {
+  local FUNC="$1"
+  local original_func_var="__original_${FUNC}"
+  if builtin declare -f "${original_func_var}" >/dev/null 2>&1; then
+    builtin eval "${FUNC}() $(builtin declare -f "${original_func_var}" | tail -n +2)"
+  fi
+}
+
+# Create a mock function for $FUNC that simply outputs that it got called
+#
+# Parameters:
+#   $1 FUNC - function/command to mock
+#   $2 NAME - name of the mock function
+_create_default_mock_func() {
+  local FUNC="$1"
+  local NAME="$2"
+  builtin eval "${NAME}() { echo \"${FUNC} called\"; }"
+}
+
+_trim_start() {
+  local string="$1"
+  echo "${string#"${string%%[![:space:]]*}"}"
+}
+
+_trim_end() {
+  local string="$1"
+  echo "${string%"${string##*[![:space:]]}"}"
+}
+
+_get_test_func() {
+  local line="$1"
+  local name
+  name=${line#function}
+  name="$(_trim_start "${name}")"
+  name=${name%\{};
+  name="$(_trim_end "${name}")"
+  name=${name%)}
+  name="$(_trim_end "${name}")"
+  name=${name%(}
+  echo "${name}"
+}
+
+_test_wrapper() {
+  local func="$1"
+  ${func}
+  return "${test_failures}"
+}
+
+_run_single_test() {
+  local func="$1"
+  declare -a messages=()
+
+  # shellcheck disable=SC2154
+  if ${_builder_debug_internal}; then
+    builder_echo_debug "Running test ${func}"
+  fi
+
+  set +e
+  test_failures=0
+  ((test_count++))
+  setup
+
+  # shellcheck disable=SC2310
+  if _test_wrapper "${func}"; then
+    _passed "${func}"
+  else
+    ((test_fail_count++))
+    _failed "${func}"
+  fi
+
+  teardown
+  set -e
+}
+
+_passed() {
+  local testname="$1"
+  builder_echo green "  ✓ PASS: ${testname}"
+}
+
+_failed() {
+  local testname="$1"
+  builder_echo red "  ✕ FAIL: ${testname}
+                           ${messages[*]}"
+}
diff --git a/resources/build/test/testing-framework.tests.sh b/resources/build/test/testing-framework.tests.sh
new file mode 100755
index 0000000000..15d4597cba
--- /dev/null
+++ b/resources/build/test/testing-framework.tests.sh
@@ -0,0 +1,190 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# Unit tests for locate_emscripten.inc.sh
+
+# shellcheck disable=SC2317
+
+shopt -s inherit_errexit
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
+# END STANDARD BUILD SCRIPT INCLUDE
+
+# shellcheck disable=SC2154
+. "${KEYMAN_ROOT}/resources/build/test/testing-framework.inc.sh"
+
+function myfunc() {
+  echo "Hello world!"
+}
+
+function mocked_func() {
+  echo "Hello mock!"
+}
+
+teardown() {
+  unmock myfunc
+  unmock command
+  unmock more
+  alias xyz=
+}
+
+function test__create_mock__function_mockfunc() {
+  create_mock  myfunc  mocked_func
+  status=$?
+
+  assert-equal "$(myfunc)" "Hello mock!"
+  assert-equal "${status}" "0"
+}
+
+function test__create_mock__function_defaultmock() {
+  create_mock  myfunc
+  status=$?
+
+  assert-equal "$(myfunc)" "myfunc called"
+  assert-equal "${status}" "0"
+}
+
+function test__create_mock__builtin_mockfunc() {
+  create_mock  command  mocked_func
+  status=$?
+
+  assert-equal "$(command -v zip)" "Hello mock!"
+  assert-equal "${status}" "0"
+}
+
+function test__create_mock__builtin_defaultmock() {
+  create_mock  command
+  status=$?
+
+  assert-equal "$(command -v zip)" "command called"
+  assert-equal "${status}" "0"
+}
+
+function test__create_mock__file_mockfunc() {
+  create_mock  more  mocked_func
+  status=$?
+
+  assert-equal "$(more "${THIS_SCRIPT}")" "Hello mock!"
+  assert-equal "${status}" "0"
+}
+
+function test__create_mock__file_defaultmock() {
+  create_mock  more
+  status=$?
+
+  assert-equal "$(more "${THIS_SCRIPT}")" "more called"
+  assert-equal "${status}" "0"
+}
+
+function test__create_mock__alias() {
+  alias xyz=ls
+
+  result=$(create_mock  xyz 2>&1)
+  status=$?
+
+  # For some reason we don't get "alias" in the output
+  assert-contains "${result}" "Unhandled type for xyz:"
+  assert-equal "${status}" "1"
+}
+
+function test__create_mock__keyword() {
+  result=$(create_mock if 2>&1)
+  status=$?
+
+  assert-contains "${result}" "Unhandled type for if: keyword"
+  assert-equal "${status}" "1"
+}
+
+function test__create_mock__nonexisting() {
+  result=$(create_mock nonexisting 2>&1)
+  status=$?
+
+  assert-contains "${result}" "Unhandled type for nonexisting:"
+  assert-equal "${status}" "1"
+}
+
+function test__unmock__function() {
+  create_mock  myfunc
+  assert-contains "$(declare -f myfunc)" "myfunc called"
+
+  unmock myfunc
+  status=$?
+
+  assert-contains "$(declare -f myfunc)" "world"
+}
+
+function test__unmock__builtin() {
+  create_mock  command
+  assert-contains "$(declare -f command)" "command called"
+
+  unmock command
+  status=$?
+
+  assert-contains "$(declare -f command)" "builtin command"
+}
+
+function test__unmock__file() {
+  create_mock  more
+  assert-contains "$(declare -f more)" "more called"
+
+  unmock more
+  status=$?
+
+  assert-contains "$(declare -f more)" "/usr/bin/more"
+}
+
+function test__run_tests__reports_failures() {
+  local test_output test_output_contents
+  test_output=$(mktemp)
+  LAST_LINE="$(wc -l < "${BASH_ARGV0}")"
+
+  # Start a new shell that will run the tests
+  bash - > "${test_output}" <<EOF
+    . "$0" --recursive
+
+    # ${LAST_LINE} and ${BASH_ARGV0} intentionally not escaped!
+    run_tests "\${START_LAST_SECTION}" "${LAST_LINE}" "${BASH_ARGV0}"
+    status=\$?
+
+    unmock builder_echo
+    exit ${status}
+EOF
+  status=$?
+
+  test_output_contents="$(cat "${test_output}")"
+  rm -f "${test_output}"
+
+  assert-equal "${status}" 2
+  assert-contains "${test_output_contents}" "Total of 3 tests run, 1 passed, 2 failed"
+  assert-contains "${test_output_contents}" "FAIL: test_failing1"
+  assert-contains "${test_output_contents}" "FAIL: test_failing2"
+  assert-contains "${test_output_contents}" "PASS: test_succeeding1"
+}
+
+
+# shellcheck disable=SC2031
+if [[ "${1:-}" != "--recursive" ]]; then
+  run_tests 1 "${LINENO}"
+  exit
+fi
+
+#------------------------------------------------------------------------------
+# Tests that are run as part of 'test__run_tests__reports_failures'
+
+# shellcheck disable=SC2034
+START_LAST_SECTION="${LINENO}"
+
+function test_failing1() {
+  assert-failed 0
+}
+
+function test_failing2() {
+  assert-succeeded 1
+}
+
+function test_succeeding1() {
+  assert-succeeded 0
+}
diff --git a/resources/build/test/trap-test-builds.test.sh b/resources/build/test/trap-test-builds.test.sh
index 97d9e28f94..0c4a2d6e34 100755
--- a/resources/build/test/trap-test-builds.test.sh
+++ b/resources/build/test/trap-test-builds.test.sh
@@ -5,7 +5,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/resources/build/test/trees/build.sh b/resources/build/test/trees/build.sh
index 539b40f14d..1a37d15032 100755
--- a/resources/build/test/trees/build.sh
+++ b/resources/build/test/trees/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
@@ -24,7 +24,7 @@ builder_parse "$@"
 if builder_is_child_build; then
   builder_die "FAIL: builder_is_child_build should be false but was $_builder_is_child for the parent script"
 else
-  builder_echo "PASS: builder_is_child_build is false ($_builder_is_child) for the parent script"
+  builder_echo green "  ✓ PASS: builder_is_child_build is false ($_builder_is_child) for the parent script"
 fi
 
 # All child actions will generate files which we need to verify for test
@@ -41,7 +41,7 @@ function test_present() {
     if [ ! -f $target.$action ]; then
       builder_die "$CROSS FAIL: ./$target.$action to be present"
     else
-      echo -e "$CHECK PASS: ./$target.$action found as expected"
+      builder_echo green "  ✓ PASS: ./$target.$action found as expected"
     fi
   fi
 }
@@ -80,4 +80,4 @@ test_present child1 install
 
 builder_run_child_actions error
 
-echo Done
\ No newline at end of file
+echo Done
diff --git a/resources/build/test/trees/child1/build.sh b/resources/build/test/trees/child1/build.sh
index ef30f8a517..e03a692db8 100755
--- a/resources/build/test/trees/child1/build.sh
+++ b/resources/build/test/trees/child1/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
@@ -24,7 +24,7 @@ builder_parse "$@"
 if ! builder_is_child_build; then
   builder_die "FAIL: builder_is_child_build should return true but was $_builder_is_child for a child script"
 else
-  builder_echo "PASS: builder_is_child_build is true ($_builder_is_child) for the child script"
+  builder_echo green "  ✓ PASS: builder_is_child_build is true ($_builder_is_child) for the child script"
 fi
 
 function test_action() {
@@ -44,4 +44,4 @@ test_action install
 
 if builder_start_action error; then
   builder_die "This error action is supposed to die"
-fi
\ No newline at end of file
+fi
diff --git a/resources/build/test/trees/child2/build.sh b/resources/build/test/trees/child2/build.sh
index 240fbb42e7..50a76c2c4e 100755
--- a/resources/build/test/trees/child2/build.sh
+++ b/resources/build/test/trees/child2/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/trees/child3_renamed/src/build.sh b/resources/build/test/trees/child3_renamed/src/build.sh
index ab70161fb7..0dd5f63dec 100755
--- a/resources/build/test/trees/child3_renamed/src/build.sh
+++ b/resources/build/test/trees/child3_renamed/src/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
diff --git a/resources/build/test/trees/dep/build.sh b/resources/build/test/trees/dep/build.sh
index 2dd8f8ede3..7cb910dd4d 100755
--- a/resources/build/test/trees/dep/build.sh
+++ b/resources/build/test/trees/dep/build.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 # Test builder_describe_outputs and dependencies
@@ -20,7 +20,7 @@ builder_parse "$@"
 if builder_is_child_build; then
   builder_die "FAIL: builder_is_child_build should return false but was $_builder_is_child for a dependency script"
 else
-  builder_echo "PASS: builder_is_child_build is false ($_builder_is_child) for the dependency script"
+  builder_echo green "  ✓ PASS: builder_is_child_build is false ($_builder_is_child) for the dependency script"
 fi
 
 function test_action() {
diff --git a/resources/build/test/trees/test.sh b/resources/build/test/trees/test.sh
index 1abfdd6cc6..7be2b868a9 100755
--- a/resources/build/test/trees/test.sh
+++ b/resources/build/test/trees/test.sh
@@ -5,7 +5,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$THIS_SCRIPT_PATH"
diff --git a/resources/build/test/verify-colors.test.sh b/resources/build/test/verify-colors.test.sh
index 1c818f04f2..7651e6c860 100755
--- a/resources/build/test/verify-colors.test.sh
+++ b/resources/build/test/verify-colors.test.sh
@@ -5,7 +5,7 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 # END STANDARD BUILD SCRIPT INCLUDE
 
 builder_use_color true
diff --git a/resources/build/test/zip.inc.tests.sh b/resources/build/test/zip.inc.tests.sh
new file mode 100755
index 0000000000..056ddc2ce1
--- /dev/null
+++ b/resources/build/test/zip.inc.tests.sh
@@ -0,0 +1,343 @@
+#!/usr/bin/env bash
+# Unit tests for zip.inc.sh
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
+# END STANDARD BUILD SCRIPT INCLUDE
+
+# shellcheck disable=2154
+. "${KEYMAN_ROOT}/resources/build/zip.inc.sh"
+. "${KEYMAN_ROOT}/resources/build/test/testing-framework.inc.sh"
+
+# Mock command -v to simulate presence/absence of zip
+function command() {
+  if [[ "$1" == "-v" && "$2" == "zip" ]]; then
+    if [[ "${MOCK_ZIP_PRESENT:-1}" == "1" ]]; then
+      echo "/usr/bin/zip"
+      return 0
+    else
+      return 1
+    fi
+  fi
+  builtin command "$@"
+}
+
+# Helper to reset log and env
+function reset_zip_test_env() {
+  unset SEVENZ
+  unset SEVENZ_HOME
+  unset GO_FAST
+  MOCK_ZIP_PRESENT=1
+  export OSTYPE="linux"
+}
+
+function mock_zip() {
+  ZIP_CMD_LOG="zip $*"
+  return 0
+}
+function mock_7z() {
+  ZIP_CMD_LOG="7z $*"
+  return 0
+}
+
+function setup() {
+  reset_zip_test_env
+  ZIP_CMD_LOG=""
+  LOG_MSG=""
+
+  # Mock zip and 7z commands to capture invocation
+  create_mock zip mock_zip
+  create_mock 7z mock_7z
+
+  # Mock /custom/sevenz/7z.exe for Windows test
+  function /custom/sevenz/7z.exe() {
+    # shellcheck disable=SC2317
+    ZIP_CMD_LOG="/custom/sevenz/7z.exe $*"
+  }
+}
+
+function teardown() {
+  unmock zip
+  unmock 7z
+  unset /custom/sevenz/7z.exe
+  reset_zip_test_env
+}
+
+function test__add_zip_files__with_zip_basic() {
+  # Setup
+  MOCK_ZIP_PRESENT=1
+
+  # Execute
+  add_zip_files "archive.zip" file1.txt file2.txt
+
+  # Verify
+  assert-equal "${ZIP_CMD_LOG}" "zip archive.zip file1.txt file2.txt" "add_zip_files zip basic invocation"
+}
+
+function test__add_zip_files__with_zip_flags() {
+  # Setup
+  MOCK_ZIP_PRESENT=1
+
+  # Execute
+  add_zip_files "archive.zip" -r -q -9 file1.txt
+
+  # Verify
+  # -q and -9 are passed to zip, not 7z
+  assert-equal "${ZIP_CMD_LOG}" "zip -r -q -9 archive.zip file1.txt" "add_zip_files zip with flags"
+}
+
+function test__add_zip_files__with_zip_exclude_flag() {
+  # Setup
+  MOCK_ZIP_PRESENT=1
+
+  # Execute
+  add_zip_files "archive.zip" -x@exclude.lst file1.txt
+
+  # Verify
+  assert-equal "${ZIP_CMD_LOG}" "zip -x@exclude.lst archive.zip file1.txt" "add_zip_files zip with exclude flag"
+}
+
+function test__add_zip_files__with_zip_fast() {
+  # Setup
+  MOCK_ZIP_PRESENT=1
+  GO_FAST=1
+
+  # Execute
+  add_zip_files "archive.zip" file1.txt file2.txt
+
+  # Verify
+  assert-equal "${ZIP_CMD_LOG}" "zip -1 archive.zip file1.txt file2.txt" "add_zip_files zip GO_FAST"
+}
+
+function test__add_zip_files__with_7z_basic() {
+  # Setup
+  MOCK_ZIP_PRESENT=0
+
+  # Execute
+  add_zip_files "archive.7z" file1.txt file2.txt
+
+  # Verify
+  assert-equal "${ZIP_CMD_LOG}" "7z a archive.7z file1.txt file2.txt" "add_zip_files 7z basic invocation"
+}
+
+function test__add_zip_files__with_7z_flags() {
+  # Setup
+  MOCK_ZIP_PRESENT=0
+
+  # Execute
+  add_zip_files "archive.7z" -r -q -5 file1.txt
+
+  # Verify
+  # -r is passed, -q becomes -bd -bb0, -5 becomes -mx5
+  assert-equal "${ZIP_CMD_LOG}" "7z a -r -bd -bb0 -mx5 archive.7z file1.txt" "add_zip_files 7z with flags"
+}
+
+function test__add_zip_files__with_7z_exclude_flag() {
+  # Setup
+  MOCK_ZIP_PRESENT=0
+
+  # Execute
+  add_zip_files "archive.7z" -x@exclude.lst file1.txt
+
+  # Verify
+  assert-equal "${ZIP_CMD_LOG}" "7z a -x@exclude.lst archive.7z file1.txt" "add_zip_files 7z with exclude flag"
+}
+
+function test__add_zip_files__with_7z_on_windows() {
+  # Setup
+  MOCK_ZIP_PRESENT=0
+  export OSTYPE="msys"
+  export SEVENZ_HOME="/custom/sevenz"
+
+  # Execute
+  add_zip_files "archive.7z" file1.txt
+
+  # Verify
+  assert-equal "${ZIP_CMD_LOG}" "/custom/sevenz/7z.exe a archive.7z file1.txt" "add_zip_files 7z on windows"
+}
+
+function test_add_zip_files_with_7z_fast() {
+  # Setup
+  MOCK_ZIP_PRESENT=0
+  GO_FAST=0
+
+  # Execute
+  add_zip_files "archive.zip" file1.txt file2.txt
+
+  # Verify
+  assert-equal "${ZIP_CMD_LOG}" "7z a -mx9 archive.zip file1.txt file2.txt" "add_zip_files 7z GO_FAST"
+}
+
+function _create_files() {
+  local FILEDIR="$1"
+  mkdir -p "${FILEDIR}/a/b/c"
+  touch "${FILEDIR}/file1.sh"
+  touch "${FILEDIR}/file2.sh"
+  touch "${FILEDIR}/build.sh"
+  touch "${FILEDIR}/a/file3.sh"
+  touch "${FILEDIR}/a/build.sh"
+  touch "${FILEDIR}/a/b/file4.sh"
+  touch "${FILEDIR}/a/b/build.sh"
+  touch "${FILEDIR}/a/b/c/file5.sh"
+
+  EXPECTED_CONTENT=".
+./a
+./a/b
+./a/b/c
+./a/b/c/file5.sh
+./a/b/file4.sh
+./a/file3.sh
+./file1.sh
+./file2.sh"
+}
+
+function test__add_zip_files__with_zip_real() {
+  if ! builtin command -v zip >/dev/null 2>&1; then
+    builder_echo warning "    IGNORE: add_zip_files zip with real data - requires zip installed"
+    return 0
+  fi
+
+  # Setup
+  MOCK_ZIP_PRESENT=1
+  unmock zip
+
+  ARCHIVE=$(mktemp -u --suffix=.zip)
+  FILEDIR=$(mktemp -d)
+  _create_files "${FILEDIR}"
+
+  # Execute
+  (
+    # shellcheck disable=2164
+    cd "${FILEDIR}"
+    add_zip_files "${ARCHIVE}" -r -q -xr!build.sh file1.sh file2.sh a/ > /dev/null
+  )
+
+  # Verify
+  NEWDIR=$(mktemp -d)
+  (
+    # shellcheck disable=2164
+    cd "${NEWDIR}"
+    unzip "${ARCHIVE}" > /dev/null
+    ARCHIVE_CONTENT=$(find . | sort)
+    assert-equal "${ARCHIVE_CONTENT}" "${EXPECTED_CONTENT}" "add_zip_files zip with real data" --quiet
+  )
+
+  rm -rf "${FILEDIR}"
+  rm -rf "${NEWDIR}"
+  rm -f "${ARCHIVE}"
+}
+
+function test__add_zip_files__with_7z_real() {
+  if ! builtin command -v 7z >/dev/null 2>&1; then
+    builder_echo warning "    IGNORE: add_zip_files 7z with real data - requires 7z installed"
+    return 0
+  fi
+
+  # Setup
+  MOCK_ZIP_PRESENT=0
+  unmock 7z
+
+  ARCHIVE=$(mktemp -u --suffix=.zip)
+  FILEDIR=$(mktemp -d)
+  _create_files "${FILEDIR}"
+
+  # Execute
+  (
+    # shellcheck disable=2164
+    cd "${FILEDIR}"
+    add_zip_files "${ARCHIVE}" -r -q -xr!build.sh file1.sh file2.sh a/ > /dev/null
+  )
+
+  # Verify
+  NEWDIR=$(mktemp -d)
+  (
+    # shellcheck disable=2164
+    cd "${NEWDIR}"
+    7z x "${ARCHIVE}" > /dev/null
+    ARCHIVE_CONTENT=$(find . | sort)
+    assert-equal "${ARCHIVE_CONTENT}" "${EXPECTED_CONTENT}" "add_zip_files 7z with real data" --quiet
+  )
+
+  rm -rf "${FILEDIR}"
+  rm -rf "${NEWDIR}"
+  rm -f "${ARCHIVE}"
+}
+
+# shellcheck disable=SC2120
+function mock_builder_die() {
+  LOG_MSG+="DIE: $*"
+}
+
+function test__add_zip_files__flags_before_zipfile() {
+  # Setup
+  MOCK_ZIP_PRESENT=0
+  create_mock  builder_die  mock_builder_die
+
+  # Execute
+  add_zip_files -r -q "/tmp/archive.zip" file1.txt a/file2.txt
+
+  # Verify
+  unmock builder_die
+  assert-not-contains "${LOG_MSG}" "DIE"
+  assert-equal "${ZIP_CMD_LOG}" "7z a -r -bd -bb0 /tmp/archive.zip file1.txt a/file2.txt"
+}
+
+function test__add_zip_files__flags_between_files() {
+  # Setup
+  MOCK_ZIP_PRESENT=0
+  create_mock  builder_die  mock_builder_die
+
+  # Execute
+  add_zip_files "/tmp/archive.zip" -q file1.txt -r a/file2.txt
+
+  # Verify
+  unmock builder_die
+  assert-not-contains "${LOG_MSG}" "DIE"
+  assert-equal "${ZIP_CMD_LOG}" "7z a -bd -bb0 -r /tmp/archive.zip file1.txt a/file2.txt"
+}
+
+function test__add_zip_files__flags_at_end() {
+  # Setup
+  MOCK_ZIP_PRESENT=0
+  create_mock  builder_die  mock_builder_die
+
+  # Execute
+  add_zip_files "/tmp/archive.zip" file1.txt a/file2.txt -r -q
+
+  # Verify
+  unmock builder_die
+  assert-not-contains "${LOG_MSG}" "DIE"
+  assert-equal "${ZIP_CMD_LOG}" "7z a -r -bd -bb0 /tmp/archive.zip file1.txt a/file2.txt"
+}
+
+function test__add_zip_files__die_if_relative_path() {
+  # Setup
+  MOCK_ZIP_PRESENT=1
+  create_mock  builder_die  mock_builder_die
+
+  # Execute
+  add_zip_files "/tmp/archive.zip" file1.txt ../file2.txt
+
+  # Verify
+  unmock builder_die
+  assert-equal "${LOG_MSG}" "DIE: File ../file2.txt is not in the current directory"  "add_zip_files with relative path"
+}
+
+function test__add_zip_files__die_if_absolute_path() {
+  # Setup
+  MOCK_ZIP_PRESENT=1
+  create_mock  builder_die  mock_builder_die
+
+  # Execute
+  add_zip_files "/tmp/archive.zip" file1.txt /file2.txt
+
+  # Verify
+  unmock builder_die
+
+  assert-equal "${LOG_MSG}" "DIE: File /file2.txt is not in the current directory" "add_zip_files with absolute path"
+}
+
+# shellcheck disable=SC2119
+run_tests
diff --git a/resources/build/trigger-build-bot.inc.sh b/resources/build/trigger-build-bot.inc.sh
new file mode 100644
index 0000000000..298981f6b7
--- /dev/null
+++ b/resources/build/trigger-build-bot.inc.sh
@@ -0,0 +1,203 @@
+#!/usr/bin/env bash
+
+# set -eu
+
+# . ./trigger-definitions.inc.sh
+
+#
+# Check the Test-bot command in the PR body for commands relevant to the build
+# bot, and update global build_platforms accordingly
+#
+# If the Test-bot command is 'skip', or there are no test bot instructions, then we
+# will default to a 'build' for all default build platforms, instead of
+# 'release'; this can be overridden by any Build-bot commands in commits or in
+# the PR body.
+#
+# Parameters:
+#   1: PR number (not currently used)
+#   2: PR JSON data from api.github.com/repos/keymanapp/keyman/pulls/#
+#
+function test_bot_check_pr_body() {
+  local PRNUM=$1
+  local prinfo="$2"
+
+  set -o noglob
+  IFS=$'\n'
+  local prbody="$(echo "$prinfo" | "${JQ}" -r '.body')"
+  local prTestCommand="$(echo "$prbody" | grep 'Test-bot:' | cut -d: -f 2 - | cut -d' ' -f 1 -)"
+  local prTestBody="$(echo "$prbody" | grep -i '# User Testing')"
+  unset IFS
+  set +o noglob
+
+  if ([[ "$prTestCommand" == skip ]] || [[ -z "${prTestCommand// }" ]]) && [[ -z "${prTestBody// }" ]]; then
+    local platform
+    for platform in "${!build_platforms[@]}"; do
+      build_platforms[$platform]=build
+    done
+  fi
+}
+
+#
+# Check PR commit messages for Build-bot commands. Later commands override
+# earlier ones. Also checks PR body for any overriding commands. Note, only
+# checks the first 250 commits, so later build commands will be ignored; in this
+# situation, use the PR body command. Also ignores build commands in PR
+# comments, for sake of performance
+#
+# The bot will also check the Test-bot: trailer in the PR body, if it exists, but
+# will not check any other commits. If the Test-bot: command is just 'skip', then
+# by default, all builds will be set to 'build' instead of 'release'
+#
+# Parameters:
+#   1: PR number to check
+#   2: PR JSON data from api.github.com/repos/keymanapp/keyman/pulls/#
+#   3: Commit JSON data from api.github.com/repos/keymanapp/keyman/pulls/#/commits
+#
+function build_bot_check_messages() {
+  local PRNUM=$1
+  local prinfo="$2"
+  local prcommits="$3"
+
+  # We don't want any globbing happening in our parse
+
+  set -o noglob
+
+  # Extract the Build-bot commands from commit messages and the PR body
+
+
+  IFS=$'\n'
+  local buildBotCommands=($(echo "$prcommits" | "${JQ}" -r '.[].commit.message' | grep 'Build-bot:' | cut -c 11- -))
+  local prCommands=($(echo "$prinfo" | "${JQ}" -r '.body' | tr -d '\r' | grep 'Build-bot:' | cut -c 11- -))
+  unset IFS
+
+  # The PR body Build-bot comment will be read last, which allows it to override
+  # all previous commands
+
+  if [[ ${#prCommands[@]} -gt 0 ]]; then
+    buildBotCommands+=("${prCommands[@]}")
+  fi
+
+  for buildBotCommand in "${buildBotCommands[@]}"; do
+    # Block illegal Build-bot: commands
+    if [[ ! "$buildBotCommand" =~ ^[a-z,\ :]+$ ]]; then
+      builder_echo warning "WARNING[Build-bot]: ignoring invalid command: '${buildBotCommand}'"
+      continue
+    fi
+
+    # debug_echo "buildBotCommand:{$buildBotCommand}"
+
+    # We now know that our command has only a-z, comma, colon, and space, so we
+    # can parse without risking escaping our bash jail
+
+    if [[ ! -z "${buildBotCommand// }" ]]; then
+      build_bot_update_commands $buildBotCommand
+    fi
+  done
+
+  set +o noglob
+}
+
+#
+# parses a 'Build-bot: <level>[[:| ]platform,...]' command and modifies
+# the global build_platforms associative array with new levels.
+#
+# Note that this function assumes that inputs are sanitized, see
+# build_bot_check_messages
+#
+function build_bot_update_commands() {
+  local level=
+  local platforms=
+  local command="$*"
+
+  local re='^(build|skip|release)( [a-z,]+)?$'
+  if [[ "$command" =~ $re ]]; then
+    # legacy (until aug 2025) format is "level [platform]" (comma format never used)
+    if [[ $# == 1 ]]; then
+      level=$1
+      platforms="${!build_platforms[@]}"
+    else
+      level=$1
+      shift
+
+      # remaining parameters are comma/space separated platforms
+      IFS=','
+      read -r -a platforms <<< "$*"
+      unset IFS
+    fi
+
+    if [[ ! $level =~ ^$valid_build_levels$ ]]; then
+      # Just skip this build command
+      builder_echo warning "WARNING[Build-bot]: ignoring invalid build level '$level' in command '$command'"
+      return 0
+    fi
+
+    build_bot_verify_platforms platforms
+
+    local platform
+    for platform in "${platforms[@]}"; do
+      builder_echo "Build-bot: Updating build level for $platform to $level"
+      build_platforms[$platform]=$level
+    done
+  else
+    # modern format is "level[:platform[,platform...]][ level[:platform[,platform...]]...]"
+    declare -a commands
+    IFS=' '
+    read -r -a commands <<< "$command"
+    unset IFS
+
+    for command in "${commands[@]}"; do
+      declare -a params
+      IFS=:
+      read -r -a params <<< "$command"
+      level=${params[0]}
+      if [[ ! $level =~ ^$valid_build_levels$ ]]; then
+        # Just skip this build command
+        builder_echo warning "WARNING[Build-bot]: ignoring invalid build level '$level' in command '$command'"
+        continue
+      fi
+
+      if [[ ${#params[@]} == 1 ]]; then
+        platforms="${!build_platforms[@]}"
+      else
+        # remaining parameters are comma separated platforms
+        IFS=','
+        read -r -a platforms <<< "${params[1]}"
+        unset IFS
+      fi
+
+      build_bot_verify_platforms platforms
+
+      local platform
+      for platform in "${platforms[@]}"; do
+        builder_echo "Build-bot: Updating build level for $platform to $level"
+        build_platforms[$platform]=$level
+      done
+    done
+  fi
+}
+
+#
+# Strip any unrecognized platforms and expand 'all' to actual platforms
+#
+# Parameters:
+#   1: name of platforms array parameter (byref)
+#
+function build_bot_verify_platforms() {
+  local -n input_platforms=$1
+  local output_platforms=()
+  local platform
+  for platform in "${input_platforms[@]}"; do
+    # We'll emit a warning with invalid platforms, then remove them from the array
+    if [[ ! $platform =~ ^(all|$available_platforms_regex)$ ]]; then
+      builder_echo warning "WARNING[Build-bot]: ignoring invalid platform '$platform'"
+    elif [[ $platform == all ]]; then
+      input_platforms=(${available_platforms[@]})
+      return
+    else
+      if [[ ! "${output_platforms[@]}" =~ $platform ]]; then
+        output_platforms+=($platform)
+      fi
+    fi
+  done
+  input_platforms=("${output_platforms[@]}")
+}
diff --git a/resources/build/trigger-builds.inc.sh b/resources/build/trigger-builds.inc.sh
index 639c3d240b..bfea20bb1a 100644
--- a/resources/build/trigger-builds.inc.sh
+++ b/resources/build/trigger-builds.inc.sh
@@ -1,10 +1,9 @@
 #!/usr/bin/env bash
 
 #
-# Tell TeamCity to trigger new builds
+# Tell TeamCity to trigger new release builds
 #
-
-function triggerBuilds() {
+function triggerReleaseBuilds() {
   local base=`git branch --show-current`
   # convert stable-14.0 to stable_14_0 to fit in with the definitions
   # in trigger-definitions.inc.sh
@@ -19,39 +18,49 @@ function triggerBuilds() {
       if [[ $build == "" ]]; then continue; fi
       if [ "${build:(-7)}" == "_GitHub" ]; then
         local job=${build%_GitHub}
-        echo Triggering GitHub action build "$job" "$base"
-        triggerGitHubActionsBuild false "$job" "$base"
+        echo "Triggering GitHub action release build (isTestBuild=false) (level=release) $job $base"
+        triggerGitHubActionsBuild false release "$job" "$base"
       else
-        echo Triggering TeamCity build false $build $TEAMCITY_VCS_ID $base
-        triggerTeamCityBuild false $build $TEAMCITY_VCS_ID $base
+        echo "Triggering TeamCity release build (isTestBuild=false) (level=release) $build $TEAMCITY_VCS_ID $base"
+        triggerTeamCityBuild false release $build $TEAMCITY_VCS_ID $base
       fi
     done
   done
 }
 
+#
+# Trigger a build on TeamCity
+#
+# Parameters:
+#   1: isTestBuild: 'true' if this is for a PR branch or a test build
+#                   for a primary branch; false is this is a release
+#                   build for a primary branch (master/beta/stable-x.y)
+#   2: buildLevel:  'skip' - don't run build;
+#                   'build' - run build and unit tests;
+#                   'release' - run build, unit tests, and deploy
+#   3: TeamCity build configuration name
+#   4: TeamCity VCS id, which is different for PR test configurations
+#   5: branch name in git
+#
 function triggerTeamCityBuild() {
   local isTestBuild="$1"
-  local TEAMCITY_BUILDTYPE="$2"
-  local TEAMCITY_VCS_ID="$3"
+  local buildLevel="$2"
+  local TEAMCITY_BUILDTYPE="$3"
+  local TEAMCITY_VCS_ID="$4"
+  local TEAMCITY_BRANCH_NAME="$5"
 
-  if [[ $# -gt 3 ]]; then
-    local TEAMCITY_BRANCH_NAME="$4"
-    #debug echo "  Triggering build for: $TEAMCITY_BRANCH_NAME"
-    TEAMCITY_BRANCH_NAME="branchName='$TEAMCITY_BRANCH_NAME' defaultBranch='false'"
-  else
-    local TEAMCITY_BRANCH_NAME=
-  fi
-
-  local GIT_OID=`git rev-parse HEAD`
   local TEAMCITY_SERVER=https://build.palaso.org
 
-  local command
+  local commandProperties="<properties><property name='env.KEYMAN_BUILD_LEVEL' value='$buildLevel' /></properties>"
+  local commandLastChanges=
 
-  if $isTestBuild; then
-    command="<build $TEAMCITY_BRANCH_NAME><buildType id='$TEAMCITY_BUILDTYPE' /></build>"
-  else
-    command="<build $TEAMCITY_BRANCH_NAME><buildType id='$TEAMCITY_BUILDTYPE' /><lastChanges><change vcsRootInstance='$TEAMCITY_VCS_ID' locator='version:$GIT_OID'/></lastChanges></build>"
+  if ! $isTestBuild; then
+    local GIT_OID=`git rev-parse HEAD`
+    commandLastChanges="<lastChanges><change vcsRootInstance='$TEAMCITY_VCS_ID' locator='version:$GIT_OID'/></lastChanges>"
   fi
+
+  local command="<build branchName='$TEAMCITY_BRANCH_NAME' defaultBranch='false'><buildType id='$TEAMCITY_BUILDTYPE' />$commandLastChanges$commandProperties</build>"
+
   echo "TeamCity Build Command: $command"
 
   # adjust indentation for output of curl
@@ -66,10 +75,20 @@ function triggerTeamCityBuild() {
   echo
 }
 
+#
+# Trigger a build on GitHub Actions
+#
+# Parameters:
+#   1: 'true' if this is for a PR branch, otherwise 'false' (for master/beta/stable-x.y)
+#   2: 'skip' - don't run build; 'build' - run build and unit tests; 'test' - run build, unit tests, and deploy
+#   3: Action name
+#   4: branch name in git
+#
 function triggerGitHubActionsBuild() {
   local IS_TEST_BUILD="$1"
-  local GITHUB_ACTION="$2"
-  local GIT_BRANCH="${3:-master}"
+  local BUILD_LEVEL="$2"
+  local GITHUB_ACTION="$3"
+  local GIT_BRANCH="$4"
   local GIT_BASE_BRANCH="${GIT_BRANCH}"
   local GIT_USER="keyman-server"
   local GIT_BUILD_SHA GIT_BASE_REF JSON
@@ -81,7 +100,8 @@ function triggerGitHubActionsBuild() {
     GIT_BUILD_SHA="$(git rev-parse "refs/tags/release@$KEYMAN_VERSION_WITH_TAG")"
     GIT_BASE_REF="$(git rev-parse "${GIT_BUILD_SHA}^")"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: release@${KEYMAN_VERSION_WITH_TAG}"
-  elif [[ $GIT_BRANCH != stable-* ]] && [[ $GIT_BRANCH =~ [0-9]+ ]]; then
+  elif [[ $GIT_BRANCH =~ ^[0-9]+$ ]]; then
+    # pull request
     local JSON=$(call_curl "${GITHUB_SERVER}/pulls/${GIT_BRANCH}" --header "Authorization: token $GITHUB_TOKEN")
     GIT_BUILD_SHA="$(echo "$JSON" | $JQ -r '.head.sha')"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: PR #${GIT_BRANCH}"
@@ -90,6 +110,7 @@ function triggerGitHubActionsBuild() {
     GIT_BASE_REF="$(echo "$JSON" | $JQ -r '.base.sha')"
     GIT_BRANCH="PR-${GIT_BRANCH}"
   else
+    # another branch: stable-x.y, beta, or master
     GIT_BUILD_SHA="$(git rev-parse "refs/heads/${GIT_BRANCH}")"
     GIT_BASE_REF="$(git rev-parse "${GIT_BUILD_SHA}^")"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: ${GIT_BRANCH}"
@@ -103,7 +124,8 @@ function triggerGitHubActionsBuild() {
       \"baseBranch\": \"$GIT_BASE_BRANCH\", \
       \"baseRef\": \"$GIT_BASE_REF\", \
       \"user\": \"$GIT_USER\", \
-      \"isTestBuild\": \"$IS_TEST_BUILD\" \
+      \"isTestBuild\": \"$IS_TEST_BUILD\", \
+      \"buildLevel\": \"$BUILD_LEVEL\" \
     }}"
 
   echo "GitHub Action Data: $DATA"
diff --git a/resources/build/trigger-definitions.inc.sh b/resources/build/trigger-definitions.inc.sh
index e4ed49d90d..8748e63edf 100644
--- a/resources/build/trigger-definitions.inc.sh
+++ b/resources/build/trigger-definitions.inc.sh
@@ -5,18 +5,56 @@
 # Maps to ci/cancel-builds/trigger-definitions.mjs and must be kept in sync
 #
 
+#
+# # Build levels
+#
+# See /docs/build-bot.md
+#
+
+readonly build_level_skip=skip
+readonly build_level_build=build
+readonly build_level_release=release
+# TODO: future build_level_fulltest=fulltest --> do all expensive e2e tests as well as producing release artifacts
+readonly valid_build_levels="$build_level_skip|$build_level_build|$build_level_release"
+
+#
+# Target platforms
+#
 
 available_platforms=(android common_web common_windows common_mac common_linux ios linux mac web windows developer)
 
-# the base folder for each pattern does not need to be included, nor oem folders
-# e.g. android='common/models|common/predictive-text'
-# will expand into android='^(android|(oem/[^/]+/android)|common/models|common/predictive-text)'
+# For test builds on master, beta, and stable-x.y branches, we always "build",
+# not "release" -- that is, we don't produce artifacts
+declare -Ag main_branch_platform_build_levels
+for available_platforms_i in "${available_platforms[@]}"; do
+  main_branch_platform_build_levels[$available_platforms_i]=$build_level_build
+done
+readonly main_branch_platform_build_levels
+readonly available_platforms
 
-watch_android='web|common/models|common/predictive-text|common/web'
-watch_ios='web|common/models|common/predictive-text|common/web'
+
+available_platforms_regex=`echo "${available_platforms[@]}" | sed 's/ /|/g'`
+
+# We also allow 'common' and 'core' platforms for Build-bot: commands
+readonly available_platforms_regex="$available_platforms_regex|common|core"
+
+# the base folder for each pattern does not need to be included, nor oem
+# folders, nor resources/teamcity folders
+#
+# e.g. watch_android='web|comon/web' will expand to cover:
+#   android
+#   oem/*/android
+#   web
+#   common/web
+#   resources/teamcity/android
+#   resources/teamcity/includes
+
+
+watch_android='web|common/web'
+watch_ios='web|common/web'
 watch_linux='core|common/test/keyboards/baseline'
 watch_mac='core'
-watch_web='common/models|common/predictive-text|common/web|core'
+watch_web='common/web|core'
 watch_windows='common|core|web'
 watch_developer='common|core|web'
 
@@ -25,10 +63,10 @@ watch_developer='common|core|web'
 watch_common_web='common/web'
 # Currently, we run web tests on all three of our build platforms, to ensure
 # that they work in all our environments. So we need to include common/web in
-# the matches for these
-watch_common_windows='common/windows|common/web'
-watch_common_mac='common/mac|common/web'
-watch_common_linux='common/linux|common/web'
+# the matches for these, as well as resources/teamcity/common
+watch_common_windows='common/windows|common/web|resources/teamcity/common'
+watch_common_mac='common/mac|common/web|resources/teamcity/common'
+watch_common_linux='common/linux|common/web|resources/teamcity/common'
 
 #
 # Available build configurations and VCS identifiers; identifiers are somewhat inconsistent due
@@ -57,6 +95,13 @@ bc_test_common_windows=(Keyman_Test_Common_Windows)
 bc_test_common_mac=(Keyman_Test_Common_Mac)
 bc_test_common_linux=(Keyman_Test_Common_Linux)
 
+# These configuration arrays are triggered only by Build-bot commands:
+
+bc_test_common=(Keyman_Test_Common_Web Keyman_Test_Common_Windows Keyman_Test_Common_Mac Keyman_Test_Common_Linux)
+bc_test_core=(Keyman_Common_KPAPI_TestPullRequests_Linux Keyman_Common_KPAPI_TestPullRequests_macOS Keyman_Common_KPAPI_TestPullRequests_Windows)
+
+# Core is tested directly for target platforms
+
 # Keymanweb_TestPullRequestRegressions : currently this is timing out so disabled until we have
 #                                        time to investigate further
 
diff --git a/resources/build/typescript.inc.sh b/resources/build/typescript.inc.sh
new file mode 100644
index 0000000000..54e3956951
--- /dev/null
+++ b/resources/build/typescript.inc.sh
@@ -0,0 +1,43 @@
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+#
+# Runs eslint, builds tests, and then runs tests with mocha + c8 (coverage)
+#
+# Usage:
+#   builder_run_action  test    typescript_run_eslint_mocha_tests [coverage_threshold]
+# Parameters:
+#   1: coverage_threshold   optional, minimum coverage for c8 to pass tests,
+#                           defaults to 90 (percent)
+typescript_run_eslint_mocha_tests() {
+  local MOCHA_FLAGS=
+
+  if builder_is_running_on_teamcity; then
+    # we're running in TeamCity
+    MOCHA_FLAGS="-reporter mocha-teamcity-reporter"
+  fi
+
+  eslint .
+  tsc --build test/
+
+  local THRESHOLD_PARAMS=
+  local C8_THRESHOLD=
+  if [[ $# -gt 0 ]]; then
+    C8_THRESHOLD=$1
+    THRESHOLD_PARAMS="--lines $C8_THRESHOLD --statements $C8_THRESHOLD --branches $C8_THRESHOLD --functions $C8_THRESHOLD"
+  else
+    # Seems like a bug in TeamCity reporter if we don't list default thresholds,
+    # see #13418.
+    #
+    # Making branch and function thresholds slightly lower, because the default
+    # for c8 is 0 for these anyway.
+    THRESHOLD_PARAMS="--lines 90 --statements 90 --branches 80 --functions 80"
+  fi
+
+  c8 --reporter=lcov --reporter=text --exclude-after-remap --check-coverage $THRESHOLD_PARAMS mocha ${MOCHA_FLAGS} "${builder_extra_params[@]}"
+
+  if [[ ! -z "$C8_THRESHOLD" ]]; then
+    builder_echo warning "Coverage thresholds are currently $C8_THRESHOLD%, which is lower than ideal."
+    builder_echo warning "Please increase threshold in build.sh as test coverage improves."
+  fi
+}
diff --git a/resources/build/utils.inc.sh b/resources/build/utils.inc.sh
new file mode 100644
index 0000000000..d8b0e6fa7f
--- /dev/null
+++ b/resources/build/utils.inc.sh
@@ -0,0 +1,132 @@
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+# shellcheck disable=SC2154
+. "${KEYMAN_ROOT}/resources/build/jq.inc.sh"
+
+_utils_inc_sh=1
+
+#
+# Write ${UPLOAD_DIR}/${ARTIFACT_FILENAME}.download_info file for the target
+# artifact
+#
+# Parameters:
+#   1: UPLOAD_DIR          Directory where artifact can be found
+#   2: ARTIFACT_FILENAME   Filename (without path) of artifact
+#   3: ARTIFACT_NAME       Descriptive name of artifact
+#   4: ARTIFACT_TYPE       File extension of artifact, without initial period (e.g. tar.gz)
+#   5: PLATFORM            Target platform for artifact
+#
+# TODO: Move to CI include?
+write_download_info() {
+  local UPLOAD_DIR="$1"
+  local ARTIFACT_FILENAME="$2"
+  local ARTFIACT_NAME="$3"
+  local ARTIFACT_TYPE="$4"
+  local PLATFORM="$5"
+
+  local DATE HASH SIZE DOWNLOAD_INFO STAT_FLAGS
+
+  if [[ ! "${PLATFORM}" =~ ^(android|ios|linux|mac|web|win)$ ]]; then
+    builder_die "Invalid project ${PLATFORM}"
+  fi
+
+  # shellcheck disable=SC2312
+  if builder_is_macos && [[ $(command -v stat) == /usr/bin/stat ]]; then
+    # /usr/bin/stat on mac is BSD
+    STAT_FLAGS="-f%z"
+  else
+    # GNU (coreutils)
+    STAT_FLAGS="--print=%s"
+  fi
+
+  # Construct .download_info
+  DATE=$(date +%F)
+  # shellcheck disable=SC2312
+  HASH=$(md5sum "${UPLOAD_DIR}/${ARTIFACT_FILENAME}" | cut -d ' ' -f 1)
+  # shellcheck disable=SC2248
+  SIZE=$(stat ${STAT_FLAGS} "${UPLOAD_DIR}/${ARTIFACT_FILENAME}")
+
+  # shellcheck disable=SC2016,SC2154
+  DOWNLOAD_INFO=$(
+    "${JQ}" -n \
+    --arg NAME "${ARTFIACT_NAME}" \
+    --arg BUILD_NUMBER "${KEYMAN_VERSION}" \
+    --arg DATE "${DATE}" \
+    --arg PLATFORM "${PLATFORM}" \
+    --arg KEYMAN_TIER "${KEYMAN_TIER}" \
+    --arg FILENAME "${ARTIFACT_FILENAME}" \
+    --arg ARTIFACT_TYPE "${ARTIFACT_TYPE}" \
+    --arg HASH "${HASH}" \
+    --arg BUILD_COUNTER "${KEYMAN_VERSION_PATCH}" \
+    --arg SIZE "${SIZE}" \
+    '{
+      name: $NAME, version: $BUILD_NUMBER, date: $DATE, platform: $PLATFORM,
+      stability: $KEYMAN_TIER, file: $FILENAME, md5: $HASH, type: $ARTIFACT_TYPE,
+      build: $BUILD_COUNTER, size: $SIZE
+    }'
+  )
+  echo "${DOWNLOAD_INFO}" | "${JQ}" . >> "${UPLOAD_DIR}/${ARTIFACT_FILENAME}.download_info"
+}
+
+#
+# Re-runs the specified command-line instruction up to 5 times should it fail, waiting a
+# random delay between each attempt.  No re-runs are attempted after successful commands.
+#
+# ### Usage
+#   try_multiple_times command [param1 param2...]
+#
+# ### Parameters
+#   1: $@         command-line arguments
+try_multiple_times ( ) {
+  _try_multiple_times 0 "$@"
+}
+
+# $1  The current retry count
+# $2+ (everything else) the command to retry should it fail
+_try_multiple_times ( ) {
+  local RETRY_MAX=5
+
+  # Configuration:  wait between 10 sec and 120 sec.
+
+  # in seconds.
+  local RETRY_MAX_WAIT_RANGE=111
+  # in seconds
+  local RETRY_MIN_WAIT=10
+
+  local retryCount=$1
+  shift
+
+  if (( "$retryCount" == "$RETRY_MAX" )); then
+    builder_die "Retry limit of $RETRY_MAX attempts reached."
+  fi
+
+  retryCount=$(( $retryCount + 1 ))
+
+  if (( $retryCount != 1 )); then
+    local wait_length=$(( RANDOM % RETRY_MAX_WAIT_RANGE + RETRY_MIN_WAIT ))
+    builder_echo "Delaying $wait_length seconds before attempt $retryCount: \`$@\`"
+    sleep $wait_length
+  fi
+
+  local code=0
+  "$@" || code=$?
+  if (( $code != 0 )); then
+    builder_echo "Command failed with error $code"
+    _try_multiple_times $retryCount "$@"
+  fi
+}
+
+#
+# Wrapper for check-markdown tool to verify links within and validity of all .md
+# files in a folder and its sub-folders
+#
+# Usage:
+#   check-markdown path_root
+# Parameters:
+#   1: path_root    path to base folder containing .md files to be checked
+#
+check-markdown() {
+  node "$KEYMAN_ROOT/resources/tools/check-markdown" --root "$1"
+}
+
diff --git a/resources/build/version/build.sh b/resources/build/version/build.sh
index f6e01bcec3..ccf97a2a19 100755
--- a/resources/build/version/build.sh
+++ b/resources/build/version/build.sh
@@ -2,10 +2,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -17,5 +18,5 @@ builder_describe_outputs \
 builder_parse "$@"
 
 builder_run_action clean      rm -rf build/ node_modules/ dist/ lib/
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
diff --git a/resources/build/win/environment.inc.sh b/resources/build/win/environment.inc.sh
index 6da5ad039f..40c4de6db5 100644
--- a/resources/build/win/environment.inc.sh
+++ b/resources/build/win/environment.inc.sh
@@ -32,7 +32,7 @@ COMMON_ROOT="$KEYMAN_ROOT/common/windows/delphi"
 OUTLIB="$WINDOWS_ROOT/lib"
 COMMON_OUTLIB="$KEYMAN_ROOT/common/windows/lib"
 
-if builder_is_debug_build || [[ $KEYMAN_VERSION_ENVIRONMENT == local ]] || [[ ! -z ${TEAMCITY_PR_NUMBER+x} ]]; then
+if builder_is_debug_build || [[ $KEYMAN_VERSION_ENVIRONMENT == local ]] || builder_is_ci_test_build; then
   # We do a fast build for debug builds, local builds, test PR builds but not for master/beta/stable release builds
   GO_FAST=1
 else
@@ -73,6 +73,11 @@ run_in_delphi_env() {
 }
 
 sentrytool_delphiprep() {
+  if builder_is_ci_build && builder_is_ci_build_level_build; then
+    builder_echo "Skipping sentrytool_delphiprep - buildLevel=build: $@"
+    return 0
+  fi
+
   local EXE_PATH="$1"
   local DPR_PATH="$2"
   (
@@ -83,7 +88,7 @@ sentrytool_delphiprep() {
 }
 
 tds2dbg() {
-  "$TDS2DBG" "$@"
+  builder_if_release_build_level "$TDS2DBG" "$@"
 }
 
 delphi_msbuild() {
@@ -108,6 +113,11 @@ clean_windows_project_files() {
 }
 
 wrap-signcode() {
+  if builder_is_ci_build && builder_is_ci_build_level_build; then
+    builder_echo "Skipping code signing - buildLevel=build: $@"
+    return 0
+  fi
+
   # CI will usually pass in a full path for signtool.exe; for local builds we
   # will hopefully find what we want on the path already
   if [[ -z "${SIGNTOOL+x}" ]]; then
@@ -117,6 +127,11 @@ wrap-signcode() {
 }
 
 wrap-symstore() {
+  if builder_is_ci_build && builder_is_ci_build_level_build; then
+    builder_echo "Skipping symstore - buildLevel=build"
+    return 0
+  fi
+
   if [[  -z "${KEYMAN_SYMSTOREPATH+x}" ]]; then
     builder_warn "\$KEYMAN_SYMSTOREPATH is not set. Skipping symstore for $@"
     return 0
diff --git a/resources/build/win/zip.inc.sh b/resources/build/win/zip.inc.sh
deleted file mode 100644
index 8765ee959d..0000000000
--- a/resources/build/win/zip.inc.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-
-WZZIPPATH="$ProgramFiles/7-zip/7z.exe"
-
-wzzip() {
-  if [[ $GO_FAST == 1 ]]; then
-    "$WZZIPPATH" a -mx1 "$@"
-  else
-    "$WZZIPPATH" a -mx9 "$@"
-  fi
-}
-
-wzunzip() {
-  "$WZZIPPATH" e "$@"
-}
\ No newline at end of file
diff --git a/resources/build/xcode-wrap.sh b/resources/build/xcode-wrap.sh
deleted file mode 100755
index 61d79ca24e..0000000000
--- a/resources/build/xcode-wrap.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-echo "wrap script for arch $(arch)"
-if [[ $(arch) == i386 ]] && [[ -f /usr/local/bin/bash ]]; then
-  /usr/local/bin/bash -l "$@" || exit $?
-elif [[ $(arch) == arm64 ]] && [[ -f /opt/homebrew/bin/bash ]]; then
-  /opt/homebrew/bin/bash -l "$@" || exit $?
-else
-  >&2 echo "Could not start build due to missing homebrew bash"
-  exit 55
-fi 
\ No newline at end of file
diff --git a/resources/build/zip.inc.sh b/resources/build/zip.inc.sh
index 1f80a71edb..a1747680f2 100644
--- a/resources/build/zip.inc.sh
+++ b/resources/build/zip.inc.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+# shellscript shell=bash
 #
 # This script contains zip and unzip (TODO) utilities to function for all environments.
 # unzip is available in all environments
@@ -6,27 +6,42 @@
 # If zip is not available, then fall back to 7z for zipping.
 # 7z requires env SEVENZ_HOME.
 #
-# TODO: refactor with /resources/build/win/zip.inc.sh
+# The script considers the GO_FAST env variable:
+# - if set to 1 we use a lower compression level, resulting in faster builds
+#   and bigger artifacts
+# - if set to 0 we use a higher compression level, resulting in slower builds
+#   and smaller artifacts
+# - if not set we rely on the default compression level
 
-# Add files to create a zip/7z archive with the following parameters (in order)
-# [zip filename]
-# [list of flags to pass to zip command] Flags start with a single-dash
+# Add files to create a zip/7z archive
+# Parameters:
+# - [zip filename]
+# - [list of files to include in zip]
+#
+# Optional flags:
 #   -x@filename for a file containing list of files to exclude from the archive
+#   -xr!name    to exclude files matching name from the archive
+#   -r          to recursively include files in subdirectories
+#   -q          to enable quiet mode (zip) or disable progress indicator
+#               and set output log level 0 (7z)
+#   -0 to -9    for compression level with -0 indicating no compression,
+#               -1 indicating low compression (fastest) and -9 indicating
+#               ultra compression (slowest)
 #   -* all other flags
-#   Flags passed in are treated as zip parameters, and internally converterted to 7z flags as applicable
-# [list of files to include in zip]
+# Flags start with a single-dash and get passed to zip command. They can come
+# before, after or in between the zip filename and the files to include.
+# Flags passed in are treated as zip parameters, and internally converterted
+# to 7z flags as applicable
+
 function add_zip_files() {
 
   # Parse parameters
-
-  # $1 for zip filename
-  local ZIP_FILE="$1"
-  shift
-
-  # Parse rest of parameters
+  local ZIP_FILE
   local ZIP_FLAGS=()
   local SEVENZ_FLAGS=('a') # 7z requires a command
   local INCLUDE=()
+  local EXCLUDE_FILE
+  local HAS_COMPRESSION=false
   while [[ $# -gt 0 ]] ; do
     case "$1" in
       -r)
@@ -41,6 +56,14 @@ function add_zip_files() {
         SEVENZ_FLAGS+=($1)
         shift
         ;;
+      -xr!*)
+        # Recursively exclude the file after -xr! from the archive
+        EXCLUDE_FILE=$(mktemp)
+        find . -name ${1##-xr!} > "${EXCLUDE_FILE}"
+        ZIP_FLAGS+=("-x@${EXCLUDE_FILE}")
+        SEVENZ_FLAGS+=($1)
+        shift
+        ;;
 
       # Zip flags that have a corresponding 7z flag
       -q)
@@ -51,14 +74,15 @@ function add_zip_files() {
         shift
         ;;
       -[0123456789])
-        # Compression level where 
+        # Compression level where
         # -0 indicates no compression
         # -1 indicates low compression (fastest)
         # -9 indicates ultra compression (slowest)
+        HAS_COMPRESSION=true
         ZIP_FLAGS+=($1)
         if [[ $1 =~ -([0-9]) ]]; then
           SEVENZ_FLAGS+=("-mx${BASH_REMATCH[1]}")
-        fi  
+        fi
         shift;
         ;;
 
@@ -69,25 +93,41 @@ function add_zip_files() {
         ;;
 
       *)
-        # files to include in the archive
-        INCLUDE+=($1)
+        # files to include in the archive. First non-flag parameter is the zip file name.
+        if [[ -z "${ZIP_FILE:-}" ]]; then
+          ZIP_FILE="$1"
+        else
+          INCLUDE+=("$1")
+        fi
         shift
         ;;
     esac
   done
 
+  # If GO_FAST is set, we use either fast or slow compression level.
+  # Otherwise we use the defaults.
+  if ! ${HAS_COMPRESSION}; then
+    if [[ "${GO_FAST:-}" == "1" ]]; then
+      SEVENZ_FLAGS+=("-mx1")
+      ZIP_FLAGS+=("-1")
+    elif [[ "${GO_FAST:-}" == "0" ]]; then
+      SEVENZ_FLAGS+=("-mx9")
+      ZIP_FLAGS+=("-9")
+    fi
+  fi
+
+  _verify_input "${INCLUDE[@]}"
+
   local COMPRESS_CMD=zip
   if ! command -v zip 2>&1 > /dev/null; then
     # Fallback to 7z
     if [[ -z "${SEVENZ+x}" ]]; then
-      case "${OSTYPE}" in
-        "cygwin"|"msys")
-          SEVENZ="${SEVENZ_HOME}"/7z.exe
-          ;;
-        *)
-          SEVENZ=7z
-          ;;
-      esac
+      if builder_is_windows; then
+        # shellcheck disable=2154
+        SEVENZ="${SEVENZ_HOME}/7z.exe"
+      else
+        SEVENZ=7z
+      fi
     fi
 
     # 7z command to add files so clear zip flags
@@ -102,4 +142,24 @@ function add_zip_files() {
   # builder_echo_debug "${COMPRESS_CMD} ${SEVENZ_FLAGS[@]} ${ZIP_FLAGS[@]} ${ZIP_FILE} ${INCLUDE[@]}"
   "${COMPRESS_CMD}" ${SEVENZ_FLAGS[@]} ${ZIP_FLAGS[@]} ${ZIP_FILE} ${INCLUDE[@]}
 
+  if [[ -n "${EXCLUDE_FILE:-}" ]]; then
+    rm "${EXCLUDE_FILE}"
+  fi
+}
+
+_verify_input() {
+  local curdir file absfile
+  curdir="$(pwd)"
+
+  for file in "$@"; do
+    absfile=$(readlink --canonicalize-missing "${file}")
+    if [[ "${absfile}" != "${curdir}"* ]]; then
+      # 7z and zip behave differently if adding files that are not in the current
+      # directory. For files with relative paths, zip will add them relative to
+      # the current directory which is not what we want and can cause
+      # problems for the user. Therefore we disallow files that are not in the
+      # current directory.
+      builder_die "File ${file} is not in the current directory"
+    fi
+  done
 }
diff --git a/resources/builder.inc.sh b/resources/builder.inc.sh
index 25c9b5994c..249b3d585b 100755
--- a/resources/builder.inc.sh
+++ b/resources/builder.inc.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 # shellcheck disable=SC2310
 
 # Note: these two lines can be uncommented for debugging and profiling build
@@ -19,7 +19,7 @@
 # * _builder_ functions and variables are internal use only for builder.inc.sh, and
 #   subject to change at any time. Do not use them in other scripts.
 # * Note: the running script is the top-level script that includes either
-#   builder.inc.sh directly, or, just in the Keyman repo, via build-utils.sh.
+#   builder.inc.sh directly, or, just in the Keyman repo, via builder-basic.inc.sh.
 #
 
 # Exit on command failure and when using unset variables:
@@ -33,6 +33,7 @@ SHLVL=0
 # _builder_init is called internally at the bottom of this file after we have
 # all function declarations in place.
 function _builder_init() {
+  _builder_get_operating_system
   _builder_findRepoRoot
   _builder_setBuildScriptIdentifiers
 
@@ -626,7 +627,7 @@ builder_has_action() {
 #   }
 #
 #   builder_run_action clean        rm -rf ./build/ ./tsconfig.tsbuildinfo
-#   builder_run_action configure    verify_npm_setup
+#   builder_run_action configure    node_select_version_and_npm_ci
 #   builder_run_action build        do_build
 # ```
 #
@@ -1327,6 +1328,8 @@ _builder_parse_expanded_parameters() {
   _builder_current_action=
   _builder_is_child=1
   _builder_offline=
+  _builder_ignore_unknown_options=1
+  builder_ignored_options=()
 
   local n=0
 
@@ -1471,6 +1474,9 @@ _builder_parse_expanded_parameters() {
         --offline)
           _builder_offline=--offline
           ;;
+        --builder-ignore-unknown-options)
+          _builder_ignore_unknown_options=0
+          ;;
         *)
           # script does not recognize anything of action or target form at this point.
           if [[ $key =~ ^: ]]; then
@@ -1487,6 +1493,9 @@ _builder_parse_expanded_parameters() {
             # For child builds, don't fail the build when pass inheritable
             # parameters (#11408)
             builder_echo_debug "Parameter '$key' is not supported, ignoring"
+          elif [[ $key =~ ^- ]] && builder_ignore_unknown_options; then
+            builder_echo warning "Ignoring unknown option $key"
+            builder_ignored_options+=("$key")
           else
             _builder_parameter_error "$0" parameter "$key"
           fi
@@ -1533,7 +1542,7 @@ _builder_parse_expanded_parameters() {
 
     # Per #11106, local builds use --debug by default.
     # Second condition prevents the block (and message) from executing when --debug is already specified explicitly.
-    if [[ $KEYMAN_VERSION_ENVIRONMENT == "local" ]] && [[ $builder_debug != --debug ]] && ! $is_release; then
+    if [[ ${KEYMAN_VERSION_ENVIRONMENT:-} == "local" ]] && [[ $builder_debug != --debug ]] && ! $is_release; then
       builder_echo grey "Local build environment detected:  setting --debug"
       _params+=(--debug)
       _builder_chosen_options+=(--debug)
@@ -1565,6 +1574,14 @@ _builder_parse_expanded_parameters() {
   fi
 }
 
+#
+# Returns 0 (true) if --builder-ignore-unknown-options flag has been specified
+# in the command line
+#
+function builder_ignore_unknown_options() {
+  return $_builder_ignore_unknown_options
+}
+
 _builder_pad() {
   local count=$1
   local text1=$2
@@ -2074,27 +2091,14 @@ builder_describe_platform() {
 
   local builder_platforms=(linux mac win)
   local builder_tools=(android-studio delphi)
-
-  # --- Detect platform ---
-
-  # Default value, since it's the most general case/configuration to detect.
-  local builder_platform=linux
-
-  # This is copied from build-utils.sh to avoid creating a dependency on it
-  if [[ $OSTYPE == darwin* ]]; then
-    builder_platform=mac
-  elif [[ $OSTYPE == msys ]]; then
-    builder_platform=win
-  elif [[ $OSTYPE == cygwin ]]; then
-    builder_platform=win
-  fi
+  local builder_platform="${BUILDER_OS}"
 
   # --- Detect tools ---
 
   local builder_installed_tools=()
 
   # Detect delphi compiler (see also delphi_environment.inc.sh)
-  if [[ $builder_platform == win ]]; then
+  if builder_is_windows; then
     local ProgramFilesx86="$(cygpath -w -F 42)"
     if [[ -x "$(cygpath -u "$ProgramFilesx86\\Embarcadero\\Studio\\20.0\\bin\\dcc32.exe")" ]]; then
       builder_installed_tools+=(delphi)
@@ -2204,7 +2208,7 @@ builder_is_ci_build() {
 # Returns 0 if current build is running as a release build in CI
 #
 builder_is_ci_release_build() {
-  if [[ "$KEYMAN_VERSION_ENVIRONMENT" =~ ^alpha|beta|stable$ ]]; then
+  if [[ "${KEYMAN_VERSION_ENVIRONMENT:-}" =~ ^alpha|beta|stable$ ]]; then
     return 0
   fi
   return 1
@@ -2215,12 +2219,98 @@ builder_is_ci_release_build() {
 # mainline branch test
 #
 builder_is_ci_test_build() {
-  if [[ "$KEYMAN_VERSION_ENVIRONMENT" == test ]]; then
+  if [[ "${KEYMAN_VERSION_ENVIRONMENT:-}" == test ]]; then
     return 0
   fi
   return 1
 }
 
+#
+# Returns 0 if current ci build is a release-level build. Do not use for non-ci
+# builds.
+#
+builder_is_ci_build_level_release() {
+  if builder_is_ci_release_build; then
+    return 0
+  fi
+  if [[ "${KEYMAN_BUILD_LEVEL:-}" == release ]]; then
+    return 0
+  fi
+  return 1
+}
+
+#
+# Returns 0 if current ci build is a build-level build. Do not use for non-ci
+# builds.
+#
+builder_is_ci_build_level_build() {
+  if builder_is_ci_release_build; then
+    return 1
+  fi
+  if builder_is_ci_build_level_release; then
+    # KEYMAN_BUILD_LEVEL == release, i.e. not build
+    return 1
+  fi
+  return 0
+}
+
+#
+# Executes statement if a ci build level of 'release', and for local builds, but
+# not for a ci build level of 'build'
+#
+builder_if_release_build_level() {
+  if builder_is_ci_build && builder_is_ci_build_level_build; then
+    builder_echo "Skipping - buildLevel=build: $@"
+    return 0
+  fi
+  "$@"
+}
+
+# Returns 0 if we're running on Windows, i.e. if the environment variable
+# `OSTYPE` is set to "msys" or "cygwin".
+builder_is_windows() {
+  if [[ "${OSTYPE:-}" == "msys" ]] || [[ "${OSTYPE:-}" == "cygwin" ]]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+# Returns 0 if we're running on macOS.
+builder_is_macos() {
+  if [[ "${OSTYPE:-}" == darwin* ]]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+# Returns 0 if we're running on Linux (or rather if we're not running
+# on Windows or macOS).
+builder_is_linux() {
+  if builder_is_windows || builder_is_macos; then
+    return 1
+  else
+    return 0
+  fi
+}
+
+# Sets the BUILDER_OS environment variable to linux|mac|win
+#
+_builder_get_operating_system() {
+  declare -g BUILDER_OS
+
+  if builder_is_macos; then
+    BUILDER_OS=mac
+  elif builder_is_windows; then
+    BUILDER_OS=win
+  else
+    BUILDER_OS=linux
+  fi
+
+  readonly BUILDER_OS
+}
+
 ################################################################################
 # Final initialization
 ################################################################################
diff --git a/resources/docker-images/build.sh b/resources/docker-images/build.sh
index b650b9ce55..07223787cd 100755
--- a/resources/docker-images/build.sh
+++ b/resources/docker-images/build.sh
@@ -3,13 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 ################################ Main script ################################
 
 . "${KEYMAN_ROOT}/resources/build/minimum-versions.inc.sh"
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/docker-images/docker-build.inc.sh"
 
 builder_describe \
diff --git a/resources/docker-images/docker-build.inc.sh b/resources/docker-images/docker-build.inc.sh
index 855ba6e641..44c129ac20 100644
--- a/resources/docker-images/docker-build.inc.sh
+++ b/resources/docker-images/docker-build.inc.sh
@@ -1,7 +1,7 @@
 # shellcheck shell=bash
 # no hashbang for .inc.sh
 
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 
 _add_build_args() {
   local var=$1
@@ -63,8 +63,8 @@ is_default_values() {
 # Check that `docker buildx` is available
 check_buildx_available() {
   if ! docker --help | grep -q buildx; then
-    if [[ "${OSTYPE:-}" == "linux-gnu" ]]; then
-      builder_echo error "Docker buildx is not available. Please install Docker buildx to use this script. e.g. 'sudo apt install docker-buildx'"
+    if builder_is_linux; then
+      builder_echo error "Docker buildx is not available. Please install Docker buildx to use this script. E.g. 'sudo apt install docker-buildx'"
     else
       builder_echo error "Docker buildx is not available. Please install Docker buildx to use this script."
     fi
diff --git a/resources/docker-images/run.sh b/resources/docker-images/run.sh
index 2c8cd3e51d..6603745c83 100755
--- a/resources/docker-images/run.sh
+++ b/resources/docker-images/run.sh
@@ -3,12 +3,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${KEYMAN_ROOT}/resources/build/minimum-versions.inc.sh"
 . "${KEYMAN_ROOT}/resources/docker-images/docker-build.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 ################################ Main script ################################
 
diff --git a/resources/locate_emscripten.inc.sh b/resources/locate_emscripten.inc.sh
index d390e83bd2..67411b8391 100644
--- a/resources/locate_emscripten.inc.sh
+++ b/resources/locate_emscripten.inc.sh
@@ -1,7 +1,8 @@
 # shellcheck shell=bash
-# no hashbang for .inc.sh
+# Keyman is copyright (C) SIL Global. MIT License.
 
-. "$KEYMAN_ROOT/resources/build/minimum-versions.inc.sh"
+# shellcheck disable=SC2154
+. "${KEYMAN_ROOT}/resources/build/minimum-versions.inc.sh"
 
 #
 # We don't want to rely on emcc being on the path, because Emscripten puts far
@@ -20,23 +21,28 @@
 #
 locate_emscripten() {
   local EMCC_EXECUTABLE
-  if [[ "${BUILDER_OS}" == "win" ]]; then
+  if builder_is_windows; then
     EMCC_EXECUTABLE="emcc.py"
   else
     EMCC_EXECUTABLE="emcc"
   fi
-  if [[ -z ${EMSCRIPTEN_BASE+x} ]]; then
-    if [[ -z ${EMCC+x} ]]; then
-      local EMCC=$(which ${EMCC_EXECUTABLE})
-      [[ -z $EMCC ]] && builder_die "locate_emscripten: Could not locate emscripten (${EMCC_EXECUTABLE}) on the path or with \$EMCC or \$EMSCRIPTEN_BASE"
+  if [[ -z "${EMSCRIPTEN_BASE:-}" ]]; then
+    if [[ -z "${EMCC:-}" ]]; then
+      local EMCC
+      EMCC="$(command -v "${EMCC_EXECUTABLE}")"
+      [[ -z "${EMCC}" ]] && builder_die "locate_emscripten: Could not locate emscripten (${EMCC_EXECUTABLE}) on the path or with \$EMCC or \$EMSCRIPTEN_BASE"
     fi
-    [[ -f $EMCC && ! -x $EMCC ]] && builder_die "locate_emscripten: Variable EMCC ($EMCC) points to ${EMCC_EXECUTABLE} but it is not executable"
-    [[ -x $EMCC ]] || builder_die "locate_emscripten: Variable EMCC ($EMCC) does not point to a valid executable ${EMCC_EXECUTABLE}"
-    EMSCRIPTEN_BASE="$(dirname "$EMCC")"
+    [[ -f "${EMCC}" && ! -x "${EMCC}" ]] && builder_die "locate_emscripten: Variable EMCC (${EMCC}) points to ${EMCC_EXECUTABLE} but it is not executable"
+    [[ -x "${EMCC}" ]] || builder_die "locate_emscripten: Variable EMCC (${EMCC}) does not point to a valid executable ${EMCC_EXECUTABLE}"
+    EMSCRIPTEN_BASE="$(dirname "${EMCC}")"
+  fi
+  [[ -f "${EMSCRIPTEN_BASE}/${EMCC_EXECUTABLE}" && ! -x "${EMSCRIPTEN_BASE}/${EMCC_EXECUTABLE}" ]] && builder_die "locate_emscripten: Variable EMSCRIPTEN_BASE (${EMSCRIPTEN_BASE}) contains ${EMCC_EXECUTABLE} but it is not executable"
+  if [[ ! -d "${EMSCRIPTEN_BASE}" ]]; then
+    # $EMSCRIPTEN_BASE does not exist, but check if we have emsdk in a parent directory. #13464
+    _can_locate_emsdk "${EMSCRIPTEN_BASE}" || builder_die "locate_emscripten: Variable EMSCRIPTEN_BASE (${EMSCRIPTEN_BASE}) points to a non-existent directory"
+  else
+    [[ -x "${EMSCRIPTEN_BASE}/${EMCC_EXECUTABLE}" ]] || builder_die "locate_emscripten: Variable EMSCRIPTEN_BASE (${EMSCRIPTEN_BASE}) does not point to ${EMCC_EXECUTABLE}'s folder"
   fi
-  [[ -f ${EMSCRIPTEN_BASE}/${EMCC_EXECUTABLE} && ! -x ${EMSCRIPTEN_BASE}/${EMCC_EXECUTABLE} ]] && builder_die "locate_emscripten: Variable EMSCRIPTEN_BASE ($EMSCRIPTEN_BASE) contains ${EMCC_EXECUTABLE} but it is not executable"
-  [[ -x ${EMSCRIPTEN_BASE}/${EMCC_EXECUTABLE} ]] || builder_die "locate_emscripten: Variable EMSCRIPTEN_BASE ($EMSCRIPTEN_BASE) does not point to ${EMCC_EXECUTABLE}'s folder"
-
   verify_emscripten_version
 }
 
@@ -44,11 +50,25 @@ locate_emscripten() {
 # For developers, define KEYMAN_USE_EMSDK to do this on your
 # build machine.
 verify_emscripten_version() {
-  if [[ "$KEYMAN_VERSION_ENVIRONMENT" != local || ! -z "${KEYMAN_USE_EMSDK+x}" ]]; then
+  # shellcheck disable=SC2154
+  if [[ "${KEYMAN_VERSION_ENVIRONMENT}" != local || ! -z "${KEYMAN_USE_EMSDK+x}" ]]; then
     _select_emscripten_version_with_emsdk
   fi
 }
 
+# Check if the grandparent directory (i.e. emscripten root) contains emsdk
+_can_locate_emsdk() {
+  local DIR="$1"
+  local GRANDPARENT
+  GRANDPARENT="$(dirname "$(dirname "${DIR}")")"
+
+  if [[ -f "${GRANDPARENT}/emsdk" ]]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
 # Use emsdk to select the appropriate version of Emscripten
 # according to minimum-versions.inc.sh
 _select_emscripten_version_with_emsdk() {
@@ -60,26 +80,31 @@ _select_emscripten_version_with_emsdk() {
     builder_die "Variable KEYMAN_MIN_VERSION_EMSCRIPTEN must be set"
   fi
 
-  pushd "${EMSCRIPTEN_BASE}/../.." > /dev/null
-  if [[ ! -f emsdk ]]; then
-    builder_die "emsdk[.bat] should be in $(pwd)"
-  fi
+  local GRANDPARENT
+  GRANDPARENT="$(dirname "$(dirname "${EMSCRIPTEN_BASE}")")"
+  (
+    # shellcheck disable=SC2164
+    cd "${GRANDPARENT}"
+    if [[ ! -f emsdk ]]; then
+      builder_die "emsdk[.bat] should be in ${GRANDPARENT}"
+    fi
 
-  export EMSDK_KEEP_DOWNLOADS=1
-  if builder_try_offline; then
-    if [[ ! -f ./emsdk_env.sh ]]; then
-      builder_die "emsdk_env.sh not found - emsdk not installed?"
+    export EMSDK_KEEP_DOWNLOADS=1
+    if builder_try_offline; then
+      if [[ ! -f ./emsdk_env.sh ]]; then
+        builder_die "emsdk_env.sh not found - emsdk not installed?"
+      fi
+      . ./emsdk_env.sh
+      if ! emcc --version | grep -q "${KEYMAN_MIN_VERSION_EMSCRIPTEN}"; then
+        builder_die "Wrong emsdk version installed"
+      fi
+    else
+      git pull
+      ./emsdk install "${KEYMAN_MIN_VERSION_EMSCRIPTEN}"
+      ./emsdk activate "${KEYMAN_MIN_VERSION_EMSCRIPTEN}"
+      # shellcheck disable=SC2164
+      cd upstream/emscripten
+      npm install
     fi
-    . ./emsdk_env.sh
-    if ! emcc --version | grep -q "$KEYMAN_MIN_VERSION_EMSCRIPTEN"; then
-      builder_die "Wrong emsdk version installed"
-    fi
-  else
-    git pull
-    ./emsdk install "$KEYMAN_MIN_VERSION_EMSCRIPTEN"
-    ./emsdk activate "$KEYMAN_MIN_VERSION_EMSCRIPTEN"
-    cd upstream/emscripten
-    npm install
-  fi
-  popd > /dev/null
+  )
 }
diff --git a/resources/shellHelperFunctions.sh b/resources/shellHelperFunctions.sh
deleted file mode 100755
index 802106401b..0000000000
--- a/resources/shellHelperFunctions.sh
+++ /dev/null
@@ -1,368 +0,0 @@
-#!/usr/bin/env bash
-
-# We only import JQ if not already defined; jq is used by
-# _select_node_version_with_nvm()
-
-if [[ -z "${JQ+x}" ]]; then
-  if [[ "$BUILDER_OS" == win ]]; then
-    . "$KEYMAN_ROOT/resources/build/jq.inc.sh"
-  else
-    JQ=jq
-  fi
-fi
-
-# Allows for a quick macOS check for those scripts requiring a macOS environment.
-verify_on_mac() {
-  if [[ "${OSTYPE}" != "darwin"* ]]; then
-    builder_die "This build script will only run in a Mac environment."
-    exit 1
-  fi
-}
-
-# The list of valid projects that our build scripts ought expect.
-projects=("android" "ios" "linux" "lmlayer" "mac" "web" "windows")
-
-# Used to validate a specified 'project' parameter.
-verify_project() {
-  match=false
-  for proj in ${projects[@]}
-  do
-    if [ $proj = $1 ]; then
-      match=true
-    fi
-  done
-
-  if [ $match = false ]; then
-    builder_die "Invalid project specified!"
-  fi
-}
-
-displayInfo() {
-    if [ "$QUIET" != true ]; then
-        while [[ $# -gt 0 ]] ; do
-            echo $1
-            shift # past argument
-        done
-    fi
-}
-
-assertFileExists() {
-    if ! [ -f $1 ]; then
-        builder_die "Build failed:  missing $1"
-    fi
-}
-
-assertDirExists() {
-    if ! [ -d $1 ]; then
-        builder_die "Build failed:  missing $1"
-    fi
-}
-
-assertValidVersionNbr()
-{
-    if [[ "$1" == "" || ! "$1" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-        builder_die "Specified version not valid: '$1'. Version should be in the form Major.Minor.BuildCounter"
-    fi
-}
-
-assertValidPRVersionNbr()
-{
-    if [[ "$1" == "" || ! "$1" =~ ^[0-9]+\.[0-9]+\.pull\.[0-9]+$ ]]; then
-        builder_die "Specified version not valid: '$1'. Version should be in the form Major.Minor.pull.BuildCounter"
-    fi
-}
-
-dl_info_display_usage() {
-    echo "Used to create a metadata file needed on the download site"
-    echo "for it to connect to the download.keyman.com API functions."
-    echo
-    echo "usage: write-download_info <name> <filepath> <version> <tier> <platform>"
-    echo
-    echo "  name           Specifies the user-friendly name of the product represented by the file."
-    echo "  filepath       Specifies the path and file in need of a .download_info metadata file."
-    echo "  version        Specifies the build version number, which should be in the"
-    echo "                   form Major.Minor.BuildCounter"
-    echo "  tier           Specifies tier (typically one of: alpha, beta, stable)."
-    echo "  platform       Specifies the target platforms for the file."
-    echo "                 (Should be one of: android, ios, mac, web, windows)"
-    echo
-    echo "The resulting .downloadinfo file will be automatically placed in the same directory"
-    echo "as the originally-specified file."
-    exit 1
-}
-
-write_download_info() {
-  #Process file & path information.
-  PRODUCT_NAME="$1"
-  BASE_PATH="$2"
-  KM_VERSION="$3"
-  KM_TIER="$4"
-  KM_PLATFORM="$5"
-
-  verify_project "$KM_PLATFORM"
-
-  BASE_DIR=$(dirname "${BASE_PATH}")
-  BASE_FILE=$(basename "${BASE_PATH}");
-
-  if ([ -h "${BASE_DIR}" ]) then
-    while([ -h "${BASE_DIR}" ]) do BASE_PATH=`readlink "${BASE_DIR}"`;
-    done
-  fi
-
-  assertFileExists "$2"
-
-  pushd . > /dev/null
-  cd `dirname ${BASE_DIR}` > /dev/null
-  BASE_PATH=`pwd`;
-  popd  > /dev/null
-
-  DEST_DIR="$BASE_DIR"
-
-  #Process version parameter.
-  assertValidVersionNbr "$3"
-  KM_BLD_COUNTER="$((${KM_VERSION##*.}))"
-
-  if [ "$KM_VERSION" = "" ]; then
-    builder_die "Required -version parameter not specified!"
-  fi
-
-  if [ "$KM_TIER" = "" ]; then
-    builder_die "Required -tier parameter not specified!"
-  fi
-
-  DOWNLOAD_INFO_FILEPATH="${BASE_PATH}/${BASE_FILE}.download_info"
-  if [[ ! -f "${BASE_PATH}/${BASE_FILE}" ]]; then
-    builder_die "Cannot compute file size or MD5 for non-existent DMG file: ${BASE_PATH}/${BASE_FILE}"
-  fi
-
-  FILE_EXTENSION="${BASE_FILE##*.}"
-
-  # stat flags to get filesize in bytes
-  if [ "$BUILDER_OS" == "mac" ] && [[ $(which stat) == /usr/bin/stat ]]; then
-    # /usr/bin/stat on mac is BSD
-    STAT_FLAGS="-f%z"
-  else
-    # GNU (coreutils)
-    STAT_FLAGS="-c%s"
-  fi
-  FILE_SIZE=$(stat ${STAT_FLAGS} "${BASE_PATH}/${BASE_FILE}")
-  MD5_HASH=$(md5sum "${BASE_PATH}/${BASE_FILE}" | cut -d" " -f 1 -) # hash is the first element returned
-
-  if [[ -f "$DOWNLOAD_INFO_FILEPATH" ]]; then
-    builder_warn "Overwriting $DOWNLOAD_INFO_FILEPATH"
-  fi
-
-  echo { > "$DOWNLOAD_INFO_FILEPATH"
-  echo "  \"name\": \"${PRODUCT_NAME}\"," >> "$DOWNLOAD_INFO_FILEPATH"
-  echo "  \"version\": \"${KM_VERSION}\"," >> "$DOWNLOAD_INFO_FILEPATH"
-  echo "  \"date\": \"$(date "+%Y-%m-%d")\"," >> "$DOWNLOAD_INFO_FILEPATH"
-  echo "  \"platform\": \"${KM_PLATFORM}\"," >> "$DOWNLOAD_INFO_FILEPATH"
-  echo "  \"stability\": \"${KM_TIER}\"," >> "$DOWNLOAD_INFO_FILEPATH"
-  echo "  \"file\": \"${BASE_FILE}\"," >> "$DOWNLOAD_INFO_FILEPATH"
-  echo "  \"md5\": \"${MD5_HASH}\"," >> "$DOWNLOAD_INFO_FILEPATH"
-  echo "  \"type\": \"${FILE_EXTENSION}\"," >> "$DOWNLOAD_INFO_FILEPATH"
-  echo "  \"build\": \"${KM_BLD_COUNTER}\"," >> "$DOWNLOAD_INFO_FILEPATH"
-  echo "  \"size\": \"${FILE_SIZE}\"" >> "$DOWNLOAD_INFO_FILEPATH"
-  echo } >> "$DOWNLOAD_INFO_FILEPATH"
-}
-
-# set_version sets the file version on mac/ios projects
-set_version ( ) {
-  PRODUCT_PATH=$1
-
-  if [ $KEYMAN_VERSION ]; then
-    if [ $2 ]; then  # $2 = product name.
-      echo "Setting version numbers in $2 to $KEYMAN_VERSION."
-    fi
-    /usr/libexec/Plistbuddy -c "Set CFBundleVersion $KEYMAN_VERSION" "$PRODUCT_PATH/Info.plist"
-    /usr/libexec/Plistbuddy -c "Set CFBundleShortVersionString $KEYMAN_VERSION" "$PRODUCT_PATH/Info.plist"
-  fi
-}
-
-
-# Uses npm to set the current package version (package.json).
-#
-# This sets the version according to the current KEYMAN_VERSION_WITH_TAG.
-#
-# Usage:
-#
-#   set_npm_version
-#
-set_npm_version () {
-  # We use --no-git-tag-version because our CI system controls version numbering and
-  # already tags releases. We also want to have the version of this match the
-  # release of Keyman Developer -- these two versions should be in sync. Because this
-  # is a large repo with multiple projects and build systems, it's better for us that
-  # individual build systems don't take too much ownership of git tagging. :)
-  npm version --allow-same-version --no-git-tag-version --no-commit-hooks "$KEYMAN_VERSION_WITH_TAG"
-}
-
-#
-# Re-runs the specified command-line instruction up to 5 times should it fail, waiting a
-# random delay between each attempt.  No re-runs are attempted after successful commands.
-#
-# ### Usage
-#   try_multiple_times command [param1 param2...]
-#
-# ### Parameters
-#   1: $@         command-line arguments
-try_multiple_times ( ) {
-  _try_multiple_times 0 "$@"
-}
-
-# $1  The current retry count
-# $2+ (everything else) the command to retry should it fail
-_try_multiple_times ( ) {
-  local RETRY_MAX=5
-
-  # Configuration:  wait between 10 sec and 120 sec.
-
-  # in seconds.
-  local RETRY_MAX_WAIT_RANGE=111
-  # in seconds
-  local RETRY_MIN_WAIT=10
-
-  local retryCount=$1
-  shift
-
-  if (( "$retryCount" == "$RETRY_MAX" )); then
-    builder_die "Retry limit of $RETRY_MAX attempts reached."
-  fi
-
-  retryCount=$(( $retryCount + 1 ))
-
-  if (( $retryCount != 1 )); then
-    local wait_length=$(( RANDOM % RETRY_MAX_WAIT_RANGE + RETRY_MIN_WAIT ))
-    builder_echo "Delaying $wait_length seconds before attempt $retryCount: \`$@\`"
-    sleep $wait_length
-  fi
-
-  local code=0
-  "$@" || code=$?
-  if (( $code != 0 )); then
-    builder_echo "Command failed with error $code"
-    _try_multiple_times $retryCount "$@"
-  fi
-}
-
-#
-# Verifies that node is installed, and installs npm packages, but only once per
-# build invocation
-#
-verify_npm_setup() {
-  # We'll piggy-back on the builder module dependency build state to determine
-  # if npm ci has been called in the current script invocation. Adding the
-  # prefix /external/ to module name in order to differentiate between this and
-  # internal modules (although it is unlikely to ever collide!); we will also
-  # use this pattern for other similar external dependencies in future. These
-  # functions are safe to call even in a non-builder context (they do nothing or
-  # return 1 -- not built)
-  if builder_has_module_been_built /external/npm-ci; then
-    return 0
-  fi
-  builder_set_module_has_been_built /external/npm-ci
-
-  # If we are on CI environment, automatically select a node version with nvm
-  # Also, a developer can set KEYMAN_USE_NVM variable to get this behaviour
-  # automatically too (see /docs/build/node.md)
-  if [[ "$KEYMAN_VERSION_ENVIRONMENT" != local || ! -z "${KEYMAN_USE_NVM+x}" ]]; then
-    _select_node_version_with_nvm
-  fi
-
-  # Check if Node.JS/npm is installed.
-  type npm >/dev/null ||\
-    builder_die "Build environment setup error detected!  Please ensure Node.js is installed!"
-
-  pushd "$KEYMAN_ROOT" > /dev/null
-
-  offline_param=
-  if builder_try_offline; then
-    builder_echo "Trying offline build"
-    offline_param=--prefer-offline
-  fi
-  try_multiple_times npm ${offline_param} ci
-
-  popd > /dev/null
-}
-
-_print_expected_node_version() {
-"$JQ" -r '.engines.node' "$KEYMAN_ROOT/package.json"
-}
-
-# Use nvm to select a node version according to package.json
-# see /docs/build/node.md
-_select_node_version_with_nvm() {
-  local REQUIRED_NODE_VERSION="$(_print_expected_node_version)"
-  local CURRENT_NODE_VERSION
-
-  if [[ $BUILDER_OS != win ]]; then
-    # launch nvm in a sub process, see _builder_nvm.sh for details
-    "$KEYMAN_ROOT/resources/build/_builder_nvm.sh" "$REQUIRED_NODE_VERSION"
-  else
-    CURRENT_NODE_VERSION="$(node --version)"
-    if [[ "$CURRENT_NODE_VERSION" != "v$REQUIRED_NODE_VERSION" ]]; then
-      start //wait //b nvm install "$REQUIRED_NODE_VERSION"
-      start //wait //b nvm use "$REQUIRED_NODE_VERSION"
-    fi
-  fi
-
-  # Now, check that the node version is correct, on all systems
-
-  # Note: On windows, `nvm use` and `nvm install` always return success.
-  # https://github.com/coreybutler/nvm-windows/issues/738
-
-  # note the 'v' prefix that node emits (and npm doesn't!)
-  CURRENT_NODE_VERSION="$(node --version)"
-  if [[ "$CURRENT_NODE_VERSION" != "v$REQUIRED_NODE_VERSION" ]]; then
-    builder_die "Attempted to select node.js version $REQUIRED_NODE_VERSION but found $CURRENT_NODE_VERSION instead"
-  fi
-}
-
-check-markdown() {
-  node "$KEYMAN_ROOT/resources/tools/check-markdown" --root "$1"
-}
-
-#
-# Runs eslint, builds tests, and then runs tests with mocha + c8 (coverage)
-#
-# Usage:
-#   builder_run_action  test    builder_do_typescript_tests [coverage_threshold]
-# Parameters:
-#   1: coverage_threshold   optional, minimum coverage for c8 to pass tests,
-#                           defaults to 90 (percent)
-#
-# Todo:
-#   Move to builder.typescript.inc.sh when this is established
-#
-builder_do_typescript_tests() {
-  local MOCHA_FLAGS=
-
-  if builder_is_running_on_teamcity; then
-    # we're running in TeamCity
-    MOCHA_FLAGS="-reporter mocha-teamcity-reporter"
-  fi
-
-  eslint .
-  tsc --build test/
-
-  local THRESHOLD_PARAMS=
-  local C8_THRESHOLD=
-  if [[ $# -gt 0 ]]; then
-    C8_THRESHOLD=$1
-    THRESHOLD_PARAMS="--lines $C8_THRESHOLD --statements $C8_THRESHOLD --branches $C8_THRESHOLD --functions $C8_THRESHOLD"
-  else
-    # Seems like a bug in TeamCity reporter if we don't list default thresholds,
-    # see #13418.
-    #
-    # Making branch and function thresholds slightly lower, because the default
-    # for c8 is 0 for these anyway.
-    THRESHOLD_PARAMS="--lines 90 --statements 90 --branches 80 --functions 80"
-  fi
-
-  c8 --reporter=lcov --reporter=text --exclude-after-remap --check-coverage $THRESHOLD_PARAMS mocha ${MOCHA_FLAGS} "${builder_extra_params[@]}"
-
-  if [[ ! -z "$C8_THRESHOLD" ]]; then
-    builder_echo warning "Coverage thresholds are currently $C8_THRESHOLD%, which is lower than ideal."
-    builder_echo warning "Please increase threshold in build.sh as test coverage improves."
-  fi
-}
diff --git a/resources/standards-data/ldml-keyboards/fetch-latest-cldr.sh b/resources/standards-data/ldml-keyboards/fetch-latest-cldr.sh
index 13037eed84..e9226250f2 100755
--- a/resources/standards-data/ldml-keyboards/fetch-latest-cldr.sh
+++ b/resources/standards-data/ldml-keyboards/fetch-latest-cldr.sh
@@ -16,7 +16,7 @@ fi
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/jq.inc.sh"
diff --git a/resources/standards-data/unicode-character-database/download.sh b/resources/standards-data/unicode-character-database/download.sh
index a6675d2874..020c032a87 100755
--- a/resources/standards-data/unicode-character-database/download.sh
+++ b/resources/standards-data/unicode-character-database/download.sh
@@ -3,7 +3,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../resources/build/builder.inc.sh"
+. "$(dirname "$THIS_SCRIPT")/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/minimum-versions.inc.sh"
diff --git a/resources/stats/stats.sh b/resources/stats/stats.sh
index 949d137e4b..c3aabb2cb5 100755
--- a/resources/stats/stats.sh
+++ b/resources/stats/stats.sh
@@ -6,10 +6,10 @@ set -u
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 cd "$THIS_SCRIPT_PATH"
 
diff --git a/resources/teamcity/android/android-actions.inc.sh b/resources/teamcity/android/android-actions.inc.sh
new file mode 100755
index 0000000000..5c56b81abe
--- /dev/null
+++ b/resources/teamcity/android/android-actions.inc.sh
@@ -0,0 +1,19 @@
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+android_clean_action() {
+  builder_echo start "clean" "Cleaning artifact directories"
+  # shellcheck disable=SC2154
+  "${KEYMAN_ROOT}/android/build.sh" clean
+  builder_echo end "clean" success "Finished cleaning artifact directories"
+}
+
+android_build_action() {
+  builder_echo start "build" "Building Keyman for Android"
+  local TARGETS="$1"
+  local ARGS="$2"
+
+  # REVIEW: is it deliberate that we `configure` all targets but only `build,test` `$TARGETS`?
+  "${KEYMAN_ROOT}/android/build.sh" configure build,test:"${TARGETS}" ${ARGS}
+  builder_echo end "build" success "Finished building Keyman for Android"
+}
diff --git a/resources/teamcity/android/keyman-android-release.sh b/resources/teamcity/android/keyman-android-release.sh
new file mode 100755
index 0000000000..3886c8de78
--- /dev/null
+++ b/resources/teamcity/android/keyman-android-release.sh
@@ -0,0 +1,115 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# TC build script to build release of Keyman for Android.
+
+# shellcheck disable=SC2164
+# shellcheck disable=SC1091
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+# shellcheck disable=SC2154
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "${KEYMAN_ROOT}/resources/build/zip.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/android/android-actions.inc.sh"
+
+################################ Main script ################################
+
+# ENHANCE: In the future if we ever have OEM builds other than FV, we could go
+# with `--oem=OEM` instead of `--fv` where $OEM could be a comma separated
+# list, e.g. `firstvoices`.
+# See https://github.com/keymanapp/keyman/pull/14222/files#r2181208750.
+
+builder_describe \
+  "Build release of Keyman for Android" \
+  "all            run all actions" \
+  "build          configure and build Keyman for Android" \
+  "publish        publish release" \
+  "--fv                               additionally build FV Android" \
+  "--rsync-path=RSYNC_PATH            rsync path on remote server" \
+  "--rsync-user=RSYNC_USER            rsync user on remote server" \
+  "--rsync-host=RSYNC_HOST            rsync host on remote server" \
+  "--rsync-root=RSYNC_ROOT            rsync root on remote server" \
+  "--help.keyman.com=HELP_KEYMAN_COM  path to help.keyman.com repository"
+
+builder_parse "$@"
+
+cd "${KEYMAN_ROOT}/android"
+
+function _create_zip_archive() {
+  builder_echo start "archive" "Copying release artifacts to upload/ and creating zip"
+
+  "${KEYMAN_ROOT}/android/build.sh" archive
+
+  builder_echo end "archive" success "Finished copying release artifacts to upload/ and creating zip"
+}
+
+function _publish_to_downloads_keyman_com() {
+  # Publish to downloads.keyman.com
+  builder_echo start "publish to downloads.keyman.com" "Publishing release to downloads.keyman.com"
+
+  (
+    cd "${KEYMAN_ROOT}/android/upload"
+    # shellcheck disable=SC2154
+    tc_rsync_upload "${KEYMAN_VERSION}" "android/${KEYMAN_TIER}"
+  )
+
+  builder_echo end "publish to downloads.keyman.com" success "Finished publishing release to downloads.keyman.com"
+}
+
+function _publish_to_playstore() {
+  local PUBTARGETS="$1"
+  builder_echo start "publish to Google Play Store" "Publishing release to Google Play Store"
+
+  "${KEYMAN_ROOT}/android/build.sh" "publish:${PUBTARGETS}"
+
+  builder_echo end "publish to Google Play Store" success "Finished publishing release to Google Play Store"
+}
+
+function do_publish() {
+  local PUBTARGETS
+  if ! builder_is_windows; then
+    # currently only tested on Windows, TODO: test cross-platform
+    builder_echo error "This script is intended to be run on Windows only."
+    return 1
+  fi
+
+  export RSYNC_PATH
+  export RSYNC_USER
+  export RSYNC_HOST
+  export RSYNC_ROOT
+
+  if builder_has_option --fv; then
+    PUBTARGETS="app,fv"
+  else
+    # shellcheck disable=SC2034
+    PUBTARGETS="app"
+  fi
+
+  _create_zip_archive
+  _publish_to_downloads_keyman_com
+  _publish_to_playstore "${PUBTARGETS}"
+  tc_upload_help "Keyman for Android" android
+}
+
+if builder_has_option --fv; then
+  TARGETS="engine,app,fv"
+else
+  # shellcheck disable=SC2034
+  TARGETS="engine,app"
+fi
+
+if builder_has_action all; then
+  android_clean_action
+  android_build_action "${TARGETS}" --release
+  do_publish
+else
+  builder_run_action  clean    android_clean_action
+  builder_run_action  build    android_build_action "${TARGETS}" --release
+  builder_run_action  publish  do_publish
+fi
diff --git a/resources/teamcity/android/keyman-android-test-samples.sh b/resources/teamcity/android/keyman-android-test-samples.sh
new file mode 100755
index 0000000000..58e1a7a1d8
--- /dev/null
+++ b/resources/teamcity/android/keyman-android-test-samples.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# TC build script for Samples and Test projects
+
+# shellcheck disable=SC2164
+# shellcheck disable=SC1091
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+# shellcheck disable=SC2154
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/android/android-actions.inc.sh"
+
+################################ Main script ################################
+
+builder_describe \
+  "Build KMSample1, KMSample2, and Test projects" \
+  "all            run all actions" \
+  "clean          clean artifact directories" \
+  "build          configure and build Keyman for Android samples"
+
+builder_parse "$@"
+
+cd "${KEYMAN_ROOT}/android"
+
+function do_build() {
+  "${KEYMAN_ROOT}/android/build.sh" \
+    configure,build:engine,sample1,sample2,keyboardharness \
+    --debug
+}
+
+if builder_has_action all; then
+  android_clean_action
+  do_build
+else
+  builder_run_action  clean   android_clean_action
+  builder_run_action  build   do_build
+fi
diff --git a/resources/teamcity/android/keyman-android-test.sh b/resources/teamcity/android/keyman-android-test.sh
new file mode 100755
index 0000000000..d9ed2a7f48
--- /dev/null
+++ b/resources/teamcity/android/keyman-android-test.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# TC build script for Keyman Android/Test
+
+# shellcheck disable=SC2164
+# shellcheck disable=SC1091
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+# shellcheck disable=SC2154
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/android/android-actions.inc.sh"
+
+################################ Main script ################################
+
+builder_describe \
+  "Build and run tests for Keyman for Android" \
+  "--fv           additionally build and Test FV Android" \
+  "all            run all actions" \
+  "clean          clean artifact directories" \
+  "build          configure, build and test Keyman for Android"
+
+builder_parse "$@"
+
+cd "${KEYMAN_ROOT}/android"
+
+if builder_has_option --fv; then
+  TARGETS="engine,app,fv"
+else
+  # shellcheck disable=SC2034
+  TARGETS="engine,app"
+fi
+
+if builder_has_action all; then
+  android_clean_action
+  android_build_action "${TARGETS}" --debug
+else
+  builder_run_action  clean   android_clean_action
+  builder_run_action  build   android_build_action "${TARGETS}" --debug
+fi
diff --git a/resources/teamcity/common/common-test-common-web.sh b/resources/teamcity/common/common-test-common-web.sh
new file mode 100755
index 0000000000..31961f4aea
--- /dev/null
+++ b/resources/teamcity/common/common-test-common-web.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+# shellcheck disable=SC2164
+# shellcheck disable=SC1091
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+################################ Main script ################################
+
+builder_describe \
+  "Run unit tests in /common/web" \
+  "all            configure, build, and test common/web"
+
+builder_parse "$@"
+
+builder_run_action all  "${KEYMAN_ROOT}/common/web/build.sh" configure build test
diff --git a/resources/teamcity/common/common-test-common.sh b/resources/teamcity/common/common-test-common.sh
new file mode 100755
index 0000000000..e238236c66
--- /dev/null
+++ b/resources/teamcity/common/common-test-common.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+# shellcheck disable=SC2164
+# shellcheck disable=SC1091
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+################################ Main script ################################
+
+builder_describe \
+  "Run unit tests in /common" \
+  "all            configure, build, and test common modules"
+
+builder_parse "$@"
+
+builder_run_action all  "${KEYMAN_ROOT}/common/build.sh" configure build test
diff --git a/resources/teamcity/common/common-test-core-wasm.sh b/resources/teamcity/common/common-test-core-wasm.sh
new file mode 100755
index 0000000000..2764aaa247
--- /dev/null
+++ b/resources/teamcity/common/common-test-core-wasm.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+# shellcheck disable=SC2164
+# shellcheck disable=SC1091
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+
+################################ Main script ################################
+
+builder_describe \
+  "Test Keyman Core on WASM" \
+  "all            full meson build and test of Keyman Core for WASM"
+
+builder_parse "$@"
+
+builder_run_action all  "${KEYMAN_ROOT}/core/build.sh" configure,build,test:wasm
diff --git a/resources/teamcity/common/common-test-core.sh b/resources/teamcity/common/common-test-core.sh
new file mode 100755
index 0000000000..6d061ec4c0
--- /dev/null
+++ b/resources/teamcity/common/common-test-core.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+# shellcheck disable=SC2164
+# shellcheck disable=SC1091
+# shellcheck disable=SC2248
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+# shellcheck disable=SC2154
+. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
+
+################################ Main script ################################
+
+builder_describe \
+  "Test Keyman Core" \
+  "all            full meson build and test of Keyman Core"
+
+builder_parse "$@"
+
+if builder_is_linux; then
+  ARCH=arch
+elif builder_is_windows; then
+  ARCH=win
+elif builder_is_macos; then
+  ARCH=mac
+else
+  builder_echo error "Unknown architecture"
+  exit 1
+fi
+
+function do_all() {
+  "${KEYMAN_ROOT}/core/build.sh" configure,build,test:${ARCH}
+}
+
+builder_run_action  all  do_all
diff --git a/resources/teamcity/developer/developer-actions.inc.sh b/resources/teamcity/developer/developer-actions.inc.sh
index 45d3792dbe..4a96e1d3bd 100644
--- a/resources/teamcity/developer/developer-actions.inc.sh
+++ b/resources/teamcity/developer/developer-actions.inc.sh
@@ -1,16 +1,16 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 # Keyman is copyright (C) SIL Global. MIT License.
 
 developer_install_dependencies_on_linux_action() {
-  if ! is_ubuntu; then
+  if ! builder_is_linux; then
     return 0
   fi
 
   builder_echo start "install dependencies" "Installing dependencies"
 
-  linux_check_and_install_packages devscripts jq meson
-  install_nvm
-  install_emscripten
+  ba_linux_check_and_install_packages devscripts jq meson
+  ba_linux_install_nvm
+  ba_linux_install_emscripten
 
   builder_echo end "install dependencies" success "Finished installing dependencies"
 }
diff --git a/resources/teamcity/developer/download-symbol-server-index.ps1 b/resources/teamcity/developer/download-symbol-server-index.ps1
deleted file mode 100644
index ffa0d97ba1..0000000000
--- a/resources/teamcity/developer/download-symbol-server-index.ps1
+++ /dev/null
@@ -1,63 +0,0 @@
-# Keyman is copyright (C) SIL Global. MIT License.
-#
-# This script should be the identical for nightly/beta/stable for a given platform
-#
-
-$ErrorActionPreference = "Stop"
-
-$RSYNC_HOME = $env:RSYNC_HOME
-$RSYNC_PATH = $env:RSYNC_PATH
-$RSYNC_USER = $env:RSYNC_USER
-$RSYNC_HOST = $env:RSYNC_HOST
-$RSYNC_ROOT = $env:RSYNC_ROOT
-$USERPROFILE = $env:USERPROFILE
-
-New-Item -Force -ItemType Directory symbols\000admin
-cd symbols\000admin
-
-#
-# Download the symbol server index files with rsync from downloads.keyman.com
-# (rsync requires that we are in the symbols folder to get folders in
-# sync correctly; it is possible to resolve this but easier to just cd.)
-#
-
-$rsync_args = @(
-  '-vrzltp',                                # verbose, recurse, zip, copy symlinks, preserve times, permissions
-  '--chmod=Dug=rwx,Do=rx,Fug=rw,Fo=r',      # map Windows security to host security
-  '--stats',                                # show statistics for log
-  "--rsync-path='$RSYNC_PATH'",             # path on remote server
-  "--rsh=$RSYNC_HOME\ssh -i $USERPROFILE\.ssh\id_rsa -o UserKnownHostsFile=$USERPROFILE\.ssh\known_hosts",                  # use ssh
-  "$RSYNC_USER@$RSYNC_HOST:$RSYNC_ROOT/windows/symbols/000admin/lastid.txt", # target server + path
-  "."                                       # download the whole symbols 000Admin folder
-)
-
-& $RSYNC_HOME\rsync.exe $rsync_args
-if ($LASTEXITCODE -ne 0) { throw "Exit code is $LASTEXITCODE" }
-
-$rsync_args = @(
-  '-vrzltp',                                # verbose, recurse, zip, copy symlinks, preserve times, permissions
-  '--chmod=Dug=rwx,Do=rx,Fug=rw,Fo=r',      # map Windows security to host security
-  '--stats',                                # show statistics for log
-  "--rsync-path='$RSYNC_PATH'",             # path on remote server
-  "--rsh=$RSYNC_HOME\ssh -i $USERPROFILE\.ssh\id_rsa -o UserKnownHostsFile=$USERPROFILE\.ssh\known_hosts",                  # use ssh
-  "$RSYNC_USER@$RSYNC_HOST:$RSYNC_ROOT/windows/symbols/000admin/history.txt", # target server + path
-  "."                                       # download the whole symbols 000Admin folder
-)
-
-& $RSYNC_HOME\rsync.exe $rsync_args
-if ($LASTEXITCODE -ne 0) { throw "Exit code is $LASTEXITCODE" }
-
-$rsync_args = @(
-  '-vrzltp',                                # verbose, recurse, zip, copy symlinks, preserve times, permissions
-  '--chmod=Dug=rwx,Do=rx,Fug=rw,Fo=r',      # map Windows security to host security
-  '--stats',                                # show statistics for log
-  "--rsync-path='$RSYNC_PATH'",             # path on remote server
-  "--rsh=$RSYNC_HOME\ssh -i $USERPROFILE\.ssh\id_rsa -o UserKnownHostsFile=$USERPROFILE\.ssh\known_hosts",                  # use ssh
-  "$RSYNC_USER@$RSYNC_HOST:$RSYNC_ROOT/windows/symbols/000admin/server.txt", # target server + path
-  "."                                       # download the whole symbols 000Admin folder
-)
-
-& $RSYNC_HOME\rsync.exe $rsync_args
-if ($LASTEXITCODE -ne 0) { throw "Exit code is $LASTEXITCODE" }
-
-# EOF
diff --git a/resources/teamcity/developer/keyman-developer-release.sh b/resources/teamcity/developer/keyman-developer-release.sh
index 5aa8608a23..b24978de0d 100755
--- a/resources/teamcity/developer/keyman-developer-release.sh
+++ b/resources/teamcity/developer/keyman-developer-release.sh
@@ -9,24 +9,29 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-windows.inc.sh"
 
 ################################ Main script ################################
 
 builder_describe \
-  "Build Keyman Developer on Windows" \
+  "Build release of Keyman Developer" \
   "all            run all actions" \
   "build          build Keyman Developer and test keyboards" \
   "publish        publish release of Keyman Developer" \
-  "--rsync-path=RSYNC_PATH            rsync path on remote server" \
-  "--rsync-user=RSYNC_USER            rsync user on remote server" \
-  "--rsync-host=RSYNC_HOST            rsync host on remote server" \
-  "--rsync-root=RSYNC_ROOT            rsync root on remote server" \
-  "--help.keyman.com=HELP_KEYMAN_COM  path to help.keyman.com repository"
+  "--rsync-path=RSYNC_PATH                    rsync path on remote server" \
+  "--rsync-user=RSYNC_USER                    rsync user on remote server" \
+  "--rsync-host=RSYNC_HOST                    rsync host on remote server" \
+  "--rsync-root=RSYNC_ROOT                    rsync root on remote server" \
+  "--help.keyman.com=HELP_KEYMAN_COM          path to help.keyman.com repository" \
+  "--symbols-local-path=LOCAL_SYMBOLS_PATH    local path to symbols directory" \
+  "--symbols-remote-path=REMOTE_SYMBOLS_PATH  remote path to symbols directory" \
+  "--symbols-subdir=SYMBOLS_SUBDIR            subdirectory containing symbols"
 
 builder_parse "$@"
 
@@ -57,59 +62,53 @@ function _publish_sentry() {
   builder_echo end "publish sentry" success "Finished publishing debug information files to Sentry"
 }
 
-function _download_symbol_server_index() {
-  # Download symbol server index from symbol server
-  builder_echo start "download symbol server index" "Downloading symbol server index"
-
-  cd "${KEYMAN_ROOT}/.."
-  # shellcheck disable=SC2154
-  powershell -NonInteractive -ExecutionPolicy Bypass -File "${THIS_SCRIPT_PATH}/download-symbol-server-index.ps1"
-  cd "${KEYMAN_ROOT}/developer/src"
-
-  builder_echo end "download symbol server index" success "Finished downloading symbol server index"
-}
-
-function _publish_new_symbols() {
-  # Publish new symbols to symbol server
-  builder_echo start "publish new symbols" "Publishing new symbols to symbol server"
-
-  cd "${KEYMAN_ROOT}/../symbols"
-  # shellcheck disable=SC2154
-  powershell -NonInteractive -ExecutionPolicy Bypass -File "${THIS_SCRIPT_PATH}/publish-new-symbols.ps1"
-  cd "${KEYMAN_ROOT}/developer/src"
-
-  builder_echo end "publish new symbols" success "Finished publishing new symbols to symbol server"
-}
-
 function _publish_to_downloads_keyman_com() {
   # Publish to downloads.keyman.com
   builder_echo start "publish to downloads.keyman.com" "Publishing release to downloads.keyman.com"
 
-  cd "${KEYMAN_ROOT}/developer"
-  # shellcheck disable=SC2154
-  powershell -NonInteractive -ExecutionPolicy Bypass -File "${THIS_SCRIPT_PATH}/publish-to-downloads-keyman-com.ps1"
-  cd "${KEYMAN_ROOT}/developer/src"
+  (
+    cd "${KEYMAN_ROOT}/developer"
+
+    local UPLOAD_PATH KEYBOARDS_PATH KMCOMP_ZIP DEVELOPER_EXE DEBUG_ZIP
+    # shellcheck disable=SC2154
+    UPLOAD_PATH="${KEYMAN_ROOT}/developer/upload/${KEYMAN_VERSION}"
+    KEYBOARDS_PATH="${UPLOAD_PATH}/keyboards"
+    KMCOMP_ZIP="kmcomp-${KEYMAN_VERSION}.zip"
+    DEVELOPER_EXE="keymandeveloper-${KEYMAN_VERSION}.exe"
+    DEBUG_ZIP="debug-${KEYMAN_VERSION}.zip"
+
+    rm -rf "${UPLOAD_PATH}"
+    mkdir -p "${UPLOAD_PATH}"
+
+    cp "${KEYMAN_ROOT}/developer/release/${KEYMAN_VERSION}/${DEVELOPER_EXE}" "${UPLOAD_PATH}/"
+    cp "${KEYMAN_ROOT}/developer/release/${KEYMAN_VERSION}/${KMCOMP_ZIP}"    "${UPLOAD_PATH}/"
+
+    write_download_info "${UPLOAD_PATH}" "${DEVELOPER_EXE}" "Keyman Developer" exe win
+    write_download_info "${UPLOAD_PATH}" "${KMCOMP_ZIP}" "Keyman Developer Command-Line Compiler" zip win
+
+    mkdir -p "${KEYBOARDS_PATH}"
+    cp -r "${KEYMAN_ROOT}/common/test/keyboards"/*/build/*.kmp "${KEYBOARDS_PATH}/"
+
+    if [[ -f "${KEYMAN_ROOT}/developer/release/${KEYMAN_VERSION}/${DEBUG_ZIP}" ]]; then
+      cp "${KEYMAN_ROOT}/developer/release/${KEYMAN_VERSION}/${DEBUG_ZIP}" "${UPLOAD_PATH}/"
+      write_download_info "${UPLOAD_PATH}" "${DEBUG_ZIP}" "Keyman Developer debug files" zip win
+    fi
+
+    cd "${KEYMAN_ROOT}/developer/upload"
+    # shellcheck disable=SC2154
+    tc_rsync_upload "${KEYMAN_VERSION}" "developer/${KEYMAN_TIER}"
+  )
 
   builder_echo end "publish to downloads.keyman.com" success "Finished publishing release to downloads.keyman.com"
 }
 
-function _publish_api_documentation() {
-  # Upload new Keyman Developer API documentation to help.keyman.com
-  builder_echo start "publish api documentation" "Uploading new Keyman Developer API documentation to help.keyman.com"
-
-  export HELP_KEYMAN_COM="${HELP_KEYMAN_COM:-${KEYMAN_ROOT}/../help.keyman.com}"
-  "${KEYMAN_ROOT}/resources/build/help-keyman-com.sh" developer
-
-  builder_echo end "publish api documentation" success "Finished uploading new Keyman Developer API documentation to help.keyman.com"
-}
-
 function build_developer_action() {
   _build_developer
   _build_testkeyboards
 }
 
 function publish_action() {
-  if ! is_windows; then
+  if ! builder_is_windows; then
     # requires Powershell, so currently only supported on Windows
     builder_echo error "This script is intended to be run on Windows only."
     return 1
@@ -121,10 +120,10 @@ function publish_action() {
   export RSYNC_ROOT
 
   _publish_sentry
-  _download_symbol_server_index
-  _publish_new_symbols
+  ba_win_download_symbol_server_index
+  ba_win_publish_new_symbols
   _publish_to_downloads_keyman_com
-  _publish_api_documentation
+  tc_upload_help "api documentation" developer
 }
 
 if builder_has_action all; then
diff --git a/resources/teamcity/developer/keyman-developer-test-linux-macos.sh b/resources/teamcity/developer/keyman-developer-test-linux-macos.sh
index c273873fe0..90fa341021 100755
--- a/resources/teamcity/developer/keyman-developer-test-linux-macos.sh
+++ b/resources/teamcity/developer/keyman-developer-test-linux-macos.sh
@@ -9,12 +9,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
 . "${KEYMAN_ROOT}/resources/teamcity/developer/developer-actions.inc.sh"
-. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-actions.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-linux.inc.sh"
 
@@ -38,7 +37,7 @@ function build_developer_action() {
   builder_echo end "build developer" success "Finished building Keyman Developer"
 }
 
-if is_windows; then
+if builder_is_windows; then
   builder_echo error "This script is intended to be run on Linux or macOS only."
   exit 1
 fi
@@ -46,15 +45,15 @@ fi
 if builder_has_action all; then
   developer_install_dependencies_on_linux_action
 
-  set_variables_for_nvm
-  set_variables_for_emscripten
+  tc_set_variables_for_nvm
+  tc_set_variables_for_emscripten
 
   build_developer_action
 else
   builder_run_action  configure   developer_install_dependencies_on_linux_action
 
-  set_variables_for_nvm
-  set_variables_for_emscripten
+  tc_set_variables_for_nvm
+  tc_set_variables_for_emscripten
 
   builder_run_action  build       build_developer_action
 fi
diff --git a/resources/teamcity/developer/keyman-developer-test-windows.sh b/resources/teamcity/developer/keyman-developer-test-windows.sh
index 75bb60b4ac..668e7a9c04 100755
--- a/resources/teamcity/developer/keyman-developer-test-windows.sh
+++ b/resources/teamcity/developer/keyman-developer-test-windows.sh
@@ -9,7 +9,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
@@ -19,12 +19,17 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 builder_describe \
   "Build Keyman Developer on Windows" \
-  "all            run all actions" \
+  "all            run all actions (used by TeamCity build configuration)" \
   "build          build Keyman Developer and test keyboards" \
   "publish        publish debug information files to sentry"
 
 builder_parse "$@"
 
+if ! builder_is_windows; then
+  builder_echo error "This script is intended to be run on Windows only."
+  exit 1
+fi
+
 # shellcheck disable=SC2154
 cd "${KEYMAN_ROOT}/developer/src"
 
@@ -34,11 +39,11 @@ function build_developer_action() {
 }
 
 function _build_developer() {
-  builder_echo start "build developer" "Building Keyman Developer"
+  builder_echo start "build developer" "Building and testing Keyman Developer"
 
-  ./build.sh configure build test api publish --dry-run
+  ./build.sh configure build test
 
-  builder_echo end "build developer" success "Finished building Keyman Developer"
+  builder_echo end "build developer" success "Finished building and testing Keyman Developer"
 }
 
 function _build_testkeyboards() {
@@ -50,21 +55,22 @@ function _build_testkeyboards() {
 }
 
 function publish_sentry_action() {
+  builder_echo start "publish" "Dry-run publish and api"
+  ./build.sh api publish --dry-run
+  builder_echo end "publish" "Dry-run publish and api"
+
   builder_echo start "publish sentry" "Publishing debug information files to Sentry"
-
+  # TODO: move this into build.sh publish? re-scope --dry-run into build.sh?
   "${KEYMAN_ROOT}/developer/src/tools/sentry-upload-difs.sh"
-
   builder_echo end "publish sentry" success "Finished publishing debug information files to Sentry"
 }
 
-if ! is_windows; then
-  builder_echo error "This script is intended to be run on Windows only."
-  exit 1
-fi
-
 if builder_has_action all; then
+  # TODO: control codesign by KEYMAN_BUILD_LEVEL
   build_developer_action
-  publish_sentry_action
+  if builder_is_ci_build_level_release; then
+    publish_sentry_action
+  fi
 else
   builder_run_action  build    build_developer_action
   builder_run_action  publish  publish_sentry_action
diff --git a/resources/teamcity/developer/publish-new-symbols.ps1 b/resources/teamcity/developer/publish-new-symbols.ps1
deleted file mode 100644
index 40c43df1c8..0000000000
--- a/resources/teamcity/developer/publish-new-symbols.ps1
+++ /dev/null
@@ -1,39 +0,0 @@
-# Keyman is copyright (C) SIL Global. MIT License.
-#
-# This script should be the identical for nightly/beta/stable for a given platform
-#
-
-$ErrorActionPreference = "Stop"
-
-$RSYNC_HOME = $env:RSYNC_HOME
-$RSYNC_PATH = $env:RSYNC_PATH
-$RSYNC_USER = $env:RSYNC_USER
-$RSYNC_HOST = $env:RSYNC_HOST
-$RSYNC_ROOT = $env:RSYNC_ROOT
-$USERPROFILE = $env:USERPROFILE
-
-# Rename 000Admin to 000admin
-
-ren 000Admin 000admin_
-ren 000admin_ 000admin
-
-#
-# Upload with rsync to downloads.keyman.com
-# (rsync requires that we are in the symbols folder to get folders in
-# sync correctly; it is possible to resolve this but easier to just cd.)
-#
-
-$rsync_args = @(
-  '-vrzltp',                                # verbose, recurse, zip, copy symlinks, preserve times, permissions
-  '--chmod=Dug=rwx,Do=rx,Fug=rw,Fo=r',      # map Windows security to host security
-  '--stats',                                # show statistics for log
-  "--rsync-path='$RSYNC_PATH'",             # path on remote server
-  "--rsh=$RSYNC_HOME\ssh -i $USERPROFILE\.ssh\id_rsa -o UserKnownHostsFile=$USERPROFILE\.ssh\known_hosts",                  # use ssh
-  ".",                                      # upload the whole symbols folder
-  "$RSYNC_USER@$RSYNC_HOST:$RSYNC_ROOT/windows/symbols/" # target server + path
-)
-
-& $RSYNC_HOME\rsync.exe $rsync_args
-if ($LASTEXITCODE -ne 0) { throw "Exit code is $LASTEXITCODE" }
-
-# EOF
diff --git a/resources/teamcity/developer/publish-to-downloads-keyman-com.ps1 b/resources/teamcity/developer/publish-to-downloads-keyman-com.ps1
deleted file mode 100644
index 884e098afa..0000000000
--- a/resources/teamcity/developer/publish-to-downloads-keyman-com.ps1
+++ /dev/null
@@ -1,223 +0,0 @@
-# Keyman is copyright (C) SIL Global. MIT License.
-
-$ErrorActionPreference = "Stop"
-
-$tier = Get-Content ..\TIER.md
-$build_number = Get-Content ..\VERSION.md
-$build_counter = $build_number -replace "^\d+\.\d+\.(\d+)$", '$1'
-$msi_major_version = $build_number -replace "^(\d+)\.(\d+)\.(\d+)$", '$1$2'
-
-if ( $tier -eq "alpha" -or $tier -eq "beta") {
-  $version_tag = $tier
-  $version_with_tag = $build_number  # we may go with $build_number + "-" + $version_tag in the future one day
-} else {
-  $version_tag = ""
-  $version_with_tag = $build_number
-}
-
-$upload_path = "upload\$build_number"
-$keyboards_path = "$upload_path\keyboards"
-
-# Keyman Developer installers
-$kmcomp_zip = "kmcomp-$version_with_tag.zip"
-$keyman_developer_exe = "keymandeveloper-$version_with_tag.exe"
-
-$setup_exe = "setup.exe"
-
-# Debug files
-$debug_zip = "debug-$build_number.zip"
-
-$7Z_HOME = $env:7Z_HOME
-$RSYNC_HOME = $env:RSYNC_HOME
-$RSYNC_PATH = $env:RSYNC_PATH
-$RSYNC_USER = $env:RSYNC_USER
-$RSYNC_HOST = $env:RSYNC_HOST
-$RSYNC_ROOT = $env:RSYNC_ROOT
-$USERPROFILE = $env:USERPROFILE
-
-###########################################################################################
-## Developer upload
-###########################################################################################
-
-#
-# Preparation
-#
-
-if((Test-Path $upload_path) -ne 0) {
-  Remove-Item -Path $upload_path -Recurse
-}
-
-mkdir $upload_path
-
-#
-# Build Keyman Compiler WINE archive
-#
-
-if((Test-Path ..\release\$kmcomp_zip) -ne 0) {
-  copy ..\release\$kmcomp_zip ..\$upload_path\$kmcomp_zip
-} else {
-  cd bin
-  if((Test-Path ..\..\common\schemas\keyboard_info\keyboard_info.source.json) -ne 0) {
-    # Keyman versions through -16.0
-    copy ..\..\common\schemas\keyboard_info\keyboard_info.source.json .
-    copy ..\..\common\schemas\keyboard_info\keyboard_info.distribution.json .
-    & "$7Z_HOME\7z.exe" a -bd -bb0 ..\$upload_path\$kmcomp_zip kmcomp.exe kmcmpdll.dll kmcomp.x64.exe kmcmpdll.x64.dll kmconvert.exe keyboard_info.source.json keyboard_info.distribution.json xml\layoutbuilder\*.keyman-touch-layout projects\
-
-    # Add Keyman Developer Server to the archive (15.0 late alpha - after 171)
-    if((Test-Path ..\src\server\build) -ne 0) {
-      copy ..\src\server\build\ server\ -Recurse
-      & "$7Z_HOME\7z.exe" a -bd -bb0 ..\$upload_path\$kmcomp_zip server\
-    }
-  } else {
-    # Keyman versions 17.0+; note, use npm install for most modules
-    copy ..\..\common\schemas\keyboard_info\keyboard_info.schema.json .
-    & "$7Z_HOME\7z.exe" a -bd -bb0 ..\$upload_path\$kmcomp_zip kmconvert.exe keyboard_info.schema.json xml\layoutbuilder\*.keyman-touch-layout projects\ server\
-  }
-  cd ..
-}
-
-#
-# Copy source files
-#
-
-copy release\$build_number\$keyman_developer_exe $upload_path\$keyman_developer_exe
-
-#
-# Construct keyman_developer.download_info
-#
-
-$hash = get-filehash $upload_path\$keyman_developer_exe -Algorithm MD5
-
-$keyman_developer_download_info = @"
-{
-  "name": "Keyman Developer",
-  "version": "$version_with_tag",
-  "date": "$([DateTime]::Now.ToString("yyyy-MM-dd"))",
-  "platform": "win",
-  "stability": "$tier",
-  "file": "keymandeveloper-$version_with_tag.exe",
-  "md5": "$($hash.Hash)",
-  "type": "exe",
-  "build": "$build_counter"
-}
-"@
-
-[System.IO.File]::WriteAllLines("$pwd\$upload_path\$keyman_developer_exe.download_info", $keyman_developer_download_info)
-
-#
-# Construct kmcomp.download_info
-#
-
-$hash = get-filehash $upload_path\$kmcomp_zip -Algorithm MD5
-
-$kmcomp_download_info = @"
-{
-  "name": "Keyman Developer Command-Line Compiler",
-  "version": "$version_with_tag",
-  "date": "$([DateTime]::Now.ToString("yyyy-MM-dd"))",
-  "platform": "win",
-  "stability": "$tier",
-  "file": "kmcomp-$version_with_tag.zip",
-  "md5": "$($hash.Hash)",
-  "type": "zip",
-  "build": "$build_counter"
-}
-"@
-
-[System.IO.File]::WriteAllLines("$pwd\$upload_path\$kmcomp_zip.download_info", $kmcomp_download_info)
-
-#
-# Copy common/test/keyboards/*/build/*.kmp to keyboards/
-#
-if((Test-Path ..\common\test\keyboards) -ne 0) {
-  mkdir $keyboards_path
-  Copy-Item ..\common\test\keyboards\*\build\*.kmp $keyboards_path\
-}
-
-#
-# Upload with rsync to downloads.keyman.com
-# (rsync requires that we are in the upload folder to get folders in
-# sync correctly; it is possible to resolve this but easier to just cd.)
-#
-
-$rsync_args = @(
-  '-vrzltp',                                # verbose, recurse, zip, copy symlinks, preserve times, permissions
-  '--chmod=Dug=rwx,Do=rx,Fug=rw,Fo=r',      # map Windows security to host security
-  '--stats',                                # show statistics for log
-  "--rsync-path='$RSYNC_PATH'",             # path on remote server
-  "--rsh=$RSYNC_HOME\ssh -i $USERPROFILE\.ssh\id_rsa -o UserKnownHostsFile=$USERPROFILE\.ssh\known_hosts",                  # use ssh
-  "$build_number",                          # upload the whole build folder
-  "$RSYNC_USER@$RSYNC_HOST:$RSYNC_ROOT/developer/$tier/" # target server + path
-)
-
-# Write-Output "rsync parameters:" $rsync_args
-
-cd upload
-& $RSYNC_HOME\rsync.exe $rsync_args
-if( $LASTEXITCODE -ne 0 ) {
-  Write-Output "rsync failed."
-  exit 99
-}
-cd ..
-
-#################
-# DEBUG.ZIP
-#################
-
-if((Test-Path release\$build_number\$debug_zip) -ne 0) {
-  #
-  # Copy source files
-  #
-
-  copy release\$build_number\$debug_zip $upload_path\$debug_zip
-
-  #
-  # Construct debug-<version>.download_info
-  #
-
-  $hash = get-filehash $upload_path\$debug_zip -Algorithm MD5
-
-  $debug_zip_download_info = @"
-{
-  "name": "Keyman Developer debug files",
-  "version": "$version_with_tag",
-  "date": "$([DateTime]::Now.ToString("yyyy-MM-dd"))",
-  "platform": "win",
-  "stability": "$tier",
-  "file": "debug-$build_number.zip",
-  "md5": "$($hash.Hash)",
-  "type": "zip",
-  "build": "$build_counter"
-}
-"@
-
-  [System.IO.File]::WriteAllLines("$pwd\$upload_path\$debug_zip.download_info", $debug_zip_download_info)
-}
-
-#
-# Upload with rsync to downloads.keyman.com
-# (rsync requires that we are in the upload folder to get folders in
-# sync correctly; it is possible to resolve this but easier to just cd.)
-#
-
-$rsync_args = @(
-  '-vrzltp',                                # verbose, recurse, zip, copy symlinks, preserve times, permissions
-  '--chmod=Dug=rwx,Do=rx,Fug=rw,Fo=r',      # map Windows security to host security
-  '--stats',                                # show statistics for log
-  "--rsync-path='$RSYNC_PATH'",             # path on remote server
-  "--rsh=$RSYNC_HOME\ssh -i $USERPROFILE\.ssh\id_rsa -o UserKnownHostsFile=$USERPROFILE\.ssh\known_hosts",                  # use ssh
-  "$build_number",                          # upload the whole build folder
-  "$RSYNC_USER@$RSYNC_HOST:$RSYNC_ROOT/developer/$tier/" # target server + path
-)
-
-# Write-Output "rsync parameters:" $rsync_args
-
-cd upload
-& $RSYNC_HOME\rsync.exe $rsync_args
-if( $LASTEXITCODE -ne 0 ) {
-  Write-Output "rsync failed."
-  exit 99
-}
-cd ..
-
-# EOF
diff --git a/resources/teamcity/includes/tc-helpers.inc.sh b/resources/teamcity/includes/tc-helpers.inc.sh
index 5170f3c25e..17776033fe 100644
--- a/resources/teamcity/includes/tc-helpers.inc.sh
+++ b/resources/teamcity/includes/tc-helpers.inc.sh
@@ -1,46 +1,10 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 # Keyman is copyright (C) SIL Global. MIT License.
 
-# Returns 0 if we're running on Ubuntu.
-is_ubuntu() {
-  if [[ "${OSTYPE:-}" == "linux-gnu" ]]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-# Returns 0 if we're running on Windows, i.e. if the environment variable
-# `OSTYPE` is set to "msys" or "cygwin".
-is_windows() {
-  if [[ "${OSTYPE:-}" == "msys" ]] || [[ "${OSTYPE:-}" == "cygwin" ]]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-# Returns 0 if we're running on macOS.
-is_macos() {
-  if [[ "${OSTYPE:-}" == "darwin" ]]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-install_nvm() {
-  if ! is_ubuntu; then
-    # on Windows and macOS build agents are configured manually
-    return 0
-  fi
-  linux_install_nvm
-}
-
 # Set the environment variables required to use node/nvm and set the
 # `KEYMAN_USE_NVM` variable so that the build can automatically install
 # the required node version.
-set_variables_for_nvm() {
+tc_set_variables_for_nvm() {
   if [[ -f "${HOME}/.nvm/nvm.sh" ]] && [[ -d "${HOME}/.keyman/node" ]]; then
     # nvm.sh uses some variables that might not be initialized, so we
     # disable the "unbound variable" check temporarily
@@ -54,15 +18,78 @@ set_variables_for_nvm() {
   fi
 }
 
-install_emscripten() {
-  if ! is_ubuntu; then
-    # on Windows and macOS build agents are configured manually
-    return 0
-  fi
-  linux_install_emscripten
-}
-
-set_variables_for_emscripten() {
+tc_set_variables_for_emscripten() {
   export EMSCRIPTEN_BASE="${EMSCRIPTEN_BASE:-${HOME}/emsdk/upstream/emscripten}"
   export KEYMAN_USE_EMSDK=1
 }
+
+tc_upload_help() {
+  local PRODUCT=$1
+  local PRODUCT_PATH=$2
+  builder_echo start "upload help" "Uploading new ${PRODUCT} help to help.keyman.com"
+
+  (
+    # shellcheck disable=SC2164,SC2154
+    cd "${KEYMAN_ROOT}/resources/build"
+    "${KEYMAN_ROOT}/resources/build/help-keyman-com.sh" "${PRODUCT_PATH}"
+  )
+
+  builder_echo end "upload help" success "Finished uploading new ${PRODUCT} help to help.keyman.com"
+}
+
+_tc_rsync() {
+  local rsync_args SOURCE DESTINATION
+  SOURCE=$1
+  DESTINATION=$2
+
+  rsync_args=(
+    '-vrzltp'                                # verbose, recurse, zip, copy symlinks, preserve times, permissions
+    '--stats'                                # show statistics for log
+    "--rsync-path=${RSYNC_PATH}"             # path on remote server
+  )
+
+  if builder_is_windows; then
+    rsync_args+=(
+      '--chmod=Dug=rwx,Do=rx,Fug=rw,Fo=r'      # map Windows security to host security
+      "--rsh=${RSYNC_HOME}\ssh -i ${USERPROFILE}\.ssh\id_rsa -o UserKnownHostsFile=${USERPROFILE}\.ssh\known_hosts"                  # use ssh
+    )
+  else
+    rsync_args+=(
+      "--rsh=ssh"                          # use ssh
+    )
+  fi
+
+  rsync_args+=(
+      "${SOURCE}"
+      "${DESTINATION}"
+  )
+
+  if builder_is_windows; then
+    local CYGPATH_RSYNC_HOME
+    CYGPATH_RSYNC_HOME=$(cygpath -w "${RSYNC_HOME}")
+    MSYS_NO_PATHCONV=1 "${CYGPATH_RSYNC_HOME}\\rsync.exe" "${rsync_args[@]}"
+  else
+    local RSYNC=rsync
+    if builder_is_macos; then
+      RSYNC=/usr/local/bin/rsync
+      [[ -f /opt/homebrew/bin/rsync ]] && RSYNC=/opt/homebrew/bin/rsync
+    fi
+
+    ${RSYNC} "${rsync_args[@]}"
+  fi
+}
+
+# Download file or directory $1 from the remote server to $2.
+tc_rsync_download() {
+  # shellcheck disable=SC2154
+  _tc_rsync \
+    "${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_ROOT}/$1" \
+    "$2"
+}
+
+# Upload file or directory $1 to the remote server at $2.
+tc_rsync_upload() {
+  _tc_rsync \
+    "$1" \
+    "${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_ROOT}/$2"
+}
diff --git a/resources/teamcity/includes/tc-linux.inc.sh b/resources/teamcity/includes/tc-linux.inc.sh
index cf1964de21..362873189d 100644
--- a/resources/teamcity/includes/tc-linux.inc.sh
+++ b/resources/teamcity/includes/tc-linux.inc.sh
@@ -1,21 +1,13 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 # Keyman is copyright (C) SIL Global. MIT License.
-
-# Returns 0 if the OS version is greater than or equal to the specified version.
-# Parameter:
-#   $1 - OS version to compare against (e.g., "20.04")
-is_os_version_or_higher() {
-  local OS_VERSION=$1
-
-  # we use `dpkg --compare-versions` to compare the current Ubuntu version
-  # shellcheck disable=SC2312
-  dpkg --compare-versions "$(lsb_release -r -s)" ge "${OS_VERSION}"
-}
+#
+# Shared functions for any builds that run on Linux agents,
+# e.g. linux, android, web, ...
 
 # Returns 0 if the specified package is installed.
 # Parameter:
 #   $1 - Package name to check (e.g., "curl")
-is_package_installed() {
+_is_package_installed() {
   local PACKAGE=$1
 
   dpkg -s "${PACKAGE}" >/dev/null 2>&1
@@ -24,8 +16,8 @@ is_package_installed() {
 # Check if the specified packages are installed and install them if not.
 # Parameters:
 #   $* - List of package names to check and install (e.g., "lcov jq")
-linux_check_and_install_packages() {
-  if ! is_ubuntu; then
+ba_linux_check_and_install_packages() {
+  if ! builder_is_linux; then
     return 0
   fi
 
@@ -35,7 +27,7 @@ linux_check_and_install_packages() {
 
   for p in ${PACKAGES}
   do
-    if ! is_package_installed "${p}"; then
+    if ! _is_package_installed "${p}"; then
       TOINSTALL="${TOINSTALL} ${p}"
     fi
   done
@@ -49,7 +41,7 @@ linux_check_and_install_packages() {
 }
 
 # Install nvm if it is not already installed and install the latest LTS
-linux_install_nvm() {
+ba_linux_install_nvm() {
   builder_echo start install_nvm "Checking and installing nvm"
   if [[ -f "${HOME}/.nvm/nvm.sh" ]]; then
     builder_echo "nvm is already installed"
@@ -59,14 +51,14 @@ linux_install_nvm() {
     NVM_RELEASE=$(curl -s https://api.github.com/repos/nvm-sh/nvm/releases/latest | grep tag_name | cut -d : -f 2 | cut -d '"' -f 2)
     # shellcheck disable=SC2312
     curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/${NVM_RELEASE}/install.sh | bash
-    set_variables_for_nvm
+    tc_set_variables_for_nvm
     nvm install --lts --default --save
     nvm use --lts
   fi
   builder_echo end install_nvm success "Finished checking and installing nvm"
 }
 
-linux_install_emscripten() {
+ba_linux_install_emscripten() {
   builder_echo start "install emscripten" "Checking and installing emscripten"
   if { [[ ! -z "${EMSCRIPTEN_BASE:-}" ]] && [[ -f "${EMSCRIPTEN_BASE}/emcc" ]] ; } ||
     [[ -f "${HOME}/emsdk/upstream/emscripten/emcc" ]]; then
@@ -85,20 +77,20 @@ linux_install_emscripten() {
     ./emsdk install "${KEYMAN_MIN_VERSION_EMSCRIPTEN}"
     ./emsdk activate "${KEYMAN_MIN_VERSION_EMSCRIPTEN}"
   fi
-  set_variables_for_emscripten
+  tc_set_variables_for_emscripten
   builder_echo end "install emscripten" success "Finished checking and installing emscripten"
 }
 
 # Install additional dependencies required for running integration tests.
-linux_install_dependencies_for_tests() {
+ba_linux_install_dependencies_for_tests() {
   builder_echo start install_dependencies_for_tests "Installing dependencies for tests"
 
-  linux_check_and_install_packages xvfb xserver-xephyr metacity mutter dbus-x11 weston xwayland
+  ba_linux_check_and_install_packages xvfb xserver-xephyr metacity mutter dbus-x11 weston xwayland
 
   builder_echo end install_dependencies_for_tests success "Finished installing dependencies for tests"
 }
 
-linux_start_xvfb() {
+ba_linux_start_xvfb() {
   # On Linux start Xvfb etc
   local PID_FILE=/tmp/keymanweb-pids
   builder_echo "Starting Xvfb..."
@@ -115,7 +107,7 @@ linux_start_xvfb() {
   export DISPLAY=:32
 }
 
-linux_stop_xvfb() {
+ba_linux_stop_xvfb() {
   # On Linux stop Xvfb etc
   local PID_FILE=/tmp/keymanweb-pids
   if [[ -f "${PID_FILE}" ]]; then
@@ -123,3 +115,18 @@ linux_stop_xvfb() {
     rm -f "${PID_FILE}"
   fi
 }
+
+# Returns 0 if the OS version is greater than or equal to the specified version.
+# Parameter:
+#   $1 - OS version to compare against (e.g., "20.04")
+ba_linux_is_os_version_or_higher() {
+  if ! builder_is_linux; then
+     builder_die "ba_linux_is_os_version_or_higher() is only implemented for Ubuntu"
+  fi
+
+  local OS_VERSION=$1
+
+  # we use `dpkg --compare-versions` to compare the current Ubuntu version
+  # shellcheck disable=SC2312
+  dpkg --compare-versions "$(lsb_release -r -s)" ge "${OS_VERSION}"
+}
diff --git a/resources/teamcity/includes/tc-mac.inc.sh b/resources/teamcity/includes/tc-mac.inc.sh
new file mode 100644
index 0000000000..0e9c18013c
--- /dev/null
+++ b/resources/teamcity/includes/tc-mac.inc.sh
@@ -0,0 +1,26 @@
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# Shared functions for any builds that run on Mac agents
+
+ba_mac_unlock_keychain() {
+  if [[ -z "${MAC_BUILDAGENT_PASSWORD}" ]]; then
+    echo "Error: MAC_BUILDAGENT_PASSWORD environment variable is not set."
+    exit 1
+  fi
+  security unlock-keychain -p "${MAC_BUILDAGENT_PASSWORD}" login.keychain
+}
+
+ba_mac_clean_xcode_derived_data() {
+  builder_echo start "clean" "Cleaning XCode DerivedData mess"
+  rm -rf "${HOME}/Library/Developer/Xcode/DerivedData"
+  builder_echo end "clean" success "Finished cleaning XCode DerivedData mess"
+}
+
+ba_mac_unmount_volumes_keyman() {
+  builder_echo start "unmount" "Unmounting Keyman volumes"
+  if [[ -d /Volumes/Keyman ]]; then
+    hdiutil detach /Volumes/Keyman
+  fi
+  builder_echo end "unmount" success "Finished unmounting Keyman volumes"
+}
diff --git a/resources/teamcity/includes/tc-windows.inc.sh b/resources/teamcity/includes/tc-windows.inc.sh
new file mode 100644
index 0000000000..7b64e052fb
--- /dev/null
+++ b/resources/teamcity/includes/tc-windows.inc.sh
@@ -0,0 +1,38 @@
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# Shared functions for any builds that run on Windows agents
+
+ba_win_download_symbol_server_index() {
+  if ! builder_is_windows; then
+    builder_die "ba_win_download_symbol_server_index should only be run on Windows agents"
+  fi
+
+  builder_echo start "download symbol server index" "Downloading symbol server index"
+  (
+    # shellcheck disable=SC2154
+    mkdir -p "${LOCAL_SYMBOLS_PATH}/${SYMBOLS_SUBDIR}"
+    # shellcheck disable=SC2164
+    cd "${LOCAL_SYMBOLS_PATH}/${SYMBOLS_SUBDIR}"
+
+    # shellcheck disable=SC2154
+    tc_rsync_download "${REMOTE_SYMBOLS_PATH}/${SYMBOLS_SUBDIR}/lastid.txt" "."
+    tc_rsync_download "${REMOTE_SYMBOLS_PATH}/${SYMBOLS_SUBDIR}/history.txt" "."
+    tc_rsync_download "${REMOTE_SYMBOLS_PATH}/${SYMBOLS_SUBDIR}/server.txt" "."
+  )
+  builder_echo end "download symbol server index" success "Finished downloading symbol server index"
+}
+
+ba_win_publish_new_symbols() {
+  if ! builder_is_windows; then
+    builder_die "ba_win_publish_new_symbols should only be run on Windows agents"
+  fi
+
+  builder_echo start "publish new symbols" "Publishing new symbols to symbol server"
+  (
+    # shellcheck disable=SC2164
+    cd "${LOCAL_SYMBOLS_PATH}"
+    tc_rsync_upload "." "${REMOTE_SYMBOLS_PATH}"
+  )
+  builder_echo end "publish new symbols" success "Finished publishing new symbols to symbol server"
+}
diff --git a/resources/teamcity/ios/ios-actions.inc.sh b/resources/teamcity/ios/ios-actions.inc.sh
new file mode 100755
index 0000000000..acf904fe0f
--- /dev/null
+++ b/resources/teamcity/ios/ios-actions.inc.sh
@@ -0,0 +1,15 @@
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+ios_build() {
+  builder_echo start "build" "Building KeymanEngine + Keyman for iOS"
+  # shellcheck disable=SC2154
+  "${KEYMAN_ROOT}/ios/ci.sh" build
+  builder_echo end "build" success "Finished building KeymanEngine + Keyman for iOS"
+}
+
+ios_capture_build_artifacts() {
+  builder_echo start "prep-release" "Using prep-release script to capture build artifacts"
+  "${KEYMAN_ROOT}/ios/tools/prepRelease.sh"
+  builder_echo end "prep-release" success "Finished capturing build artifacts"
+}
diff --git a/resources/teamcity/ios/keyman-ios-release.sh b/resources/teamcity/ios/keyman-ios-release.sh
new file mode 100755
index 0000000000..8942a9f135
--- /dev/null
+++ b/resources/teamcity/ios/keyman-ios-release.sh
@@ -0,0 +1,267 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# TC build script for Keyman iOS/Release
+#
+# Requires: env variable $MAC_BUILDAGENT_PASSWORD set
+
+# shellcheck disable=SC2164
+# shellcheck disable=SC1091
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+# shellcheck disable=SC2154
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-mac.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/ios/ios-actions.inc.sh"
+
+################################ Main script ################################
+
+builder_describe \
+  "Build KeymanEngine and Keyman for iOS" \
+  "all            run all actions" \
+  "clean          clean artifact directories" \
+  "build          build KeymanEngine and Keyman for iOS" \
+  "publish        deploy Keyman for iOS" \
+  "--sil-itc-team=SIL_ITC_TEAM_ID       SIL Fastlane ITC Team ID to use for TestFlight upload" \
+  "--sil-api-key-id=SIL_API_KEY_ID      SIL Fastlane API Key ID to use for TestFlight upload" \
+  "--sil-itc-provider=SIL_ITC_PROVIDER  SIL Fastlane ITC Provider to use for TestFlight upload" \
+  "--sil-review-info=SIL_REVIEW_INFO    SIL Fastlane Beta App Review Info to use for TestFlight upload" \
+  "--fv                                 additionally build FirstVoices app" \
+  "--fv-itc-team=FV_ITC_TEAM_ID         FirstVoices Fastlane ITC Team ID to use for TestFlight upload" \
+  "--fv-api-key-id=FV_API_KEY_ID        FirstVoices Fastlane API Key ID to use for TestFlight upload" \
+  "--fv-itc-provider=FV_ITC_PROVIDER    FirstVoices Fastlane ITC Provider to use for TestFlight upload" \
+  "--fv-review-info=FV_REVIEW_INFO      FirstVoices Fastlane Beta App Review Info to use for TestFlight upload" \
+  "--rsync-path=RSYNC_PATH              rsync path on remote server" \
+  "--rsync-user=RSYNC_USER              rsync user on remote server" \
+  "--rsync-host=RSYNC_HOST              rsync host on remote server" \
+  "--rsync-root=RSYNC_ROOT              rsync root on remote server" \
+  "--help.keyman.com=HELP_KEYMAN_COM    path to help.keyman.com repository"
+
+
+builder_parse "$@"
+
+cd "${KEYMAN_ROOT}/ios"
+
+function _publish_to_downloads_keyman_com() {
+  # Publish to downloads.keyman.com
+  builder_echo start "publish to downloads.keyman.com" "Publishing release to downloads.keyman.com"
+  (
+    local KMEI_DST KEYMANAPP_IPA_DST KEYMAN_CHANGELOG UPLOAD_BASE UPLOAD_FOLDER UPLOAD_DIR
+
+    # Note that the `rsync` tool that exists on Macs by default is a very old version and must be updated to a newer version, e.g. by using Homebrew.
+    KMEI_DST="keyman-engine-ios-${KEYMAN_VERSION}.zip"
+    KEYMANAPP_IPA_DST="keyman-ios-${KEYMAN_VERSION}.ipa"
+    # shellcheck disable=SC2154
+    KEYMAN_CHANGELOG="changelog-${KEYMAN_VERSION}-${KEYMAN_TIER}.txt"
+
+    UPLOAD_BASE="upload"
+    UPLOAD_FOLDER="${KEYMAN_VERSION}"
+    UPLOAD_DIR="${UPLOAD_BASE}/${UPLOAD_FOLDER}"
+
+    # The upload directory has already been created,
+    # but the permissions aren't quite in place yet.
+
+    builder_echo "Setting upload file permissions for downloads.keyman.com"
+    chmod g+w  "${UPLOAD_DIR}"
+    chmod a+rx "${UPLOAD_DIR}"
+
+    chmod g+rw "${UPLOAD_DIR}/${KMEI_DST}" "${UPLOAD_DIR}/${KMEI_DST}.download_info" "${UPLOAD_DIR}/${KEYMANAPP_IPA_DST}" "${UPLOAD_DIR}/${KEYMANAPP_IPA_DST}.download_info" "${UPLOAD_DIR}/${KEYMAN_CHANGELOG}"
+    chmod a+r  "${UPLOAD_DIR}/${KMEI_DST}" "${UPLOAD_DIR}/${KMEI_DST}.download_info" "${UPLOAD_DIR}/${KEYMANAPP_IPA_DST}" "${UPLOAD_DIR}/${KEYMANAPP_IPA_DST}.download_info" "${UPLOAD_DIR}/${KEYMAN_CHANGELOG}"
+
+    if builder_has_option --fv; then
+      FIRSTVOICESAPP_IPA_DST="firstvoices-ios-${KEYMAN_VERSION}.ipa"
+      chmod g+rw "${UPLOAD_DIR}/${FIRSTVOICESAPP_IPA_DST}" "${UPLOAD_DIR}/${FIRSTVOICESAPP_IPA_DST}.download_info"
+      chmod a+r  "${UPLOAD_DIR}/${FIRSTVOICESAPP_IPA_DST}" "${UPLOAD_DIR}/${FIRSTVOICESAPP_IPA_DST}.download_info"
+    fi
+
+    builder_echo "Performing rsync call"
+    cd "${UPLOAD_BASE}"
+    tc_rsync_upload "${UPLOAD_FOLDER}" "ios/${KEYMAN_TIER}"
+  )
+  builder_echo end "publish to downloads.keyman.com" success "Finished publishing release to downloads.keyman.com"
+}
+
+function __do_upload_to_appstore() {
+  (
+    local APP_IPA_DST CHANGELOG_PATH changelog FASTLANE_ITC_TEAM_ID
+    local FASTLANE_ITC_PROVIDER="$1"
+    local FASTLANE_API_KEY_ID="$2"
+
+    export FASTLANE_ITC_TEAM_ID="$3"
+    export LC_ALL=en_US.UTF-8
+    export LANG=en_US.UTF-8
+
+    KEYMAN_CHANGELOG="changelog-${KEYMAN_VERSION}-${KEYMAN_TIER}.txt"
+    CHANGELOG_PATH="upload/${KEYMAN_VERSION}/${KEYMAN_CHANGELOG}"
+
+    APP_IPA_DST="$4-ios-${KEYMAN_VERSION}.ipa"
+
+    changelog=$(cat "${CHANGELOG_PATH}")
+
+    builder_echo "Uploading to the App Store with the following changelog:"
+    builder_echo "${changelog}"
+    builder_echo ""
+
+    cd "upload/${KEYMAN_VERSION}"
+
+    # Construct Deliverfile for Fastlane metadata upload.
+    cat > Deliverfile << _EOF
+release_notes(
+  'en-US' => <<-eos
+${changelog}
+eos
+_EOF
+
+    if builder_has_option --fv; then
+      cat >> Deliverfile << _EOF
+  'en-CA' => <<-eos
+${changelog}
+eos
+)
+
+copyright "#{Time.now.year} SIL Global, First Peoples' Cultural Foundation"
+_EOF
+    else
+      cat >> Deliverfile << _EOF
+)
+
+copyright "#{Time.now.year} SIL Global"
+_EOF
+    fi
+
+    # -f:  Force - skips a visual report Fastlane likes to generate otherwise.  (Apple's standing advice is to skip when doing CI.)
+    # shellcheck disable=SC2154
+    fastlane deliver \
+      --api_key_path "${HOME}/fastlane/${FASTLANE_API_KEY_ID}.json" \
+      -f true \
+      -u buildagent@keyman.com \
+      --submit_for_review true \
+      --automatic_release true \
+      --precheck_include_in_app_purchases false \
+      --verbose \
+      --itc_provider "${FASTLANE_ITC_PROVIDER}" \
+      --submission_information "{\"add_id_info_uses_idfa\": false}" \
+      --ipa "${APP_IPA_DST}"
+  )
+}
+
+function _publish_to_appstore() {
+  builder_echo start "push to AppStore" "Pushing release to AppStore for deployment"
+  # shellcheck disable=SC2154
+  __do_upload_to_appstore "${SIL_ITC_PROVIDER}" "${SIL_API_KEY_ID}" "${SIL_ITC_TEAM_ID}" keyman
+  builder_echo end "push to AppStore" success "Finished pushing release to AppStore for deployment"
+}
+
+function _publish_to_appstore_fv() {
+  if ! builder_has_option --fv; then
+    builder_echo "Skipping FirstVoices upload to AppStore as --fv option is not set"
+    return
+  fi
+
+  builder_echo start "push FV to AppStore" "Pushing FirstVoices release to AppStore for deployment"
+  # shellcheck disable=SC2154
+  __do_upload_to_appstore "${FV_ITC_PROVIDER}" "${FV_API_KEY_ID}" "${FV_ITC_TEAM_ID}" firstvoices
+  builder_echo end "push FV to AppStore" success "Finished pushing FirstVoices release to AppStore for deployment"
+}
+
+function __do_upload_to_fastlane() {
+  (
+    local APP_IPA_DST PILOT_GROUPS BETA_APP_DESCRIPTION FASTLANE_ITC_TEAM_ID
+    local FASTLANE_ITC_PROVIDER="$1"
+    local FASTLANE_API_KEY_ID="$2"
+    local BETA_APP_REVIEW_INFO="$3"
+
+    export FASTLANE_ITC_TEAM_ID="$4"
+    export LC_ALL=en_US.UTF-8
+    export LANG=en_US.UTF-8
+
+    KEYMAN_CHANGELOG="changelog-${KEYMAN_VERSION}-${KEYMAN_TIER}.txt"
+    CHANGELOG_PATH="upload/${KEYMAN_VERSION}/${KEYMAN_CHANGELOG}"
+
+    APP_IPA_DST="$5-ios-${KEYMAN_VERSION}.ipa"
+    BETA_APP_DESCRIPTION="$6"
+
+    changelog=$(cat "${CHANGELOG_PATH}")
+
+    builder_echo "Uploading to Fastlane with the following changelog:"
+    builder_echo "${changelog}"
+    builder_echo ""
+
+    cd "upload/${KEYMAN_VERSION}"
+
+    # Sets the upload to distribute to the appropriate group of external testers.
+
+    if [[ "${KEYMAN_TIER}" = "beta" ]]; then
+      export PILOT_GROUPS="Beta"
+    elif [[ "${KEYMAN_TIER}" = "alpha" ]]; then
+      export PILOT_GROUPS="Alpha"
+    fi
+
+    command -v fastlane
+    # shellcheck disable=SC2154
+    fastlane pilot upload \
+      --api_key_path "${HOME}/fastlane/${FASTLANE_API_KEY_ID}.json" \
+      --changelog "${changelog}" \
+      -g "${PILOT_GROUPS}" \
+      --itc_provider "${FASTLANE_ITC_PROVIDER}" \
+      --verbose \
+      --ipa "${APP_IPA_DST}" \
+      --beta_app_review_info "${BETA_APP_REVIEW_INFO}" \
+      --beta_app_description "${BETA_APP_DESCRIPTION}"
+  )
+}
+
+function _publish_to_fastlane_for_testing() {
+  builder_echo start "upload to FastLane" "Uploading build to FastLane for testing-deployment"
+    # shellcheck disable=SC2154
+  __do_upload_to_fastlane "${SIL_ITC_PROVIDER}" "${SIL_API_KEY_ID}" "${SIL_REVIEW_INFO}" "${SIL_ITC_TEAM_ID}" keyman "Keyman for iPhone and iPad pre-release, see release notes for details"
+  builder_echo end "upload to FastLane" success "Finished uploading build to FastLane for testing-deployment"
+}
+
+function _publish_to_fastlane_for_testing_fv() {
+  if ! builder_has_option --fv; then
+    builder_echo "Skipping FirstVoices upload to FastLane as --fv option is not set"
+    return
+  fi
+
+  builder_echo start "upload to FV FastLane" "Uploading FirstVoices build to FastLane for testing-deployment"
+  # shellcheck disable=SC2154
+  __do_upload_to_fastlane "${FV_ITC_PROVIDER}" "${FV_API_KEY_ID}" "${FV_REVIEW_INFO}" "${FV_ITC_TEAM_ID}" firstvoices "FirstVoices Keyboards for iPhone and iPad pre-release, see release notes for details"
+  builder_echo end "upload to FV FastLane" success "Finished uploading FirstVoices build to FastLane for testing-deployment"
+}
+
+function do_build() {
+  ios_build
+  ios_capture_build_artifacts
+}
+
+function do_publish() {
+  _publish_to_downloads_keyman_com
+  tc_upload_help "Keyman for iOS" ios
+
+  if [[ "${KEYMAN_TIER}" == "stable" ]]; then
+    _publish_to_appstore
+    _publish_to_appstore_fv
+  else
+    _publish_to_fastlane_for_testing
+    _publish_to_fastlane_for_testing_fv
+  fi
+}
+
+ba_mac_unlock_keychain
+
+if builder_has_action all; then
+  ba_mac_clean_xcode_derived_data
+  do_build
+  do_publish
+else
+  builder_run_action  clean   ba_mac_clean_xcode_derived_data
+  builder_run_action  build   do_build
+  builder_run_action  publish do_publish
+fi
diff --git a/resources/teamcity/ios/keyman-ios-test-samples.sh b/resources/teamcity/ios/keyman-ios-test-samples.sh
new file mode 100755
index 0000000000..fb109f3a2a
--- /dev/null
+++ b/resources/teamcity/ios/keyman-ios-test-samples.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# TC build script for Keyman iOS/Test Samples and Test Projects
+
+# shellcheck disable=SC2164
+# shellcheck disable=SC1091
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+################################ Main script ################################
+
+builder_describe \
+  "Build samples and test projects for Keyman for iOS" \
+  "all            build test samples"
+
+builder_parse "$@"
+
+# shellcheck disable=SC2154
+cd "${KEYMAN_ROOT}/ios"
+
+function _build_sample1() {
+  builder_echo start "kmsample1" "Building KMSample1"
+  "${KEYMAN_ROOT}/ios/samples/KMSample1/build.sh" clean configure build --debug
+  builder_echo end "kmsample1" success "Finished building KMSample1"
+}
+
+function _build_sample2() {
+  builder_echo start "kmsample2" "Building KMSample2"
+  "${KEYMAN_ROOT}/ios/samples/KMSample2/build.sh" clean configure build --debug
+  builder_echo end "kmsample2" success "Finished building KMSample2"
+}
+
+if builder_has_action all; then
+  _build_sample1
+  _build_sample2
+fi
diff --git a/resources/teamcity/ios/keyman-ios-test.sh b/resources/teamcity/ios/keyman-ios-test.sh
new file mode 100755
index 0000000000..1c6f156238
--- /dev/null
+++ b/resources/teamcity/ios/keyman-ios-test.sh
@@ -0,0 +1,113 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# TC build script for Keyman iOS/Test
+#
+# Requires: env variable $MAC_BUILDAGENT_PASSWORD set
+
+# shellcheck disable=SC2164
+# shellcheck disable=SC1091
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+# shellcheck disable=SC2154
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-mac.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/ios/ios-actions.inc.sh"
+
+################################ Main script ################################
+
+# TODO: remove unused `--pr-number` option. Unfortunately, the mechanism we
+# designed to skip this, `--builder-ignore-unknown-options`, does not work for
+# options with values. We need another one, for example, something like
+# `--builder-ignore-unknown-value-options=pr-number[,...]`, so for now I will
+# leave it alone. The option ultimately needs to be removed from the TC build
+# configuration also. (Unused as of #14466)
+
+builder_describe \
+  "Build KeymanEngine and Keyman for iOS" \
+  "all            run all actions" \
+  "clean          clean artifact directories" \
+  "build          build KeymanEngine and Keyman for iOS" \
+  "--pr-number=PR_NUMBER                Currently building PR" \
+  "--sil-itc-team=SIL_ITC_TEAM_ID       SIL Fastlane ITC Team ID to use for TestFlight upload" \
+  "--sil-api-key-id=SIL_API_KEY_ID      SIL Fastlane API Key ID to use for TestFlight upload" \
+  "--sil-itc-provider=SIL_ITC_PROVIDER  SIL Fastlane ITC Provider to use for TestFlight upload" \
+  "--fv                                 additionally build FirstVoices app" \
+  "--fv-itc-team=FV_ITC_TEAM_ID         FirstVoices Fastlane ITC Team ID to use for TestFlight upload" \
+  "--fv-api-key-id=FV_API_KEY_ID        FirstVoices Fastlane API Key ID to use for TestFlight upload" \
+  "--fv-itc-provider=FV_ITC_PROVIDER    FirstVoices Fastlane ITC Provider to use for TestFlight upload"
+
+
+builder_parse "$@"
+
+cd "${KEYMAN_ROOT}/ios"
+
+function __do_upload_to_testflight() {
+  (
+    local FASTLANE_ITC_PROVIDER="$1"
+    local FASTLANE_API_KEY_ID="$2"
+    local APP_IPA_DST
+    local BUILD_NUMBER
+
+    export FASTLANE_ITC_TEAM_ID="$3"
+    export LC_ALL=en_US.UTF-8
+    export LANG=en_US.UTF-8
+
+    BUILD_NUMBER=$(cat ../VERSION.md)
+    APP_IPA_DST="$4-ios-${BUILD_NUMBER}.ipa"
+
+    cd "upload/${BUILD_NUMBER}"
+    command -v fastlane
+    # shellcheck disable=SC2154
+    fastlane pilot upload \
+      --distribute_external false \
+      --notify_external_testers false \
+      --submit_beta_review false \
+      --api_key_path "${HOME}/fastlane/${FASTLANE_API_KEY_ID}.json" \
+      -g "PR Builds" \
+      --itc_provider "${FASTLANE_ITC_PROVIDER}" \
+      --verbose \
+      --ipa "${APP_IPA_DST}"
+  )
+}
+
+function _upload_to_testflight_pr_area() {
+  builder_echo start "upload to testflight" "Uploading build to TestFlight (PR area)"
+  # shellcheck disable=SC2154
+  __do_upload_to_testflight "${SIL_ITC_PROVIDER}" "${SIL_API_KEY_ID}" "${SIL_ITC_TEAM_ID}"  keyman
+  builder_echo end "upload to testflight" success "Finished uploading build to TestFlight (PR area)"
+}
+
+function _upload_to_testflight_pr_area_fv() {
+  if ! builder_has_option --fv; then
+    builder_echo "Skipping FirstVoices upload to TestFlight as --fv option is not set"
+    return
+  fi
+
+  builder_echo start "upload to testflight" "Uploading FirstVoices build to TestFlight (PR area) - FirstVoices"
+  # shellcheck disable=SC2154
+  __do_upload_to_testflight "${FV_ITC_PROVIDER}" "${FV_API_KEY_ID}" "${FV_ITC_TEAM_ID}"  firstvoices
+  builder_echo end "upload to testflight" success "Finished uploading FirstVoices build to TestFlight (PR area) - FirstVoices"
+}
+
+function do_build() {
+  ios_build
+  ios_capture_build_artifacts
+  builder_if_release_build_level _upload_to_testflight_pr_area
+  builder_if_release_build_level _upload_to_testflight_pr_area_fv
+}
+
+ba_mac_unlock_keychain
+
+if builder_has_action all; then
+  ba_mac_clean_xcode_derived_data
+  do_build
+else
+  builder_run_action  clean   ba_mac_clean_xcode_derived_data
+  builder_run_action  build   do_build
+fi
diff --git a/resources/teamcity/linux/keyman-linux-release.sh b/resources/teamcity/linux/keyman-linux-release.sh
index 14457a54fb..78369686f9 100755
--- a/resources/teamcity/linux/keyman-linux-release.sh
+++ b/resources/teamcity/linux/keyman-linux-release.sh
@@ -5,14 +5,14 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
-. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-actions.inc.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-linux.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/linux/linux-actions.inc.sh"
 
 ################################ Main script ################################
 
@@ -31,7 +31,6 @@ builder_describe \
   "--rsync-host=RSYNC_HOST  rsync host on remote server" \
   "--rsync-root=RSYNC_ROOT  rsync root on remote server"
 
-
 builder_parse "$@"
 
 cd "${KEYMAN_ROOT}/linux"
@@ -84,58 +83,20 @@ function _sign_source_tarball() {
 function _publish_to_downloads() {
   builder_echo start "publish to downloads" "Publish to downloads.keyman.com"
 
-  local DATE UPLOAD_BASE UPLOAD_FOLDER UPLOAD_DIR
-  local ARTIFACTS NAMES
-  local TAR_GZ HASH SIZE DOWNLOAD_INFO
+  local UPLOAD_DIR KEYMAN_TGZ
 
-  DATE=$(date +%F)
-
-  UPLOAD_BASE="upload"
-  UPLOAD_FOLDER="${KEYMAN_VERSION}"
-  UPLOAD_DIR="${UPLOAD_BASE}/${UPLOAD_FOLDER}"
+  UPLOAD_DIR="upload/${KEYMAN_VERSION}"
+  KEYMAN_TGZ="keyman-${KEYMAN_VERSION}.tar.gz"
 
   # Set permissions as required on download site
   builder_echo "Setting upload file permissions for downloads.keyman.com"
+  chmod g+w  "${UPLOAD_DIR}"
   chmod a+rx "${UPLOAD_DIR}"
-  chmod g+w "${UPLOAD_DIR}"
-
-  chmod g+rw "${UPLOAD_DIR}"/*
+  chmod g+w  "${UPLOAD_DIR}"/*
   chmod a+r  "${UPLOAD_DIR}"/*
 
-  ARTIFACTS=("keyman-${KEYMAN_VERSION}.tar.gz")
-  NAMES=("Keyman for Linux")
-
-  for i in "${!ARTIFACTS[@]}"; do
-      TAR_GZ=${ARTIFACTS[${i}]}
-      # Construct .download_info
-      HASH=$(md5sum "${UPLOAD_DIR}/${TAR_GZ}" | cut -d ' ' -f 1)
-      SIZE=$(stat --print="%s" "${UPLOAD_DIR}/${TAR_GZ}")
-      # TODO: Truncate NAME
-      DOWNLOAD_INFO=$( jq -n \
-      --arg NAME "${NAMES[${i}]}" \
-      --arg BUILD_NUMBER "${KEYMAN_VERSION}" \
-      --arg DATE "${DATE}" \
-      --arg KEYMAN_TIER "${KEYMAN_TIER}" \
-      --arg FILENAME "${TAR_GZ}" \
-      --arg HASH "${HASH}" \
-      --arg BUILD_COUNTER "${KEYMAN_VERSION_PATCH}" \
-      --arg SIZE "${SIZE}" \
-      '{name: $NAME, version: $BUILD_NUMBER, date: $DATE, platform: "linux", stability: $KEYMAN_TIER, file: $FILENAME, md5: $HASH, type: "tar.gz", build: $BUILD_COUNTER, size: $SIZE}' )
-      echo "${DOWNLOAD_INFO}" | jq . >> "${UPLOAD_DIR}/${TAR_GZ}.download_info"
-  done
-
-  # Expanded, documented form of the arguments
-  # ==========================================
-  # "-vrzltp "   # verbose, recurse, zip, copy symlinks, preserve times, permissions
-  # "--perms "   # perfectly matches existing file permissions on the build agent
-  # "--stats "   # show statistics for log
-  # "--rsync-path=\"sudo -u vu2009 rsync\" # path on remote server
-  # "--rsh=ssh " # use ssh
-
-  # The actual rsync call.
-  # We run into weird quote-based issues if we don't do a monolithic call as seen below, at least at present.
-  builder_echo "Performing rsync call"
-  rsync -vrzltp --perms --stats --rsync-path="${RSYNC_PATH}" --rsh=ssh "${UPLOAD_DIR}" "${RSYNC_USER}@${RSYNC_HOST}:${RSYNC_ROOT}/linux/${KEYMAN_TIER}"
+  write_download_info "${UPLOAD_DIR}" "${KEYMAN_TGZ}" "Keyman for Linux" tar.gz linux
+  tc_rsync_upload "${UPLOAD_DIR}" "linux/${KEYMAN_TIER}"
 
   builder_echo end "publish to downloads" success "Publish to downloads.keyman.com"
 }
@@ -179,7 +140,7 @@ if builder_has_action all; then
   linux_install_dependencies_action
   _install_additional_dependencies
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   linux_build_action
   linux_unit_tests_action --no-integration
@@ -188,7 +149,7 @@ else
   builder_run_action  configure   linux_install_dependencies_action
   builder_run_action  configure   _install_additional_dependencies
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   builder_run_action  build       linux_build_action
   builder_run_action  test        linux_unit_tests_action --no-integration
diff --git a/resources/teamcity/linux/keyman-linux-test-integration.sh b/resources/teamcity/linux/keyman-linux-test-integration.sh
index 0868cbb835..4a19ebcb97 100755
--- a/resources/teamcity/linux/keyman-linux-test-integration.sh
+++ b/resources/teamcity/linux/keyman-linux-test-integration.sh
@@ -6,14 +6,14 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
-. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-actions.inc.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-linux.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/linux/linux-actions.inc.sh"
 
 ################################ Main script ################################
 
@@ -29,19 +29,26 @@ builder_parse "$@"
 
 cd "${KEYMAN_ROOT}/linux"
 
+# Run the clean action in the `linux` directory.`
+function clean_action() {
+  builder_heading "Cleaning up"
+  # shellcheck disable=SC2154
+  "${KEYMAN_ROOT}/linux/build.sh" clean
+}
+
 if builder_has_action all; then
-  linux_clean_action
+  clean_action
   linux_install_dependencies_action
   linux_additional_test_dependencies_action
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
   linux_build_action
   linux_unit_tests_action
 else
-  builder_run_action  clean       linux_clean_action
+  builder_run_action  clean       clean_action
   builder_run_action  configure   linux_install_dependencies_action
   builder_run_action  configure   linux_additional_test_dependencies_action
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   builder_run_action  build       linux_build_action
   builder_run_action  test        linux_unit_tests_action
diff --git a/resources/teamcity/linux/keyman-linux-test.sh b/resources/teamcity/linux/keyman-linux-test.sh
index 7c8387d153..2779e0f803 100755
--- a/resources/teamcity/linux/keyman-linux-test.sh
+++ b/resources/teamcity/linux/keyman-linux-test.sh
@@ -6,14 +6,14 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
-. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-actions.inc.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-linux.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/linux/linux-actions.inc.sh"
 
 ################################ Main script ################################
 
@@ -40,7 +40,7 @@ if builder_has_action all; then
   linux_install_dependencies_action
   linux_additional_test_dependencies_action
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   linux_build_action --coverage
   linux_unit_tests_action --coverage --report --no-integration
@@ -49,7 +49,7 @@ else
   builder_run_action  configure   linux_install_dependencies_action
   builder_run_action  configure   linux_additional_test_dependencies_action
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   builder_run_action  build       linux_build_action --coverage
   builder_run_action  test        linux_unit_tests_action --coverage --report --no-integration
diff --git a/resources/teamcity/includes/tc-actions.inc.sh b/resources/teamcity/linux/linux-actions.inc.sh
similarity index 82%
rename from resources/teamcity/includes/tc-actions.inc.sh
rename to resources/teamcity/linux/linux-actions.inc.sh
index 8f671e14b2..0b96f4c07c 100644
--- a/resources/teamcity/includes/tc-actions.inc.sh
+++ b/resources/teamcity/linux/linux-actions.inc.sh
@@ -1,16 +1,11 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 # Keyman is copyright (C) SIL Global. MIT License.
 
-# Run the clean action in the `linux` directory.`
-linux_clean_action() {
-  builder_heading "Cleaning up"
-  # shellcheck disable=SC2154
-  "${KEYMAN_ROOT}/linux/build.sh" clean
-}
-
 # Install required dependencies for building Keyman on Linux.
 linux_install_dependencies_action() {
   builder_echo start "install dependencies" "Installing dependencies"
+
+  # shellcheck disable=SC2154
   . "${KEYMAN_ROOT}/linux/scripts/package-build.inc.sh"
   checkAndInstallRequirements
   builder_echo end "install dependencies" success "Finished installing dependencies"
@@ -21,20 +16,20 @@ linux_additional_test_dependencies_action() {
   builder_echo start additional_dependencies "Installing additional dependencies"
   local TOINSTALL="lcov libdatetime-perl gcovr python3-venv jq"
 
-  if is_os_version_or_higher 24.04; then
+  if ba_linux_is_os_version_or_higher 24.04; then
     TOINSTALL="${TOINSTALL} libgirepository-2.0-dev python3-coverage"
   fi
 
   # shellcheck disable=SC2086
-  linux_check_and_install_packages ${TOINSTALL}
+  ba_linux_check_and_install_packages ${TOINSTALL}
 
-  if ! is_os_version_or_higher 24.04; then
+  if ! ba_linux_is_os_version_or_higher 24.04; then
     builder_heading "Installing python3-coverage from pip"
     pip3 install --user coverage
   fi
 
-  linux_install_nvm
-  linux_install_dependencies_for_tests
+  ba_linux_install_nvm
+  ba_linux_install_dependencies_for_tests
 
   builder_echo end additional_dependencies success "Finished installing additional dependencies"
 }
diff --git a/resources/teamcity/macos/keyman-macos-release.sh b/resources/teamcity/macos/keyman-macos-release.sh
new file mode 100755
index 0000000000..57ddaa082c
--- /dev/null
+++ b/resources/teamcity/macos/keyman-macos-release.sh
@@ -0,0 +1,80 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# TC build script for Keyman macOS/Release
+#
+# Requires: env variable $MAC_BUILDAGENT_PASSWORD set
+
+# shellcheck disable=SC2164
+# shellcheck disable=SC1091
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+# shellcheck disable=SC2154
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-mac.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/macos/macos-actions.inc.sh"
+
+################################ Main script ################################
+
+builder_describe \
+  "Build release of Keyman for macOS" \
+  "all            run all actions" \
+  "clean          clean artifact directories" \
+  "build          build Keyman for macOS" \
+  "publish        publish Keyman for macOS" \
+  "--rsync-path=RSYNC_PATH              rsync path on remote server" \
+  "--rsync-user=RSYNC_USER              rsync user on remote server" \
+  "--rsync-host=RSYNC_HOST              rsync host on remote server" \
+  "--rsync-root=RSYNC_ROOT              rsync root on remote server" \
+  "--help.keyman.com=HELP_KEYMAN_COM    path to help.keyman.com repository"
+
+builder_parse "$@"
+
+cd "${KEYMAN_ROOT}/mac"
+
+function _publish_to_downloads_keyman_com() {
+  builder_echo start "publish to downloads.keyman.com" "Publishing release to downloads.keyman.com"
+
+  local UPLOAD_DIR
+
+  # Note that the `rsync` tool that exists on Macs by default is a very old version and must be updated to a newer version, e.g. by using Homebrew.
+
+  UPLOAD_DIR="Keyman4MacIM/output/upload/${KEYMAN_VERSION}"
+
+  # Set permissions as required on download site
+  builder_echo "Setting upload file permissions for downloads.keyman.com"
+  chmod g+w  "${UPLOAD_DIR}"
+  chmod a+rx "${UPLOAD_DIR}"
+
+  chmod g+rw "${UPLOAD_DIR}"/*
+  chmod a+r  "${UPLOAD_DIR}"/*
+
+  builder_echo "Performing rsync call"
+  # shellcheck disable=SC2154
+  tc_rsync_upload "${UPLOAD_DIR}" "mac/${KEYMAN_TIER}"
+
+  builder_echo end "publish to downloads.keyman.com" success "Finished publishing release to downloads.keyman.com"
+}
+
+function do_publish() {
+  _publish_to_downloads_keyman_com
+  tc_upload_help "Keyman for macOS" mac
+}
+
+ba_mac_unlock_keychain
+
+if builder_has_action all; then
+  macos_clean_action
+  macos_build_action
+  do_publish
+else
+  builder_run_action  clean    macos_clean_action
+  builder_run_action  build    macos_build_action
+  builder_run_action  publish  do_publish
+fi
diff --git a/resources/teamcity/macos/keyman-macos-test.sh b/resources/teamcity/macos/keyman-macos-test.sh
new file mode 100755
index 0000000000..1c6297d1af
--- /dev/null
+++ b/resources/teamcity/macos/keyman-macos-test.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# TC build script for Keyman macOS/Test
+#
+# Requires: env variable $MAC_BUILDAGENT_PASSWORD set
+
+# shellcheck disable=SC2164
+# shellcheck disable=SC1091
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+# shellcheck disable=SC2154
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-mac.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/macos/macos-actions.inc.sh"
+
+################################ Main script ################################
+
+builder_describe \
+  "Build Keyman for macOS" \
+  "all            run all actions" \
+  "clean          clean artifact directories" \
+  "build          build Keyman for macOS"
+
+builder_parse "$@"
+
+cd "${KEYMAN_ROOT}/mac"
+
+ba_mac_unlock_keychain
+
+if builder_has_action all; then
+  macos_clean_action
+  macos_build_action
+else
+  builder_run_action  clean   macos_clean_action
+  builder_run_action  build   macos_build_action
+fi
diff --git a/resources/teamcity/macos/macos-actions.inc.sh b/resources/teamcity/macos/macos-actions.inc.sh
new file mode 100755
index 0000000000..832de1aebe
--- /dev/null
+++ b/resources/teamcity/macos/macos-actions.inc.sh
@@ -0,0 +1,14 @@
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+macos_clean_action() {
+  ba_mac_clean_xcode_derived_data
+  ba_mac_unmount_volumes_keyman
+}
+
+macos_build_action() {
+  builder_echo start "build" "Building Keyman for macOS"
+  # shellcheck disable=SC2154
+  "${KEYMAN_ROOT}/mac/build.sh" configure build test publish
+  builder_echo end "build" success "Finished building Keyman for macOS"
+}
diff --git a/resources/teamcity/web/keyman-web-release.sh b/resources/teamcity/web/keyman-web-release.sh
index d2aa1c378b..0aa5b2fbe8 100755
--- a/resources/teamcity/web/keyman-web-release.sh
+++ b/resources/teamcity/web/keyman-web-release.sh
@@ -9,11 +9,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/web/web-actions.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-linux.inc.sh"
@@ -21,7 +21,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ################################ Main script ################################
 
 builder_describe \
-  "Run tests for native KeymanWeb" \
+  "Build and publish KeymanWeb" \
   "all            run all actions" \
   "configure      install dependencies" \
   "build          build Web + embedded" \
@@ -53,28 +53,27 @@ function _push_release_to_skeymancom() {
 function _zip_and_upload_artifacts() {
   builder_echo start "zip and upload artifacts" "Zipping and uploading artifacts"
 
-  # shellcheck disable=SC2154
-  powershell -NonInteractive -ExecutionPolicy Bypass -File "${THIS_SCRIPT_PATH}/zip-and-upload-artifacts.ps1"
-
-  builder_echo end "zip and upload artifacts" success "Finished zipping and uploading artifacts"
-}
-
-function _upload_help() {
-  builder_echo start "upload help" "Uploading new Keyman for Web help to help.keyman.com"
-
-  export HELP_KEYMAN_COM="${HELP_KEYMAN_COM:-${KEYMAN_ROOT}/../help.keyman.com}"
-  cd "${KEYMAN_ROOT}/resources/build"
-  "${KEYMAN_ROOT}/resources/build/help-keyman-com.sh" web
   cd "${KEYMAN_ROOT}/web"
 
-  builder_echo end "upload help" success "Finished uploading new Keyman for Web help to help.keyman.com"
+  local UPLOAD_DIR="build/upload/${KEYMAN_VERSION}"
+
+  ./ci.sh prepare:downloads.keyman.com
+
+  write_download_info "${UPLOAD_DIR}" "keymanweb-${KEYMAN_VERSION}.zip" KeymanWeb zip web
+
+  (
+    cd build/upload
+    tc_rsync_upload "${KEYMAN_VERSION}" "web/${KEYMAN_TIER}"
+  )
+
+  builder_echo end "zip and upload artifacts" success "Finished zipping and uploading artifacts"
 }
 
 function publish_web_action() {
   builder_echo start publish "Publishing KeymanWeb release"
 
   # TODO: refactor to allow to run on Linux/macOS as well
-  if ! is_windows; then
+  if ! builder_is_windows; then
     builder_echo end publish error "Publishing KeymanWeb is only supported on Windows"
     return 1
   fi
@@ -89,7 +88,7 @@ function publish_web_action() {
   _push_release_to_skeymancom
 
   _zip_and_upload_artifacts
-  _upload_help
+  tc_upload_help "Keyman for Web" web
 
   builder_echo end publish success "Finished publishing KeymanWeb release"
 }
@@ -97,14 +96,14 @@ function publish_web_action() {
 if builder_has_action all; then
   web_install_dependencies_on_linux_action
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   web_build_action
   publish_web_action
 else
   builder_run_action  configure   web_install_dependencies_on_linux_action
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   builder_run_action  build       web_build_action
   builder_run_action  publish     publish_web_action
diff --git a/resources/teamcity/web/keyman-web-test.sh b/resources/teamcity/web/keyman-web-test.sh
index 0996ab7ec3..2fc841a16d 100755
--- a/resources/teamcity/web/keyman-web-test.sh
+++ b/resources/teamcity/web/keyman-web-test.sh
@@ -9,11 +9,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # shellcheck disable=SC2154
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/web/web-actions.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
 . "${KEYMAN_ROOT}/resources/teamcity/includes/tc-linux.inc.sh"
@@ -40,7 +40,7 @@ function check_build_size_action() {
 if builder_has_action all; then
   web_install_dependencies_on_linux_action
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   web_build_action
   web_test_action
@@ -48,7 +48,7 @@ if builder_has_action all; then
 else
   builder_run_action  configure   web_install_dependencies_on_linux_action
 
-  set_variables_for_nvm
+  tc_set_variables_for_nvm
 
   builder_run_action  build       web_build_action
   builder_run_action  test        web_test_action
diff --git a/resources/teamcity/web/web-actions.inc.sh b/resources/teamcity/web/web-actions.inc.sh
index 187eef8bb6..437254b975 100644
--- a/resources/teamcity/web/web-actions.inc.sh
+++ b/resources/teamcity/web/web-actions.inc.sh
@@ -1,29 +1,29 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 # Keyman is copyright (C) SIL Global. MIT License.
 
 web_install_dependencies_on_linux_action() {
-  if ! is_ubuntu; then
+  if ! builder_is_linux; then
     return 0
   fi
 
   builder_echo start "install dependencies" "Install dependencies"
 
   # shellcheck disable=SC2086
-  linux_check_and_install_packages devscripts jq
+  ba_linux_check_and_install_packages devscripts jq
 
-  linux_install_nvm
+  ba_linux_install_nvm
   _install_playwright_dependencies
 
   builder_echo end "install dependencies" success "Finished installing dependencies"
 }
 
 _install_playwright_dependencies() {
-  if ! is_ubuntu || ! is_os_version_or_higher 24.04; then
+  if ! builder_is_linux || ! ba_linux_is_os_version_or_higher 24.04; then
     return 0
   fi
 
   # shellcheck disable=SC2086
-  linux_check_and_install_packages ibevent-2.1-7t64 libxslt1.1 libwoff1 \
+  ba_linux_check_and_install_packages ibevent-2.1-7t64 libxslt1.1 libwoff1 \
     libvpx9 libgstreamer-plugins-bad1.0-0 libwebpdemux2 libharfbuzz-icu0 \
     libenchant-2-2 libsecret-1-0 libhyphen0 libmanette-0.2-0 libflite1 \
     gstreamer1.0-libav libnss3 libnspr4 libatk1.0-0t64 libatk-bridge2.0-0t64 \
@@ -40,15 +40,15 @@ web_build_action() {
 
 web_test_action() {
   builder_echo start web_test "Running tests for native KeymanWeb"
-  if is_ubuntu; then
-    linux_start_xvfb
-    trap "linux_stop_xvfb" ERR
+  if builder_is_linux; then
+    ba_linux_start_xvfb
+    trap "ba_linux_stop_xvfb" ERR
   fi
 
   "${KEYMAN_ROOT}/web/ci.sh" test
 
-  if is_ubuntu; then
-    linux_stop_xvfb
+  if builder_is_linux; then
+    ba_linux_stop_xvfb
     trap ERR
   fi
 
diff --git a/resources/teamcity/web/zip-and-upload-artifacts.ps1 b/resources/teamcity/web/zip-and-upload-artifacts.ps1
deleted file mode 100755
index 91d1cb9667..0000000000
--- a/resources/teamcity/web/zip-and-upload-artifacts.ps1
+++ /dev/null
@@ -1,79 +0,0 @@
-# Keyman is copyright (C) SIL Global. MIT License.
-#
-# This script should be the identical for nightly/beta/stable for a given platform
-#
-# Working directory should be ${KEYMAN_ROOT}/web
-#
-$ErrorActionPreference = "Stop";
-
-$tier = Get-Content ..\TIER.md
-$build_number = Get-Content ..\VERSION.md
-$build_counter = $build_number -replace "^\d+\.\d+\.(\d+)$", '$1'
-
-$upload_path = "build\upload\$build_number"
-$zip = "$upload_path\keymanweb-$build_number.zip"
-
-$7Z_HOME = $env:7Z_HOME
-$RSYNC_HOME = $env:RSYNC_HOME
-$RSYNC_PATH = $env:RSYNC_PATH
-$RSYNC_USER = $env:RSYNC_USER
-$RSYNC_HOST = $env:RSYNC_HOST
-$RSYNC_ROOT = $env:RSYNC_ROOT
-$USERPROFILE = $env:USERPROFILE
-
-# Since shell-scripting doesn't like number-initial variables, we convert it to a friendlier name.
-$env:SEVEN_Z_HOME=$7Z_HOME
-
-# PowerShell fun: `--` parameters will break a PowerShell command when not escaped in some form.
-# We can build the command in string form first and then execute the string, fortunately.
-$cmd = '"C:\Program Files\Git\bin\bash.exe" --init-file "c:\Program Files\Git\etc\profile" -l ./ci.sh prepare:downloads.keyman.com'
-cmd /c $cmd
-
-$hash = get-filehash $zip -Algorithm MD5
-
-#
-# Construct .build_info
-#
-
-$download_info = @"
-{
-  "name": "KeymanWeb",
-  "version": "$build_number",
-  "date": "$([DateTime]::Now.ToString("yyyy-MM-dd"))",
-  "platform": "web",
-  "stability": "$tier",
-  "file": "keymanweb-$build_number.zip",
-  "md5": "$($hash.Hash)",
-  "type": "zip",
-  "build": "$build_counter"
-}
-"@
-
-# WriteAllLines is needed to avoid BOM
-[System.IO.File]::WriteAllLines("$pwd\$upload_path\keymanweb-$build_number.zip.download_info", $download_info)
-# $download_info | Out-File $upload_path\keymanweb-$build_number.zip.download_info -Encoding utf8
-
-#
-# Upload with rsync to downloads.keyman.com
-# (rsync requires that we are in the upload folder to get folders in
-# sync correctly; it is possible to resolve this but easier to just cd.)
-#
-
-$rsync_args = @(
-  '-vrzltp',                                # verbose, recurse, zip, copy symlinks, preserve times, permissions
-  '--chmod=Dug=rwx,Do=rx,Fug=rw,Fo=r',      # map Windows security to host security
-  '--stats',                                # show statistics for log
-  "--rsync-path='$RSYNC_PATH'",             # path on remote server
-  "--rsh=$RSYNC_HOME\ssh -i $USERPROFILE\.ssh\id_rsa -o UserKnownHostsFile=$USERPROFILE\.ssh\known_hosts",                  # use ssh
-  "$build_number",                          # upload the whole build folder
-  "$RSYNC_USER@$RSYNC_HOST:$RSYNC_ROOT/web/$tier/" # target server + path
-)
-
-# Write-Output "rsync parameters:" $rsync_args
-
-cd "$upload_path\.."
-& $RSYNC_HOME\rsync.exe $rsync_args
-if ($LASTEXITCODE -ne 0) { throw "Exit code is $LASTEXITCODE" }
-cd ..
-
-# EOF
diff --git a/resources/teamcity/windows/keyman-windows-release.sh b/resources/teamcity/windows/keyman-windows-release.sh
new file mode 100755
index 0000000000..51d95a6082
--- /dev/null
+++ b/resources/teamcity/windows/keyman-windows-release.sh
@@ -0,0 +1,123 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# TC build script to build release of Keyman for Windows.
+
+# shellcheck disable=SC2164
+# shellcheck disable=SC1091
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+# shellcheck disable=SC2154
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-windows.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/windows/windows-actions.inc.sh"
+
+################################ Main script ################################
+
+builder_describe \
+  "Build and publish Keyman for Windows" \
+  "all            run all actions" \
+  "build          build Keyman for Windows Windows" \
+  "test           run Keyman for Windows tests" \
+  "publish        publish release" \
+  "--rsync-path=RSYNC_PATH                    rsync path on remote server" \
+  "--rsync-user=RSYNC_USER                    rsync user on remote server" \
+  "--rsync-host=RSYNC_HOST                    rsync host on remote server" \
+  "--rsync-root=RSYNC_ROOT                    rsync root on remote server" \
+  "--help.keyman.com=HELP_KEYMAN_COM          path to help.keyman.com repository" \
+  "--symbols-local-path=LOCAL_SYMBOLS_PATH    local path to symbols directory" \
+  "--symbols-remote-path=REMOTE_SYMBOLS_PATH  remote path to symbols directory" \
+  "--symbols-subdir=SYMBOLS_SUBDIR            subdirectory containing symbols"
+
+builder_parse "$@"
+
+cd "${KEYMAN_ROOT}/windows/src"
+
+if ! builder_is_windows; then
+  builder_echo error "This script is intended to be run on Windows only."
+  exit 1
+fi
+
+function _publish_to_downloads_keyman_com() {
+  # Publish to downloads.keyman.com
+  builder_echo start "publish to downloads.keyman.com" "Publishing release to downloads.keyman.com"
+  (
+    cd "${KEYMAN_ROOT}/windows"
+
+    local UPLOAD_PATH KEYMAN_EXE KEYMAN_DESKTOP_MSI SETUP_EXE SETUP_REDIST_ZIP DEBUG_ZIP
+    local FIRSTVOICES_MSI FIRSTVOICES_EXE
+
+    # shellcheck disable=SC2154
+    UPLOAD_PATH="upload/${KEYMAN_VERSION}"
+    KEYMAN_EXE="keyman-${KEYMAN_VERSION}.exe"
+    KEYMAN_DESKTOP_MSI="keymandesktop.msi"
+    SETUP_EXE="setup.exe"
+    SETUP_REDIST_ZIP="setup-redist.zip"
+    FIRSTVOICES_MSI="firstvoices.msi"
+    FIRSTVOICES_EXE="firstvoices-${KEYMAN_VERSION}.exe"
+    DEBUG_ZIP="debug-${KEYMAN_VERSION}.zip"
+
+    rm -rf "${UPLOAD_PATH}"
+    mkdir -p "${UPLOAD_PATH}"
+
+    cp "release/${KEYMAN_VERSION}/${KEYMAN_EXE}" "${UPLOAD_PATH}"
+    cp "release/${KEYMAN_VERSION}/${KEYMAN_DESKTOP_MSI}" "${UPLOAD_PATH}"
+    cp "release/${KEYMAN_VERSION}/${SETUP_EXE}" "${UPLOAD_PATH}"
+    cp "release/${KEYMAN_VERSION}/${SETUP_REDIST_ZIP}" "${UPLOAD_PATH}"
+    cp "release/${KEYMAN_VERSION}/${FIRSTVOICES_EXE}" "${UPLOAD_PATH}"
+    cp "release/${KEYMAN_VERSION}/${FIRSTVOICES_MSI}" "${UPLOAD_PATH}"
+
+    write_download_info "${UPLOAD_PATH}" "${KEYMAN_EXE}" "Keyman for Windows" exe win
+    write_download_info "${UPLOAD_PATH}" "${KEYMAN_DESKTOP_MSI}" "Keyman for Windows MSI installer" msi win
+    write_download_info "${UPLOAD_PATH}" "${SETUP_EXE}" "Keyman for Windows setup bootstrap" exe win
+    write_download_info "${UPLOAD_PATH}" "${SETUP_REDIST_ZIP}" "Keyman for Windows setup bootstrap (unsigned for bundling)" zip win
+
+    write_download_info "${UPLOAD_PATH}" "${FIRSTVOICES_EXE}" "FirstVoices Keyboards" exe win
+    write_download_info "${UPLOAD_PATH}" "${FIRSTVOICES_MSI}" "FirstVoices Keyboards MSI installer" msi win
+
+    # TODO: is this still needed?
+    if [[ -f "release/${KEYMAN_VERSION}/${DEBUG_ZIP}" ]]; then
+      cp "release/${KEYMAN_VERSION}/${DEBUG_ZIP}" "${UPLOAD_PATH}"
+      write_download_info "${UPLOAD_PATH}" "${DEBUG_ZIP}" "Keyman Desktop and Keyman Developer debug files" zip win
+    fi
+
+    cd upload
+    # shellcheck disable=SC2154
+    tc_rsync_upload "${KEYMAN_VERSION}" "windows/${KEYMAN_TIER}"
+  )
+  builder_echo end "publish to downloads.keyman.com" success "Finished publishing release to downloads.keyman.com"
+}
+
+function windows_publish_action() {
+  builder_echo start "publish windows" "Publishing Keyman for Windows"
+
+  export RSYNC_PATH
+  export RSYNC_USER
+  export RSYNC_HOST
+  export RSYNC_ROOT
+
+  "${KEYMAN_ROOT}/windows/build.sh" publish
+  windows_upload_symbols_to_sentry
+  ba_win_download_symbol_server_index
+  ba_win_publish_new_symbols
+  _publish_to_downloads_keyman_com
+  tc_upload_help "Keyman for Windows" windows
+  builder_echo end "publish windows" success "Finished publishing Keyman for Windows"
+}
+
+if builder_has_action all; then
+  windows_build_action
+  windows_test_action
+  windows_publish_action
+else
+  builder_run_action  build       windows_build_action
+  builder_run_action  test        windows_test_action
+  builder_run_action  publish     windows_publish_action
+fi
+
diff --git a/resources/teamcity/windows/keyman-windows-test.sh b/resources/teamcity/windows/keyman-windows-test.sh
new file mode 100755
index 0000000000..fc83b5c362
--- /dev/null
+++ b/resources/teamcity/windows/keyman-windows-test.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+# Keyman is copyright (C) SIL Global. MIT License.
+#
+# TC build script for Keyman Windows/Test
+
+# shellcheck disable=SC2164
+# shellcheck disable=SC1091
+
+## START STANDARD BUILD SCRIPT INCLUDE
+# adjust relative paths as necessary
+THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+# shellcheck disable=SC2154
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/includes/tc-helpers.inc.sh"
+. "${KEYMAN_ROOT}/resources/teamcity/windows/windows-actions.inc.sh"
+
+################################ Main script ################################
+
+builder_describe \
+  "Run tests for Keyman for Windows" \
+  "all            run all actions" \
+  "build          build Keyman for Windows" \
+  "test           run Keyman for Windows tests" \
+  "publish        prepare files for distribution, publish symbols, and build installer module"
+
+builder_parse "$@"
+
+cd "${KEYMAN_ROOT}/windows/src"
+
+if ! builder_is_windows; then
+  builder_echo error "This script is intended to be run on Windows only."
+  exit 1
+fi
+
+function windows_publish_action() {
+  builder_echo start "publish windows" "Publishing Keyman for Windows"
+  "${KEYMAN_ROOT}/windows/build.sh" publish
+  windows_upload_symbols_to_sentry
+  builder_echo end "publish windows" success "Finished publishing Keyman for Windows"
+}
+
+if builder_has_action all; then
+  windows_build_action
+  windows_test_action
+  windows_publish_action
+else
+  builder_run_action  build       windows_build_action
+  builder_run_action  test        windows_test_action
+  builder_run_action  publish     windows_publish_action
+fi
+
diff --git a/resources/teamcity/windows/windows-actions.inc.sh b/resources/teamcity/windows/windows-actions.inc.sh
new file mode 100755
index 0000000000..3b5699447c
--- /dev/null
+++ b/resources/teamcity/windows/windows-actions.inc.sh
@@ -0,0 +1,19 @@
+# shellcheck shell=bash
+# Keyman is copyright (C) SIL Global. MIT License.
+
+windows_build_action() {
+  builder_echo start "build windows" "Building Keyman for Windows"
+  # shellcheck disable=SC2154
+  "${KEYMAN_ROOT}/windows/build.sh" configure build
+  builder_echo end "build windows" success "Finished building Keyman for Windows"
+}
+
+windows_test_action() {
+  builder_echo start "test windows" "Running Keyman for Windows tests"
+  "${KEYMAN_ROOT}/windows/build.sh" test
+  builder_echo end "test windows" success "Finished running Keyman for Windows tests"
+}
+
+windows_upload_symbols_to_sentry() {
+  "${KEYMAN_ROOT}/windows/src/buildtools/sentry-upload-difs.sh"
+}
diff --git a/resources/tools/check-markdown/build.sh b/resources/tools/check-markdown/build.sh
index c288b9a6be..01dd9d81c9 100755
--- a/resources/tools/check-markdown/build.sh
+++ b/resources/tools/check-markdown/build.sh
@@ -2,10 +2,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -21,6 +22,6 @@ builder_describe_outputs \
 builder_parse "$@"
 
 builder_run_action clean      rm -rf build/ tsconfig.tsbuildinfo
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action build      tsc --build
 # builder_run_action test       mocha
diff --git a/web/build.sh b/web/build.sh
index 51301682ca..4cb01f840e 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -5,10 +5,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 # ################################ Main script ################################
diff --git a/web/ci.sh b/web/ci.sh
index f3f70eef93..02545cf447 100755
--- a/web/ci.sh
+++ b/web/ci.sh
@@ -4,15 +4,16 @@
 # building the Keyman Engine for Web.
 #
 
-# set -x
+# TODO: merge this with resources/teamcity/web scripts
 
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "${KEYMAN_ROOT}/resources/build/zip.inc.sh"
 . "${KEYMAN_ROOT}/resources/build/ci/pull-requests.inc.sh"
 
 # This script runs from its own folder
@@ -65,16 +66,18 @@ function build_action() {
   # one option:
   ./build.sh configure clean build
 
-  # Upload the sentry-configuration engine used by the mobile apps to sentry
-  # Also, clean 'em first.
-  for sourcemap in "${KEYMAN_ROOT}/web/src/engine/sentry-manager/build/lib/"*.map; do
-    node "${KEYMAN_ROOT}/web/build/tools/building/sourcemap-root/index.js" null "${sourcemap}" --clean
-  done
-  web_sentry_upload "${KEYMAN_ROOT}/web/src/engine/sentry-manager/build/lib/"
+  if builder_is_ci_build && builder_is_ci_build_level_release; then
+    # Upload the sentry-configuration engine used by the mobile apps to sentry
+    # Also, clean 'em first.
+    for sourcemap in "${KEYMAN_ROOT}/web/src/engine/sentry-manager/build/lib/"*.map; do
+      node "${KEYMAN_ROOT}/web/build/tools/building/sourcemap-root/index.js" null "${sourcemap}" --clean
+    done
+    web_sentry_upload "${KEYMAN_ROOT}/web/src/engine/sentry-manager/build/lib/"
 
-  # And, of course, the main build-products too
-  web_sentry_upload "${KEYMAN_ROOT}/web/build/app/webview/release/"
-  web_sentry_upload "${KEYMAN_ROOT}/web/build/publish/release/"
+    # And, of course, the main build-products too
+    web_sentry_upload "${KEYMAN_ROOT}/web/build/app/webview/release/"
+    web_sentry_upload "${KEYMAN_ROOT}/web/build/publish/release/"
+  fi
 }
 
 function test_action() {
@@ -154,32 +157,12 @@ function prepare_downloads_keyman_com_action() {
 
   mkdir -p "${UPLOAD_PATH}"
 
-  # On Windows, we use 7-zip (SEVEN_Z_HOME env var).  On other platforms, we use zip.
-
-  COMPRESS_CMD=
-  COMPRESS_ADD=
-
-  # Marc's preference; use $SEVEN_Z_HOME and have the BAs set up with THAT as an env var.
-  if [[ ! -z "${SEVEN_Z_HOME+x}" ]]; then
-    COMPRESS_CMD="${SEVEN_Z_HOME}/7z"
-    COMPRESS_ADD="a -bd -bb0 -r" # add, hide progress, log level 0, recursive
-  fi
-
-  if [[ -z "${COMPRESS_CMD}" ]] ; then
-    if command -v zip &> /dev/null; then
-      # Note:  does not support within-archive renames!
-      COMPRESS_CMD=zip
-      COMPRESS_ADD="-r"
-    else
-      builder_die "7z and zip commands are both unavailable"
-    fi
-  fi
-
-  pushd build/publish
-  # Zip both the 'debug' and 'release' configurations together.
-  # shellcheck disable=SC2086
-  "${COMPRESS_CMD}" ${COMPRESS_ADD} "${ZIP}" ./*
-  popd
+  (
+    # shellcheck disable=2164
+    cd build/publish
+    # Zip both the 'debug' and 'release' configurations together.
+    add_zip_files -q -r "${ZIP}" ./*
+  )
 
   # --- Second action artifact - the 'static' folder (hosted user testing on downloads.keyman.com) ---
 
@@ -189,9 +172,10 @@ function prepare_downloads_keyman_com_action() {
   mkdir -p "${STATIC}"
 
   mkdir -p "${STATIC}/build"
-  cp -rf build/app    "${STATIC}/build/app"
-  cp -rf build/engine "${STATIC}/build/engine"
-  cp -rf build/tools  "${STATIC}/build/tools"
+  cp -rf build/app     "${STATIC}/build/app"
+  cp -rf build/engine  "${STATIC}/build/engine"
+  cp -rf build/publish "${STATIC}/build/publish"
+  cp -rf build/tools   "${STATIC}/build/tools"
   # avoid build/upload, since that's the folder we're building!
 
   cp -f index.html "${STATIC}/index.html"
diff --git a/web/src/app/browser/build.sh b/web/src/app/browser/build.sh
index 85c696ba4a..a61ce1517c 100755
--- a/web/src/app/browser/build.sh
+++ b/web/src/app/browser/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=app/browser
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -80,7 +81,7 @@ compile_and_copy() {
   cp "$KEYMAN_ROOT/web/src/engine/predictive-text/worker-thread/build/filesize-profile.log"     "$PROFILE_DEST/lm-worker-filesize.log"
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean do_clean
 builder_run_action build compile_and_copy
 builder_run_action test test-headless-typescript $SUBPROJECT_NAME
diff --git a/web/src/app/ui/build.sh b/web/src/app/ui/build.sh
index 3a431f9a0a..045cdac8d0 100755
--- a/web/src/app/ui/build.sh
+++ b/web/src/app/ui/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=app/ui
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -67,7 +68,7 @@ compile_and_copy() {
   prepare
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean do_clean
 builder_run_action build compile_and_copy
 
diff --git a/web/src/app/webview/build.sh b/web/src/app/webview/build.sh
index 1c2b2fe7dd..403aaec4e4 100755
--- a/web/src/app/webview/build.sh
+++ b/web/src/app/webview/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=app/webview
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -80,6 +81,6 @@ compile_and_copy() {
   "$KEYMAN_ROOT/web/src/test/manual/embed/android-harness/build.sh"
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME"
 builder_run_action build compile_and_copy
\ No newline at end of file
diff --git a/web/src/engine/attachment/build.sh b/web/src/engine/attachment/build.sh
index 497e65e9a1..042c5aa83e 100755
--- a/web/src/engine/attachment/build.sh
+++ b/web/src/engine/attachment/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # Imports common Web build-script definitions & functions
 SUBPROJECT_NAME=engine/attachment
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/web/common.inc.sh"
 
 # ################################ Main script ################################
@@ -40,7 +41,7 @@ do_build () {
     --format esm
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME"
 builder_run_action build do_build
 builder_run_action test test-headless-typescript "${SUBPROJECT_NAME}"
diff --git a/web/src/engine/common/web-utils/build.sh b/web/src/engine/common/web-utils/build.sh
index c487e22c91..2ff9a03b06 100755
--- a/web/src/engine/common/web-utils/build.sh
+++ b/web/src/engine/common/web-utils/build.sh
@@ -5,11 +5,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${KEYMAN_ROOT}/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 SUBPROJECT_NAME=engine/common/web-utils
 BUILD_DIR="/web/src/engine/common/web-utils/build"
@@ -56,7 +57,7 @@ function do_test() {
   c8 mocha --recursive $FLAGS ./src/tests/
 }
 
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action clean      rm -rf build/
 builder_run_action build      do_build
 builder_run_action test       do_test
diff --git a/web/src/engine/dom-utils/build.sh b/web/src/engine/dom-utils/build.sh
index 10cf2b660c..df6180e2ed 100755
--- a/web/src/engine/dom-utils/build.sh
+++ b/web/src/engine/dom-utils/build.sh
@@ -3,10 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # Imports common Web build-script definitions & functions
 SUBPROJECT_NAME=engine/dom-utils
@@ -33,7 +34,7 @@ builder_parse "$@"
 
 #### Build action definitions ####
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME"
 builder_run_action build compile $SUBPROJECT_NAME
 
diff --git a/web/src/engine/element-wrappers/build.sh b/web/src/engine/element-wrappers/build.sh
index aeee72241a..055c93b00e 100755
--- a/web/src/engine/element-wrappers/build.sh
+++ b/web/src/engine/element-wrappers/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/element-wrappers
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -38,7 +39,7 @@ do_build () {
     --format esm
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME"
 builder_run_action build do_build
 
diff --git a/web/src/engine/events/build.sh b/web/src/engine/events/build.sh
index e1f804908f..eeeb144949 100755
--- a/web/src/engine/events/build.sh
+++ b/web/src/engine/events/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/events
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -39,7 +40,7 @@ do_build () {
     --format esm
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
 builder_run_action build do_build
 builder_run_action test test-headless "${SUBPROJECT_NAME}"
diff --git a/web/src/engine/interfaces/build.sh b/web/src/engine/interfaces/build.sh
index 502e1f7172..3ea80fdc7a 100755
--- a/web/src/engine/interfaces/build.sh
+++ b/web/src/engine/interfaces/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/interfaces
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -40,7 +41,7 @@ do_build () {
     --format esm
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
 builder_run_action build do_build
 builder_run_action test test-headless "${SUBPROJECT_NAME}"
diff --git a/web/src/engine/js-processor/build.sh b/web/src/engine/js-processor/build.sh
index 620670276b..0fc0ef7e7a 100755
--- a/web/src/engine/js-processor/build.sh
+++ b/web/src/engine/js-processor/build.sh
@@ -3,13 +3,14 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/js-processor
 
 . "${KEYMAN_ROOT}/web/common.inc.sh"
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -35,7 +36,7 @@ do_build () {
     --format esm
 }
 
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action clean      rm -rf "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
 builder_run_action build      do_build
 builder_run_action test       test-headless "${SUBPROJECT_NAME}" ""
diff --git a/web/src/engine/keyboard-storage/build.sh b/web/src/engine/keyboard-storage/build.sh
index 86755c613a..a6a233bfd8 100755
--- a/web/src/engine/keyboard-storage/build.sh
+++ b/web/src/engine/keyboard-storage/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/keyboard-storage
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -47,7 +48,7 @@ do_build () {
     --platform node
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf "${KEYMAN_ROOT}/web/build/${SUBPROJECT_NAME}"
 builder_run_action build do_build
 builder_run_action test test-headless "${SUBPROJECT_NAME}"
diff --git a/web/src/engine/keyboard/build.sh b/web/src/engine/keyboard/build.sh
index dc1283a7f2..7260bc5cc6 100755
--- a/web/src/engine/keyboard/build.sh
+++ b/web/src/engine/keyboard/build.sh
@@ -5,13 +5,14 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/keyboard
 
 . "${KEYMAN_ROOT}/web/common.inc.sh"
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -34,7 +35,7 @@ builder_describe_outputs \
 builder_parse "$@"
 
 function do_configure() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
 
   # Configure Web browser-engine testing environments.  As is, this should only
   # make changes when we update the dependency, even on our CI build agents.
diff --git a/web/src/engine/main/build.sh b/web/src/engine/main/build.sh
index a90e9f7660..6cca867d88 100755
--- a/web/src/engine/main/build.sh
+++ b/web/src/engine/main/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../../resources/build/builder.inc.sh"
+. "$(dirname "$THIS_SCRIPT")/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/main
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -45,7 +46,7 @@ do_build () {
     --format esm
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME"
 builder_run_action build do_build
 builder_run_action test test-headless "${SUBPROJECT_NAME}"
\ No newline at end of file
diff --git a/web/src/engine/osk/build.sh b/web/src/engine/osk/build.sh
index 307d5b7a08..8c82560f4e 100755
--- a/web/src/engine/osk/build.sh
+++ b/web/src/engine/osk/build.sh
@@ -3,12 +3,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/osk
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # ################################ Main script ################################
 
@@ -41,7 +42,7 @@ do_clean() {
 }
 
 do_configure() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
   cp "$KEYMAN_ROOT/common/resources/fonts/keymanweb-osk.ttf" "$KEYMAN_ROOT/web/src/resources/osk/"
 }
 
diff --git a/web/src/engine/osk/gesture-processor/build.sh b/web/src/engine/osk/gesture-processor/build.sh
index 5bee378fca..53c50c3d39 100755
--- a/web/src/engine/osk/gesture-processor/build.sh
+++ b/web/src/engine/osk/gesture-processor/build.sh
@@ -3,13 +3,14 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../../../resources/build/builder.inc.sh"
+. "$(dirname "$THIS_SCRIPT")/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=engine/osk/gesture-processor
 
 . "${KEYMAN_ROOT}/web/common.inc.sh"
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
 
@@ -38,7 +39,7 @@ builder_parse "$@"
 # TODO: configure if npm has not been run, and build is specified
 
 function do_configure() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
 }
 
 function do_build_module() {
diff --git a/web/src/engine/osk/gesture-processor/src/tools/build.sh b/web/src/engine/osk/gesture-processor/src/tools/build.sh
index 343d90a117..735e943ecc 100755
--- a/web/src/engine/osk/gesture-processor/src/tools/build.sh
+++ b/web/src/engine/osk/gesture-processor/src/tools/build.sh
@@ -3,11 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../../../../../resources/build/builder.inc.sh"
+. "$(dirname "$THIS_SCRIPT")/../../../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
 
diff --git a/web/src/engine/osk/src/banner/suggestionBanner.ts b/web/src/engine/osk/src/banner/suggestionBanner.ts
index a4d852cb49..25143cb316 100644
--- a/web/src/engine/osk/src/banner/suggestionBanner.ts
+++ b/web/src/engine/osk/src/banner/suggestionBanner.ts
@@ -773,11 +773,10 @@ export class SuggestionBanner extends Banner {
       if(suggestions.length > i) {
         const suggestion = suggestions[i];
         d.update(suggestion, optionFormat);
-        if(this.predictionContext.selected == suggestion) {
-          d.highlight(true);
-        }
+        d.highlight(this.predictionContext.selected == suggestion)
       } else {
         d.update(null, optionFormat);
+        d.highlight(false);
       }
     }
 
diff --git a/web/src/engine/predictive-text/build.sh b/web/src/engine/predictive-text/build.sh
index ff0029ec40..f4872bcd7f 100755
--- a/web/src/engine/predictive-text/build.sh
+++ b/web/src/engine/predictive-text/build.sh
@@ -5,10 +5,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 # ################################ Main script ################################
 
diff --git a/web/src/engine/predictive-text/templates/build.sh b/web/src/engine/predictive-text/templates/build.sh
index 2dda929d27..7a3b98148c 100755
--- a/web/src/engine/predictive-text/templates/build.sh
+++ b/web/src/engine/predictive-text/templates/build.sh
@@ -5,14 +5,18 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../../../resources/build/builder.inc.sh"
+. "$(dirname "$THIS_SCRIPT")/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/web/common.inc.sh"
 
 ################################ Main script ################################
 
+SUBPROJECT_NAME=engine/predictive-text/templates
+
 builder_describe "Builds the predictive-text model template implementation module" \
   "@/common/web/keyman-version" \
   "@/web/src/tools/es-bundling" \
@@ -36,16 +40,7 @@ function do_build() {
   tsc --emitDeclarationOnly --outFile ./build/lib/index.d.ts
 }
 
-function do_test() {
-  local FLAGS=
-  if builder_is_ci_build; then
-    FLAGS="-reporter mocha-teamcity-reporter"
-  fi
-
-  c8 mocha $FLAGS --require tests/helpers.js --recursive tests
-}
-
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action clean      rm -rf build/
 builder_run_action build      do_build
-builder_run_action test       do_test
\ No newline at end of file
+builder_run_action test       test-headless-typescript $SUBPROJECT_NAME
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/templates/src/trie-model.ts b/web/src/engine/predictive-text/templates/src/trie-model.ts
index e33c47ce2b..d22dc91e58 100644
--- a/web/src/engine/predictive-text/templates/src/trie-model.ts
+++ b/web/src/engine/predictive-text/templates/src/trie-model.ts
@@ -303,6 +303,16 @@ export default class TrieModel implements LexicalModel {
   }
 
   predict(transform: Transform, context: Context): Distribution<Suggestion> {
+    const makeDistribution = function(suggestions: WithOutcome<Suggestion>[]): Distribution<Suggestion> {
+      const distribution: Distribution<Suggestion> = [];
+
+      for (const s of suggestions) {
+        distribution.push({ sample: s, p: s.p });
+      }
+
+      return distribution;
+    }
+
     // Special-case the empty buffer/transform: return the top suggestions.
     if (!transform.insert && !context.left && !context.right && context.startOfBuffer && context.endOfBuffer) {
       return makeDistribution(this._trie.firstN(MAX_SUGGESTIONS).map(({text, p}) => ({
@@ -316,14 +326,14 @@ export default class TrieModel implements LexicalModel {
     }
 
     // Compute the results of the keystroke:
-    let newContext = applyTransform(transform, context);
+    const newContext = applyTransform(transform, context);
 
     // Computes the different in word length after applying the transform above.
-    let leftDelOffset = transform.deleteLeft - KMWString.length(transform.insert);
+    const leftDelOffset = transform.deleteLeft - KMWString.length(transform.insert);
 
     // All text to the left of the cursor INCLUDING anything that has
     // just been typed.
-    let prefix = getLastPreCaretToken(this.breakWords, newContext);
+    const prefix = getLastPreCaretToken(this.breakWords, newContext);
 
     // Return suggestions from the trie.
     return makeDistribution(this._trie.lookup(prefix).map(({text, p}) =>
@@ -336,18 +346,6 @@ export default class TrieModel implements LexicalModel {
       },
       p
     )));
-
-    /* Helper */
-
-    function makeDistribution(suggestions: WithOutcome<Suggestion>[]): Distribution<Suggestion> {
-      let distribution: Distribution<Suggestion> = [];
-
-      for(let s of suggestions) {
-        distribution.push({sample: s, p: s.p});
-      }
-
-      return distribution;
-    }
   }
 
   get wordbreaker(): WordBreakingFunction {
diff --git a/web/src/engine/predictive-text/wordbreakers/build.sh b/web/src/engine/predictive-text/wordbreakers/build.sh
index 9e449030d8..dcedb94e79 100755
--- a/web/src/engine/predictive-text/wordbreakers/build.sh
+++ b/web/src/engine/predictive-text/wordbreakers/build.sh
@@ -5,14 +5,18 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "$(dirname "$THIS_SCRIPT")/../../../../../resources/build/builder.inc.sh"
+. "$(dirname "$THIS_SCRIPT")/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/web/common.inc.sh"
 
 ################################ Main script ################################
 
+SUBPROJECT_NAME=engine/predictive-text/wordbreakers
+
 # Note:  the raw text files used for data.inc.ts are found within
 # /resources/standards-data/unicode-character-database.
 builder_describe "Builds the predictive-text wordbreaker implementation module" \
@@ -28,7 +32,7 @@ builder_describe_outputs \
 builder_parse "$@"
 
 function do_configure() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
 
   # This is a script used to build the data.inc.ts file needed by the
   # default wordbreaker.  We rarely update the backing data, but it
@@ -57,4 +61,4 @@ function do_test() {
 builder_run_action configure  do_configure
 builder_run_action clean      rm -rf build/
 builder_run_action build      do_build
-builder_run_action test       do_test
\ No newline at end of file
+builder_run_action test       test-headless-typescript $SUBPROJECT_NAME
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/wordbreakers/src/main/default/index.ts b/web/src/engine/predictive-text/wordbreakers/src/main/default/index.ts
index 580fe39a30..26b5dde564 100644
--- a/web/src/engine/predictive-text/wordbreakers/src/main/default/index.ts
+++ b/web/src/engine/predictive-text/wordbreakers/src/main/default/index.ts
@@ -303,6 +303,22 @@ function isNonSpace(chunk: string, options?: DefaultWordBreakerOptions): boolean
  * @param text Text to find word boundaries in.
  */
 function findBoundaries(text: string, options?: DefaultWordBreakerOptions): number[] {
+  /**
+   * Returns the position of the start of the next scalar value. This jumps
+   * over surrogate pairs.
+   *
+   * If asked for the character AFTER the end of the string, this always
+   * returns the length of the string.
+   */
+  const positionAfter = function(pos: number): number {
+    if (pos >= text.length) {
+      return text.length;
+    } else if (isStartOfSurrogatePair(text[pos])) {
+      return pos + 2;
+    }
+    return pos + 1;
+  }
+
   // WB1 and WB2: no boundaries if given an empty string.
   if (text.length === 0) {
     // There are no boundaries in an empty string!
@@ -331,7 +347,7 @@ function findBoundaries(text: string, options?: DefaultWordBreakerOptions): numb
   //    left, and some look at what's to the right of right. So
   //    keep track of this!
 
-  let boundaries = [];
+  const boundaries = [];
 
   let rightPos: number;
   let lookaheadPos = 0; // lookahead, one scalar value to the right of right.
@@ -536,24 +552,6 @@ function findBoundaries(text: string, options?: DefaultWordBreakerOptions): numb
   } while (rightPos < text.length);
 
   return boundaries;
-
-  ///// Internal utility functions /////
-
-  /**
-   * Returns the position of the start of the next scalar value. This jumps
-   * over surrogate pairs.
-   *
-   * If asked for the character AFTER the end of the string, this always
-   * returns the length of the string.
-   */
-  function positionAfter(pos: number): number {
-    if (pos >= text.length) {
-      return text.length;
-    } else if (isStartOfSurrogatePair(text[pos])) {
-      return pos + 2;
-    }
-    return pos + 1;
-  }
 }
 
 function isStartOfSurrogatePair(character: string) {
diff --git a/web/src/engine/predictive-text/wordbreakers/src/main/index.ts b/web/src/engine/predictive-text/wordbreakers/src/main/index.ts
index 92976d91fd..5248908119 100644
--- a/web/src/engine/predictive-text/wordbreakers/src/main/index.ts
+++ b/web/src/engine/predictive-text/wordbreakers/src/main/index.ts
@@ -3,4 +3,5 @@ import ascii from "./ascii.js";
 import default_ from "./default/index.js";
 import { WordBreakProperty } from "./default/data.inc.js";
 
-export { placeholder, ascii, default_ as default, default_ as defaultWordbreaker, WordBreakProperty };
\ No newline at end of file
+export { placeholder, ascii, default_ as default, default_ as defaultWordbreaker, WordBreakProperty };
+export { type BreakerContext } from "./default/index.js";
diff --git a/web/src/engine/predictive-text/wordbreakers/src/main/test-index.ts b/web/src/engine/predictive-text/wordbreakers/src/main/test-index.ts
index 6ea7b04532..b2034cf326 100644
--- a/web/src/engine/predictive-text/wordbreakers/src/main/test-index.ts
+++ b/web/src/engine/predictive-text/wordbreakers/src/main/test-index.ts
@@ -2,4 +2,5 @@
 export * from './index.js';
 
 // Exposes some internal properties for unit-test accessibility
-export { WordBreakProperty } from './default/data.inc.js';
+export { propertyMap, WordBreakProperty } from './default/data.inc.js';
+export { searchForProperty } from './default/searchForProperty.js';
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-main/build.sh b/web/src/engine/predictive-text/worker-main/build.sh
index 6642e18b86..d6ddebc697 100755
--- a/web/src/engine/predictive-text/worker-main/build.sh
+++ b/web/src/engine/predictive-text/worker-main/build.sh
@@ -8,10 +8,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 
 BUNDLE_CMD="node $KEYMAN_ROOT/web/src/tools/es-bundling/build/common-bundle.mjs"
@@ -35,7 +36,7 @@ builder_describe_outputs \
 builder_parse "$@"
 
 function do_configure() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
 
   # Configure Web browser-engine testing environments.  As is, this should only
   # make changes when we update the dependency, even on our CI build agents.
diff --git a/web/src/engine/predictive-text/worker-main/unit_tests/test.sh b/web/src/engine/predictive-text/worker-main/unit_tests/test.sh
index 4732ac6167..292f5d2442 100755
--- a/web/src/engine/predictive-text/worker-main/unit_tests/test.sh
+++ b/web/src/engine/predictive-text/worker-main/unit_tests/test.sh
@@ -3,11 +3,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 # This script runs from its own folder
 cd "$THIS_SCRIPT_PATH"
@@ -29,7 +30,7 @@ builder_describe "Runs all tests for the language-modeling / predictive-text lay
 builder_parse "$@"
 
 if builder_start_action configure; then
-  verify_npm_setup
+  node_select_version_and_npm_ci
   builder_finish_action success configure
 fi
 
diff --git a/web/src/engine/predictive-text/worker-thread/build.sh b/web/src/engine/predictive-text/worker-thread/build.sh
index d72d5f2d22..5bb1a51f85 100755
--- a/web/src/engine/predictive-text/worker-thread/build.sh
+++ b/web/src/engine/predictive-text/worker-thread/build.sh
@@ -6,11 +6,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
+. "$KEYMAN_ROOT/web/common.inc.sh"
 
 WORKER_OUTPUT=build/obj
 WORKER_OUTPUT_FILENAME=build/lib/worker-main.js
@@ -24,6 +26,8 @@ SRCMAP_CLEANER="node $KEYMAN_ROOT/web/build/tools/building/sourcemap-root/index.
 
 ################################ Main script ################################
 
+SUBPROJECT_NAME=engine/predictive-text/worker-thread
+
 builder_describe \
   "Compiles the Language Modeling Layer for common use in predictive text and autocorrective applications." \
   "@/common/web/keyman-version" \
@@ -41,7 +45,7 @@ builder_describe_outputs \
 builder_parse "$@"
 
 function do_configure() {
-  verify_npm_setup
+  node_select_version_and_npm_ci
 
   # Configure Web browser-engine testing environments.  As is, this should only
   # make changes when we update the dependency, even on our CI build agents.
@@ -91,12 +95,10 @@ function do_build() {
 }
 
 function do_test() {
-  local MOCHA_FLAGS=
   local WTR_CONFIG=
   local WTR_INSPECT=
 
   if builder_is_ci_build; then
-    MOCHA_FLAGS="$MOCHA_FLAGS --reporter mocha-teamcity-reporter"
     WTR_CONFIG=.CI
   fi
 
@@ -104,7 +106,7 @@ function do_test() {
     WTR_INSPECT=" --manual"
   fi
 
-  c8 mocha --recursive $MOCHA_FLAGS ./src/tests/mocha/cases/
+  test-headless-typescript $SUBPROJECT_NAME
 
   web-test-runner --config ./src/tests/test-runner/web-test-runner${WTR_CONFIG}.config.mjs ${WTR_INSPECT}
 }
diff --git a/web/src/engine/predictive-text/worker-thread/package.json b/web/src/engine/predictive-text/worker-thread/package.json
index c410cf4654..f210f51000 100644
--- a/web/src/engine/predictive-text/worker-thread/package.json
+++ b/web/src/engine/predictive-text/worker-thread/package.json
@@ -10,6 +10,9 @@
     "./worker-main.wrapped.min.js": {
       "types": "./build/lib/worker-main.wrapped.d.ts",
       "default": "./build/lib/worker-main.wrapped.min.js"
+    },
+    "./test-index": {
+      "default": "./build/obj/test-index.js"
     }
   },
   "imports": {
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/correction/alignment-helpers.ts b/web/src/engine/predictive-text/worker-thread/src/main/correction/alignment-helpers.ts
index 54679e200e..b2b2e73675 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/correction/alignment-helpers.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/correction/alignment-helpers.ts
@@ -1,3 +1,13 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ *
+ * Created by jahorton on 2025-07-30
+ *
+ * This file defines methods used as helpers when aligning cached context state
+ * information with incoming contexts and when validating partial substitution
+ * edits for aligned context tokens.
+ */
+
 import { ClassicalDistanceCalculation, EditOperation } from "./classical-calculation.js";
 
 /**
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/correction/context-state.ts b/web/src/engine/predictive-text/worker-thread/src/main/correction/context-state.ts
index 80e82712ae..70244011ea 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/correction/context-state.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/correction/context-state.ts
@@ -1,6 +1,16 @@
-import { ContextTokenization } from './context-tokenization.js';
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ *
+ * Created by jahorton on 2025-07-30
+ *
+ * Represents cached data about the state of the sliding context window either
+ * before or after a context transition event and related functionality.
+ */
 
 import { LexicalModelTypes } from '@keymanapp/common-types';
+
+import { ContextTokenization } from './context-tokenization.js';
+
 import Context = LexicalModelTypes.Context;
 import Distribution = LexicalModelTypes.Distribution;
 import LexicalModel = LexicalModelTypes.LexicalModel;
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/correction/context-token.ts b/web/src/engine/predictive-text/worker-thread/src/main/correction/context-token.ts
index 22fd3efed7..2168d31300 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/correction/context-token.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/correction/context-token.ts
@@ -1,8 +1,17 @@
-import { buildMergedTransform } from "@keymanapp/models-templates";
-import { SearchSpace } from "./distance-modeler.js";
-import { KMWString } from "@keymanapp/web-utils";
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ *
+ * Created by jahorton on 2025-07-30
+ *
+ * Represents cached data about one token (either a word or a unit of whitespace)
+ * in the context and associated correction-search progress and results.
+ */
 
+import { buildMergedTransform } from "@keymanapp/models-templates";
 import { LexicalModelTypes } from '@keymanapp/common-types';
+
+import { SearchSpace } from "./distance-modeler.js";
+
 import Distribution = LexicalModelTypes.Distribution;
 import LexicalModel = LexicalModelTypes.LexicalModel;
 import Suggestion = LexicalModelTypes.Suggestion;
@@ -19,25 +28,10 @@ import Transform = LexicalModelTypes.Transform;
  * @param transformId
  * @returns
  */
-function textToCharTransforms(text: string, transformId?: number) {
-  let perCharTransforms: Transform[] = [];
-
-  for(let i=0; i < KMWString.length(text); i++) {
-    let char = KMWString.charAt(text, i); // is SMP-aware
-
-    let transform: Transform = {
-      insert: char,
-      deleteLeft: 0
-    };
-
-    if(transformId) {
-      transform.id = transformId
-    }
-
-    perCharTransforms.push(transform);
-  }
-
-  return perCharTransforms;
+function textToCharTransforms(text: string, transformId?: number): Transform[] {
+  return transformId ?
+    [...text].map(insert => ({insert, deleteLeft: 0, id: transformId})) :
+    [...text].map(insert => ({insert, deleteLeft: 0}));
 }
 
 /**
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tokenization.ts b/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tokenization.ts
index 503b2e3413..03e2bb0d8b 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tokenization.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/correction/context-tokenization.ts
@@ -1,3 +1,12 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ *
+ * Created by jahorton on 2025-07-30
+ *
+ * Represents cached data about one potential tokenization of contents of
+ * the sliding context window for one specific instance of context state.
+ */
+
 import { ContextToken } from './context-token.js';
 import { ClassicalDistanceCalculation } from './classical-calculation.js';
 import { getEditPathLastMatch, isSubstitutionAlignable } from './alignment-helpers.js';
@@ -76,16 +85,10 @@ export class ContextTokenization {
    * tokens represented by this tokenization instance.
    */
   get exampleInput(): string[] {
-    const sequence: string[] = [];
-
-    for(const token of this.tokens) {
-      // Hide any tokens representing wordbreaks.  (Thinking ahead to phrase-level possibilities)
-      if(token.exampleInput !== null) {
-        sequence.push(token.exampleInput);
-      }
-    }
-
-    return sequence;
+    return this.tokens
+      // Hide any tokens representing invisible wordbreaks.  (Thinking ahead to phrase-level possibilities)
+      .filter(token => token.exampleInput !== null)
+      .map(token => token.exampleInput);
   }
 
   /**
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/correction/distance-modeler.ts b/web/src/engine/predictive-text/worker-thread/src/main/correction/distance-modeler.ts
index f61b804b4a..956a369bc3 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/correction/distance-modeler.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/correction/distance-modeler.ts
@@ -366,7 +366,7 @@ export class SearchSpace {
 
   private tierOrdering: SearchSpaceTier[] = [];
   private selectionQueue: PriorityQueue<SearchSpaceTier>;
-  inputSequence: Distribution<Transform>[] = [];
+  private _inputSequence: Distribution<Transform>[] = [];
   private minInputCost: number[] = [];
   private rootNode: SearchNode;
 
@@ -397,7 +397,7 @@ export class SearchSpace {
     this.buildQueueSpaceComparator();
 
     if(arg1 instanceof SearchSpace) {
-      this.inputSequence = [].concat(arg1.inputSequence);
+      this._inputSequence = [].concat(arg1._inputSequence);
       this.minInputCost = [].concat(arg1.minInputCost);
       this.rootNode = arg1.rootNode;
       this.completedPaths = [].concat(arg1.completedPaths);
@@ -475,6 +475,13 @@ export class SearchSpace {
     }
   }
 
+  /**
+   * Retrieves the sequence of inputs
+   */
+  public get inputSequence() {
+    return [...this._inputSequence];
+  }
+
   increaseMaxEditDistance() {
     this.tierOrdering.forEach(function(tier) { tier.increaseMaxEditDistance() });
   }
@@ -482,11 +489,11 @@ export class SearchSpace {
   get correctionsEnabled() {
     // When corrections are disabled, the Web engine will only provide individual Transforms
     // for an input, not a distribution.  No distributions means we shouldn't do corrections.
-    return !!this.inputSequence.find((distribution) => distribution.length > 1);
+    return !!this._inputSequence.find((distribution) => distribution.length > 1);
   }
 
   addInput(inputDistribution: Distribution<Transform>) {
-    this.inputSequence.push(inputDistribution);
+    this._inputSequence.push(inputDistribution);
 
     // Assumes that `inputDistribution` is already sorted.
     this.minInputCost.push(-Math.log(inputDistribution[0].p));
@@ -607,9 +614,9 @@ export class SearchSpace {
 
       let deletionEdges: SearchNode[] = [];
       if(!substitutionsOnly) {
-        deletionEdges       = currentNode.buildDeletionEdges(this.inputSequence[inputIndex-1]);
+        deletionEdges       = currentNode.buildDeletionEdges(this._inputSequence[inputIndex-1]);
       }
-      let substitutionEdges = currentNode.buildSubstitutionEdges(this.inputSequence[inputIndex-1]);
+      let substitutionEdges = currentNode.buildSubstitutionEdges(this._inputSequence[inputIndex-1]);
 
       // Note:  we're live-modifying the tier's cost here!  The priority queue loses its guarantees as a result.
       nextTier.correctionQueue.enqueueAll(deletionEdges.concat(substitutionEdges));
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/index.ts b/web/src/engine/predictive-text/worker-thread/src/main/index.ts
index 30a2d8cea3..421d22ab44 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/index.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/index.ts
@@ -100,8 +100,8 @@ export default class LMLayerWorker {
   private _currentModelSource: ModelSourceSpec;
 
   constructor(options: {
-    importScripts: typeof importScripts,
-    postMessage: typeof postMessage
+    importScripts: (...urls: string[]) => void,
+    postMessage: (message: any, extra?: any) => void
   } = {
     importScripts: null,
     postMessage: null
@@ -114,6 +114,11 @@ export default class LMLayerWorker {
     this.setupConfigState();
   }
 
+  /** @internal */
+  public readonly unitTestEndPoints = {
+    getStateName: () => this.state.name
+  }
+
   public error(message: string, error?: any) {
     // error isn't a fan of being cloned across the worker boundary.
     this.cast('error', {
@@ -403,7 +408,7 @@ export default class LMLayerWorker {
    *
    * @param scope A global scope to install upon.
    */
-  static install(scope: DedicatedWorkerGlobalScope): LMLayerWorker {
+  static install(scope: any /*DedicatedWorkerGlobalScope*/): LMLayerWorker {
     let worker = new LMLayerWorker({ postMessage: scope.postMessage, importScripts: scope.importScripts.bind(scope) });
     scope.onmessage = worker.onMessage.bind(worker);
     worker.self = scope;
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts b/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts
index cf30c16a46..5a4919a298 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/model-compositor.ts
@@ -1,24 +1,34 @@
 import * as models from '@keymanapp/models-templates';
-import * as correction from './correction/index.js'
-
 import { KMWString } from '@keymanapp/web-utils';
-
-import TransformUtils from './transformUtils.js';
-import { correctAndEnumerate, dedupeSuggestions, finalizeSuggestions, predictionAutoSelect, processSimilarity, toAnnotatedSuggestion, tupleDisplayOrderSort } from './predict-helpers.js';
-import { detectCurrentCasing, determineModelTokenizer, determineModelWordbreaker, determinePunctuationFromModel } from './model-helpers.js';
 import { LexicalModelTypes } from '@keymanapp/common-types';
+
+import * as correction from './correction/index.js'
+import TransformUtils from './transformUtils.js';
+import { applySuggestionCasing, correctAndEnumerate, dedupeSuggestions, finalizeSuggestions, predictionAutoSelect, processSimilarity, toAnnotatedSuggestion, tupleDisplayOrderSort } from './predict-helpers.js';
+import { detectCurrentCasing, determineModelTokenizer, determineModelWordbreaker, determinePunctuationFromModel } from './model-helpers.js';
+
 import CasingForm = LexicalModelTypes.CasingForm;
 import Context = LexicalModelTypes.Context;
 import Distribution = LexicalModelTypes.Distribution;
+import Keep = LexicalModelTypes.Keep;
 import LexicalModel = LexicalModelTypes.LexicalModel;
 import LexicalModelPunctuation = LexicalModelTypes.LexicalModelPunctuation;
+import Outcome = LexicalModelTypes.Outcome;
 import Reversion = LexicalModelTypes.Reversion;
 import Suggestion = LexicalModelTypes.Suggestion;
 import Transform = LexicalModelTypes.Transform;
 
 export class ModelCompositor {
   private lexicalModel: LexicalModel;
-  private contextTracker?: correction.ContextTracker;
+  private _contextTracker?: correction.ContextTracker;
+
+  /**
+   * Returns the context-caching store used to store intermediate
+   * correction-search and context-tokenization calculations.
+   */
+  public get contextTracker() {
+    return this._contextTracker;
+  }
 
   static readonly MAX_SUGGESTIONS = 12;
   readonly punctuation: LexicalModelPunctuation;
@@ -60,13 +70,13 @@ export class ModelCompositor {
   ) {
     this.lexicalModel = lexicalModel;
     if(lexicalModel.traverseFromRoot) {
-      this.contextTracker = new correction.ContextTracker();
+      this._contextTracker = new correction.ContextTracker();
     }
     this.punctuation = determinePunctuationFromModel(lexicalModel);
     this.testMode = !!testMode;
   }
 
-  async predict(transformDistribution: Transform | Distribution<Transform>, context: Context): Promise<Suggestion[]> {
+  async predict(transformDistribution: Transform | Distribution<Transform>, context: Context): Promise<Outcome<Suggestion|Keep>[]> {
     const lexicalModel = this.lexicalModel;
 
     // If a prior prediction is still processing, signal to terminate it; we have a new
@@ -142,7 +152,7 @@ export class ModelCompositor {
     // lexicon for a word.  (Example:  "Apple" the company vs "apple" the fruit.)
     for(let tuple of rawPredictions) {
       if(currentCasing && currentCasing != 'lower') {
-        this.applySuggestionCasing(tuple.prediction.sample, basePrefix, currentCasing);
+        applySuggestionCasing(tuple.prediction.sample, basePrefix, this.lexicalModel, currentCasing);
       }
     }
 
@@ -187,21 +197,6 @@ export class ModelCompositor {
     return suggestions;
   }
 
-  // Responsible for applying casing rules to suggestions.
-  private applySuggestionCasing(suggestion: Suggestion, baseWord: string, casingForm: CasingForm) {
-    // Step 1:  does the suggestion replace the whole word?  If not, we should extend the suggestion to do so.
-    let unchangedLength  = KMWString.length(baseWord) - suggestion.transform.deleteLeft;
-
-    if(unchangedLength > 0) {
-      suggestion.transform.deleteLeft += unchangedLength;
-      suggestion.transform.insert = KMWString.substr(baseWord, 0, unchangedLength) + suggestion.transform.insert;
-    }
-
-    // Step 2: Now that the transform affects the whole word, we may safely apply casing rules.
-    suggestion.transform.insert = this.lexicalModel.applyCasing(casingForm, suggestion.transform.insert);
-    suggestion.displayAs = this.lexicalModel.applyCasing(casingForm, suggestion.displayAs);
-  }
-
   acceptSuggestion(suggestion: Suggestion, context: Context, postTransform?: Transform): Reversion {
     // Step 1:  generate and save the reversion's Transform.
     let sourceTransform = models.buildMergedTransform(suggestion.transform, suggestion.appendedTransform ?? { insert: '', deleteLeft: 0});
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/models/index.ts b/web/src/engine/predictive-text/worker-thread/src/main/models/index.ts
index 14f77edc49..4a6f20da15 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/models/index.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/models/index.ts
@@ -1,2 +1,2 @@
 export * from '@keymanapp/models-templates';
-export { default as DummyModel } from './dummy-model.js';
+export { default as DummyModel, DummyOptions } from './dummy-model.js';
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts b/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts
index 12c2547f4f..642a43838d 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/predict-helpers.ts
@@ -1,5 +1,7 @@
 import * as models from '@keymanapp/models-templates';
 import { KMWString } from '@keymanapp/web-utils';
+import { LexicalModelTypes } from '@keymanapp/common-types';
+import { defaultWordbreaker, WordBreakProperty } from '@keymanapp/models-wordbreakers';
 
 import TransformUtils from './transformUtils.js';
 import { determineModelTokenizer, determineModelWordbreaker, determinePunctuationFromModel } from './model-helpers.js';
@@ -7,10 +9,10 @@ import { ContextTracker } from './correction/context-tracker.js';
 import { ContextState } from './correction/context-state.js';
 import { ExecutionTimer } from './correction/execution-timer.js';
 import ModelCompositor from './model-compositor.js';
-import { LexicalModelTypes } from '@keymanapp/common-types';
-import { defaultWordbreaker, WordBreakProperty } from '@keymanapp/models-wordbreakers';
+
 const searchForProperty = defaultWordbreaker.searchForProperty;
 
+import CasingForm = LexicalModelTypes.CasingForm;
 import Context = LexicalModelTypes.Context;
 import Distribution = LexicalModelTypes.Distribution;
 import Keep = LexicalModelTypes.Keep;
@@ -29,6 +31,12 @@ import Transform = LexicalModelTypes.Transform;
 
 export const AUTOSELECT_PROPORTION_THRESHOLD = .66;
 
+/**
+ * Standard probability rules - the maximum probability something can
+ * have is 100%, or a simple '1'.
+ */
+const MAX_PROB = 1;
+
 /**
  * Defines thresholds used to determine when it is appropriate to stop searching
  * for more prediction-roots.
@@ -62,24 +70,77 @@ export const CORRECTION_SEARCH_THRESHOLDS = {
   REPLACEMENT_SEARCH_THRESHOLD: 4 as const // e^-4 = 0.0183156388.  Allows "80%" of an extra edit.
 }
 
+/**
+ * Collates information related to suggestions during the suggestion generation
+ * process.
+ */
 export type CorrectionPredictionTuple = {
-  prediction: ProbabilityMass<Suggestion>,
+  /**
+   * The potential Suggestion (or Keep)
+   */
+  prediction: ProbabilityMass<Suggestion | Keep>,
+  /**
+   * The correction upon which the Suggestion (or Keep) is based
+   */
   correction: ProbabilityMass<string>,
+  /**
+   * The likelihood of the prediction - its lexical-model likelihood multiplied
+   * by the keystroke-sequence + correction likelihood.
+   */
   totalProb: number;
-  matchLevel: SuggestionSimilarity;
+  /**
+   * How directly the prediction matches the current token in the context.
+   *
+   * This is determined later in the suggestion-analysis project and is not
+   * available upon initial construction of this type.
+   */
+  matchLevel?: SuggestionSimilarity;
+  /**
+   * Text from the triggering input that should _not_ be affected by the
+   * prediction.
+   */
   preservationTransform?: Transform;
 };
 
+/**
+ * An enum to be used when categorizing the level of similarity between
+ * generated Suggestions and the actual text upon which a Suggestion is
+ * based.
+ *
+ * Note that Suggestions require .exact matching to stand-in as the Keep
+ * option.
+ */
 export enum SuggestionSimilarity {
+  /**
+   * The keyed form for the current token / word does not match
+   * the keyed form of the suggestion.
+   */
   none = 0,
+
+  /**
+   * The keyed form for the current token / word matches the
+   * the keyed form of the suggestion, but they do not match
+   * in a case-insensitive manner.
+   */
   sameKey = 1,
+
+  /**
+   * The current token / word has a case-insensitive match with
+   * the suggestion, but not a case-sensitive match.  Both share
+   * the same keyed form.
+   */
   sameText = 2,
+
+  /**
+   * The current token / word has a case-sensitive match with
+   * the suggestion in addition to sharing the same keyed form.
+   */
   exact = 3
 }
 
 export function tupleDisplayOrderSort(a: CorrectionPredictionTuple, b: CorrectionPredictionTuple) {
   // Similarity distance
-  const simDist = b.matchLevel - a.matchLevel;
+  const simDist = (b.matchLevel ?? 0) - (a.matchLevel ?? 0);
   if(simDist != 0) {
     return simDist;
   }
@@ -456,6 +517,28 @@ export function predictFromCorrections(
   return returnedPredictions;
 }
 
+/**
+ * Applies the specified casing-form to generated suggestions, leveraging the model's
+ * defined casing behaviors to do so.
+ * @param suggestion
+ * @param baseWord
+ * @param lexicalModel
+ * @param casingForm
+ */
+export function applySuggestionCasing(suggestion: Suggestion, baseWord: string, lexicalModel: LexicalModel, casingForm: CasingForm) {
+  // Step 1:  does the suggestion replace the whole word?  If not, we should extend the suggestion to do so.
+  let unchangedLength  = KMWString.length(baseWord) - suggestion.transform.deleteLeft;
+
+  if(unchangedLength > 0) {
+    suggestion.transform.deleteLeft += unchangedLength;
+    suggestion.transform.insert = KMWString.substr(baseWord, 0, unchangedLength) + suggestion.transform.insert;
+  }
+
+  // Step 2: Now that the transform affects the whole word, we may safely apply casing rules.
+  suggestion.transform.insert = lexicalModel.applyCasing(casingForm, suggestion.transform.insert);
+  suggestion.displayAs = lexicalModel.applyCasing(casingForm, suggestion.displayAs);
+}
+
 /**
  * Given an array of suggestions output from the correction and model-lookup processes,
  * this function checks for any duplicate suggestions and merges them.
@@ -594,8 +677,7 @@ export function processSimilarity(
     deleteLeft: basePrefixLength
   };
 
-  // 1 is a filler value; goes unused b/c is for a 'keep'.
-  let keepSuggestion = models.transformToSuggestion(keepTransform, 1);
+  let keepSuggestion = models.transformToSuggestion(keepTransform);
   // This is the one case where the transform doesn't insert the full word; we need to override the displayAs param.
   keepSuggestion.displayAs = truePrefix;
 
@@ -607,14 +689,17 @@ export function processSimilarity(
 
   // Insert our synthetic keepOption as a prediction.
   suggestionDistribution.unshift({
-    totalProb: keepOption.p,
+    // Product of the two p's below.
+    totalProb: inputTransformProb * MAX_PROB,
     prediction: {
       sample: keepOption,
-      p: keepOption.p,
+      // We always show the keep option if it doesn't directly match,
+      // so max probability is fine.
+      p: MAX_PROB,
     },
     correction: {
       sample: truePrefix,
-      p: inputTransformProb
+      p: inputTransformProb * MAX_PROB
     },
     matchLevel: SuggestionSimilarity.exact
   });
@@ -747,7 +832,7 @@ export function finalizeSuggestions(
   context: Context,
   inputTransform: Transform,
   verbose?: boolean
-) {
+): Outcome<Suggestion | Keep>[] {
   const punctuation = determinePunctuationFromModel(lexicalModel);
   const tokenize = determineModelTokenizer(lexicalModel);
 
@@ -776,11 +861,7 @@ export function finalizeSuggestions(
         p: tuple.totalProb
       };
     } else {
-      const sample: Suggestion & {
-        p?: number,
-        "lexical-p"?: number,
-        "correction-p"?: number
-      } = {
+      const sample: Outcome<Suggestion | Keep> = {
         ...prediction.sample,
         p: tuple.totalProb,
         "lexical-p": prediction.p,
@@ -833,28 +914,28 @@ export function finalizeSuggestions(
 
 export function toAnnotatedSuggestion(
   lexicalModel: LexicalModel,
-  suggestion: Outcome<Suggestion>,
+  suggestion: Suggestion,
   annotationType: SuggestionTag,
   quoteBehavior?: models.QuoteBehavior
-): Outcome<Suggestion>;
+): Suggestion;
 export function toAnnotatedSuggestion(
   lexicalModel: LexicalModel,
-  suggestion: Outcome<Suggestion>,
+  suggestion: Suggestion,
   annotationType: 'keep',
   quoteBehavior?: models.QuoteBehavior
-): Outcome<Keep>;
+): Keep;
 export function toAnnotatedSuggestion(
   lexicalModel: LexicalModel,
-  suggestion: Outcome<Suggestion>,
+  suggestion: Suggestion,
   annotationType: 'revert',
   quoteBehavior?: models.QuoteBehavior
-): Outcome<Reversion>;
+): Reversion;
 export function toAnnotatedSuggestion(
   lexicalModel: LexicalModel,
-  suggestion: Outcome<Suggestion>,
+  suggestion: Suggestion,
   annotationType: SuggestionTag,
   quoteBehavior: models.QuoteBehavior = models.QuoteBehavior.default
-): Outcome<Suggestion> {
+): Suggestion | Keep | Reversion {
   // A method-internal 'import' of the enum.
   let QuoteBehavior = models.QuoteBehavior;
   const punctuation = determinePunctuationFromModel(lexicalModel);
@@ -864,11 +945,10 @@ export function toAnnotatedSuggestion(
     defaultQuoteBehavior = QuoteBehavior.useQuotes;
   }
 
-  const result: Outcome<Suggestion> = {
+  const result: Suggestion = {
     transform: suggestion.transform,
     displayAs: QuoteBehavior.apply(quoteBehavior, suggestion.displayAs, punctuation, defaultQuoteBehavior),
     tag: annotationType,
-    p: suggestion.p
   };
 
   if(suggestion.appendedTransform) {
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/test-index.ts b/web/src/engine/predictive-text/worker-thread/src/main/test-index.ts
new file mode 100644
index 0000000000..9448191650
--- /dev/null
+++ b/web/src/engine/predictive-text/worker-thread/src/main/test-index.ts
@@ -0,0 +1,15 @@
+export { ClassicalDistanceCalculation } from './correction/classical-calculation.js';
+export { ContextState } from './correction/context-state.js';
+export { ContextToken } from './correction/context-token.js';
+export { ContextTokenization } from './correction/context-tokenization.js';
+export { ContextTracker } from './correction/context-tracker.js';
+export { EditOperation } from './correction/classical-calculation.js';
+export * from './correction/alignment-helpers.js';
+export * as correction from './correction/index.js';
+export * from './model-helpers.js';
+export * as models from './models/index.js';
+export { ModelCompositor } from './model-compositor.js';
+export { tokenizeTransform, tokenizeTransformDistribution } from './correction/transform-tokenization.js';
+export * from './predict-helpers.js';
+export { default as TransformUtils } from './transformUtils.js'
+export { default as LMLayerWorker } from './index.js'
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-thread/src/main/worker-interfaces.ts b/web/src/engine/predictive-text/worker-thread/src/main/worker-interfaces.ts
index f627345cb9..9a0865094f 100644
--- a/web/src/engine/predictive-text/worker-thread/src/main/worker-interfaces.ts
+++ b/web/src/engine/predictive-text/worker-thread/src/main/worker-interfaces.ts
@@ -42,8 +42,8 @@ import { Token } from '@keymanapp/models-templates';
 /**
  * The signature of self.postMessage(), so that unit tests can mock it.
  */
-export type PostMessage = typeof DedicatedWorkerGlobalScope.prototype.postMessage;
-export type ImportScripts = typeof DedicatedWorkerGlobalScope.prototype.importScripts;
+export type PostMessage = (message: any, extra?: any) => void;
+export type ImportScripts = (...urls: string[]) => void;
 
 
 /**
diff --git a/web/src/engine/sentry-manager/build.sh b/web/src/engine/sentry-manager/build.sh
index e91b78ce7e..1054e152bc 100755
--- a/web/src/engine/sentry-manager/build.sh
+++ b/web/src/engine/sentry-manager/build.sh
@@ -5,11 +5,12 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "${KEYMAN_ROOT}/web/common.inc.sh"
-. "${KEYMAN_ROOT}/resources/shellHelperFunctions.sh"
+. "${KEYMAN_ROOT}/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 builder_describe "Builds the Sentry-reporting module used with Keyman Engine for Web" \
   "@/common/web/keyman-version" \
@@ -31,7 +32,7 @@ fi
 ### CONFIGURE ACTIONS
 
 if builder_start_action configure; then
-  verify_npm_setup
+  node_select_version_and_npm_ci
   builder_finish_action success configure
 fi
 
diff --git a/web/src/samples/build.sh b/web/src/samples/build.sh
index fe5817e6e5..66533e40ff 100755
--- a/web/src/samples/build.sh
+++ b/web/src/samples/build.sh
@@ -3,10 +3,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 # Imports common Web build-script definitions & functions
 . "$KEYMAN_ROOT/web/common.inc.sh"
diff --git a/web/src/engine/predictive-text/templates/tests/common.tests.js b/web/src/test/auto/headless/engine/predictive-text/templates/common.tests.ts
similarity index 100%
rename from web/src/engine/predictive-text/templates/tests/common.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/templates/common.tests.ts
diff --git a/web/src/engine/predictive-text/templates/tests/custom-breakers.def.js b/web/src/test/auto/headless/engine/predictive-text/templates/custom-breakers.def.ts
similarity index 96%
rename from web/src/engine/predictive-text/templates/tests/custom-breakers.def.js
rename to web/src/test/auto/headless/engine/predictive-text/templates/custom-breakers.def.ts
index c907467ce0..d80776ee5f 100644
--- a/web/src/engine/predictive-text/templates/tests/custom-breakers.def.js
+++ b/web/src/test/auto/headless/engine/predictive-text/templates/custom-breakers.def.ts
@@ -3,7 +3,7 @@
  * https://github.com/keymanapp/lexical-models/pull/265.
  * @type {WordBreakingFunction}
  * */
-export function customWordBreakerProper(str) {
+export function customWordBreakerProper(str: string) {
   const whitespaceRegex = /\s|\u200b|\n|\r/;
   const tokens = str.split(whitespaceRegex);
 
@@ -74,7 +74,7 @@ export function customWordBreakerProper(str) {
  * triggered #12200.
  * @type {WordBreakingFunction}
  * */
-export function customWordBreakerFormer (str) {
+export function customWordBreakerFormer (str: string) {
   const tokens = str.split(/\s|\u200b/);
 
   for(let i=0; i < tokens.length; i++) {
@@ -122,7 +122,8 @@ export function customWordBreakerFormer (str) {
       start: str.indexOf(token),
       right: str.indexOf(token) + token.length,
       end: str.indexOf(token) + token.length,
-      text: token
+      text: token,
+      length: token.length
     }
   });
 }
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/templates/tests/helpers.js b/web/src/test/auto/headless/engine/predictive-text/templates/helpers.ts
similarity index 67%
rename from web/src/engine/predictive-text/templates/tests/helpers.js
rename to web/src/test/auto/headless/engine/predictive-text/templates/helpers.ts
index 94ca5ed1b2..9ac77233d2 100644
--- a/web/src/engine/predictive-text/templates/tests/helpers.js
+++ b/web/src/test/auto/headless/engine/predictive-text/templates/helpers.ts
@@ -1,7 +1,8 @@
-import path from 'path';
-import { assert } from 'chai';
+import path from 'node:path';
+import { createRequire } from "node:module";
+import { fileURLToPath } from 'node:url';
 
-var _ = global;
+import { LexicalModelTypes } from '@keymanapp/common-types';
 
 // TODO: move this to its own package; e.g., @keymanapp/models-test-helpers
 // TODO: then mocha invocation is as follows:
@@ -12,20 +13,18 @@ import { KMWString } from '@keymanapp/web-utils';
 // The predictive-text engine always keeps these enabled.
 KMWString.enableSupplementaryPlane(true);
 
-import { createRequire } from "module";
-import { fileURLToPath } from 'url';
-
 /**
  * Load JSON fixtures from a well-known place.
  */
-_.jsonFixture = function (name) {
+export function jsonFixture(name: string): any {
   // The most straight-forward way... is to use CommonJS-style require to load JSON.
   // Fortunately, Node provides the tools needed to recreate it.
   const require = createRequire(import.meta.url);
 
   // ES-module mode also leaves out `__dirname`, so we rebuild that too.
-  const __filename = fileURLToPath(import.meta.url);
-  const __dirname = path.dirname(__filename);
+  const __dirname = fileURLToPath(import.meta.url + '../../../../../../../../src/test/auto/resources/');
+
+  // Lands in /web/build/test/headless/engine/predictive-text/templates.
   return require(path.join(__dirname, 'fixtures', `${name}.json`));
 }
 
@@ -35,7 +34,7 @@ _.jsonFixture = function (name) {
  *
  * @returns {Context}
  */
-_.emptyContext = function emptyContext() {
+export function emptyContext(): LexicalModelTypes.Context {
   return {
     left: '',
     startOfBuffer: true,
@@ -48,7 +47,7 @@ _.emptyContext = function emptyContext() {
  *
  * @returns {Transform}
  */
-_.zeroTransform = function zeroTransform() {
+export function zeroTransform(): LexicalModelTypes.Transform {
   return {
     insert: '',
     deleteLeft: 0,
diff --git a/web/src/engine/predictive-text/templates/tests/quote-behavior.tests.js b/web/src/test/auto/headless/engine/predictive-text/templates/quote-behavior.tests.ts
similarity index 100%
rename from web/src/engine/predictive-text/templates/tests/quote-behavior.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/templates/quote-behavior.tests.ts
diff --git a/web/src/engine/predictive-text/templates/tests/tokenization.tests.js b/web/src/test/auto/headless/engine/predictive-text/templates/tokenization.tests.ts
similarity index 97%
rename from web/src/engine/predictive-text/templates/tests/tokenization.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/templates/tokenization.tests.ts
index d8f27197a2..3bc636c412 100644
--- a/web/src/engine/predictive-text/templates/tests/tokenization.tests.js
+++ b/web/src/test/auto/headless/engine/predictive-text/templates/tokenization.tests.ts
@@ -3,11 +3,15 @@
  */
 
 import { assert } from 'chai';
+
 import * as models from "@keymanapp/models-templates";
 import * as wordBreakers from "@keymanapp/models-wordbreakers";
-import { customWordBreakerFormer, customWordBreakerProper } from './custom-breakers.def.js';
+import { LexicalModelTypes } from '@keymanapp/common-types';
 
-function asProcessedToken(text) {
+import { customWordBreakerFormer, customWordBreakerProper } from './custom-breakers.def.js';
+import { BreakerContext } from '@keymanapp/models-wordbreakers';
+
+function asProcessedToken(text: string) {
   // default wordbreaker emits these at the end of each context half if ending with whitespace.
   // Indicates a new spot for non-whitespace text.
   if(text == '') {
@@ -179,7 +183,7 @@ describe('Tokenization functions', function() {
 
       let tokenization = models.tokenize(wordBreakers.default, context);
 
-      let expectedResult = {
+      let expectedResult: models.Tokenization = {
         left: [],
         right: [],
         caretSplitsToken: false
@@ -192,7 +196,7 @@ describe('Tokenization functions', function() {
       // Wordbreaking on a empty space => no word.
       let tokenization = models.tokenize(wordBreakers.default, null);
 
-      let expectedResult = {
+      let expectedResult: models.Tokenization = {
         left: [],
         right: [],
         caretSplitsToken: false
@@ -210,7 +214,7 @@ describe('Tokenization functions', function() {
 
       let tokenization = models.tokenize(wordBreakers.default, context);
 
-      let expectedResult = {
+      let expectedResult: models.Tokenization = {
         left: [' ', ''].map(asProcessedToken),
         right: [],
         caretSplitsToken: false
@@ -231,7 +235,7 @@ describe('Tokenization functions', function() {
 
       // Technically, we're editing the start of the first token on the right
       // when in this context.
-      let expectedResult = {
+      let expectedResult: models.Tokenization = {
         left: ['I', ' ', 'can\''].map(asProcessedToken),
         right: [].map(asProcessedToken),
         caretSplitsToken: false
@@ -300,7 +304,7 @@ describe('Tokenization functions', function() {
 
     // For the next few tests:  a mocked wordbreaker for Khmer, a language
     // without whitespace between words.
-    let mockedKhmerBreaker = function(text) {
+    let mockedKhmerBreaker = function(text: string) {
       // Step 1:  Build constants for spans that a real wordbreaker would return.
       let srok = { // Khmer romanization of 'ស្រុក'
         text: 'ស្រុក',
@@ -331,7 +335,7 @@ describe('Tokenization functions', function() {
       }
 
       // Step 2: Allow shifting a defined 'constant' span without mutating the definition.
-      let shiftSpan = function(span, delta) {
+      let shiftSpan = function(span: LexicalModelTypes.Span, delta: number) {
         // Avoid mutating the parameter!
         let shiftedSpan = {
           text: span.text,
@@ -413,10 +417,10 @@ describe('Tokenization functions', function() {
       assert.deepEqual(tokenization, expectedResult);
     });
 
-    let midLetterNonbreaker = (text) => {
+    let midLetterNonbreaker = (text: string) => {
       let customization = {
         rules: [{
-          match: (context) => {
+          match: (context: BreakerContext) => {
             if(context.propertyMatch(null, ["ALetter"], ["MidLetter"], ["eot"])) {
               return true;
             } else {
@@ -425,7 +429,7 @@ describe('Tokenization functions', function() {
           },
           breakIfMatch: false
         }],
-        propertyMapping: (char) => {
+        propertyMapping: (char: string) => {
           let hyphens = ['\u002d', '\u2010', '\u058a', '\u30a0'];
           if(hyphens.includes(char)) {
               return "MidLetter";
diff --git a/web/src/engine/predictive-text/templates/tests/trie-model.tests.js b/web/src/test/auto/headless/engine/predictive-text/templates/trie-model.tests.ts
similarity index 95%
rename from web/src/engine/predictive-text/templates/tests/trie-model.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/templates/trie-model.tests.ts
index e63c66148b..25cb5adfae 100644
--- a/web/src/engine/predictive-text/templates/tests/trie-model.tests.js
+++ b/web/src/test/auto/headless/engine/predictive-text/templates/trie-model.tests.ts
@@ -3,8 +3,12 @@
  */
 
 import { assert } from 'chai';
+
 import { TrieModel } from '@keymanapp/models-templates';
 
+import { emptyContext, jsonFixture, zeroTransform } from './helpers.js';
+import { LexicalModelTypes } from '@keymanapp/common-types';
+
 describe('LMLayerWorker trie model for word lists', function() {
   describe('instantiation', function () {
     it('should expose the punctuation object', function () {
@@ -171,8 +175,8 @@ describe('LMLayerWorker trie model for word lists', function() {
 
       // the SAME results should be suggested (made the same query)
       assert.deepEqual(
-        otherResults.map(s => s.displayAs),
-        firstResults.map(s => s.displayAs)
+        otherResults.map(s => s.sample.displayAs),
+        firstResults.map(s => s.sample.displayAs)
       );
     });
   });
@@ -231,7 +235,7 @@ describe('LMLayerWorker trie model for word lists', function() {
       assert.strictEqual(newBuffer, 'the');
   });
 
-  function applyTransform(context, transform) {
+  function applyTransform(context: LexicalModelTypes.Context, transform: LexicalModelTypes.Transform) {
     assert.isTrue(context.endOfBuffer, "cannot only apply transform to end of buffer");
     var buffer = context.left;
     buffer = buffer.substr(0, buffer.length - transform.deleteLeft) + transform.insert;
@@ -242,7 +246,7 @@ describe('LMLayerWorker trie model for word lists', function() {
    * For use in predict().map(FUNC) to get the underlying suggestion.
    * @param {ProbabilityMass<T>} pm
    */
-  function getSample(pm) {
-    return pm.sample
+  function getSample<T>(pm: LexicalModelTypes.ProbabilityMass<T>) {
+    return pm.sample;
   }
 });
diff --git a/web/src/engine/predictive-text/templates/tests/trie-traversal.tests.js b/web/src/test/auto/headless/engine/predictive-text/templates/trie-traversal.tests.ts
similarity index 99%
rename from web/src/engine/predictive-text/templates/tests/trie-traversal.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/templates/trie-traversal.tests.ts
index 09237ee9a0..6c3239f884 100644
--- a/web/src/engine/predictive-text/templates/tests/trie-traversal.tests.js
+++ b/web/src/test/auto/headless/engine/predictive-text/templates/trie-traversal.tests.ts
@@ -4,9 +4,10 @@
 
 import { assert } from 'chai';
 import { TrieModel } from '@keymanapp/models-templates';
+import { jsonFixture } from './helpers.js';
 
 // Useful for tests related to strings with supplementary pairs.
-var smpForUnicode = function(code){
+var smpForUnicode = function(code: number){
   var H = Math.floor((code - 0x10000) / 0x400) + 0xD800;
   var L = (code - 0x10000) % 0x400 + 0xDC00;
 
@@ -337,9 +338,6 @@ describe('Trie traversal abstractions', function() {
     // Just to be sure our utility function is working right.
     assert.equal(smpA + smpP + 'pl' + smpE, "𝖺𝗉pl𝖾");
 
-    let pKeys = ['p', smpP];
-    let leafChildSequence = ['l', smpE];
-
     const aNode = rootTraversal.child(smpA);
     assert.isOk(aNode);
     assert.isNotOk(rootTraversal.child('a'));
diff --git a/web/src/engine/predictive-text/wordbreakers/tests/ascii-word-breaker.tests.js b/web/src/test/auto/headless/engine/predictive-text/wordbreakers/ascii-word-breaker.tests.ts
similarity index 100%
rename from web/src/engine/predictive-text/wordbreakers/tests/ascii-word-breaker.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/wordbreakers/ascii-word-breaker.tests.ts
diff --git a/web/src/engine/predictive-text/wordbreakers/tests/default-word-breaker.tests.js b/web/src/test/auto/headless/engine/predictive-text/wordbreakers/default-word-breaker.tests.ts
similarity index 96%
rename from web/src/engine/predictive-text/wordbreakers/tests/default-word-breaker.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/wordbreakers/default-word-breaker.tests.ts
index 17c03cc4b8..192385ba10 100644
--- a/web/src/engine/predictive-text/wordbreakers/tests/default-word-breaker.tests.js
+++ b/web/src/test/auto/headless/engine/predictive-text/wordbreakers/default-word-breaker.tests.ts
@@ -3,7 +3,7 @@
  */
 
 import { assert } from 'chai';
-import { default as breakWords } from '@keymanapp/models-wordbreakers';
+import { default as breakWords, type BreakerContext } from '@keymanapp/models-wordbreakers';
 
 const SHY = '\u00AD'; // Other, Format.  The "Soft HYphen" - usually invisible unless needed for word-wrapping.
 
@@ -203,7 +203,7 @@ describe('The default word breaker', function () {
     it('custom prop, rule:  do not break on letter-adjacent hyphens', function() {
       let customization = {
         rules: [{
-          match: (context) => {
+          match: (context: BreakerContext) => {
             if(context.propertyMatch(null, ["ALetter"], ["Hyphen"], ["ALetter"])) {
               return true;
             } else if(context.propertyMatch(["ALetter"], ["Hyphen"], ["ALetter"], null)) {
@@ -214,7 +214,7 @@ describe('The default word breaker', function () {
           },
           breakIfMatch: false
         }],
-        propertyMapping: (char) => {
+        propertyMapping: (char: string) => {
           const validHyphenCodes = [
             '\u002d', '\u2010', '\u058a', '\u30a0'
           ];
@@ -235,7 +235,7 @@ describe('The default word breaker', function () {
 
     it('mid-word hyphen via reassignment to MidLetter', function() {
       let customization = {
-        propertyMapping: (char) => {
+        propertyMapping: (char: string) => {
           const validHyphenCodes = [
             '\u002d', '\u2010', '\u058a', '\u30a0'
           ];
@@ -256,7 +256,7 @@ describe('The default word breaker', function () {
     // Useful for some regional minority languages that prefer word-breaking spaces.
     it('character reassignment:  Khmer letters as ALetter', function() {
       let customization = {
-        propertyMapping: (char) => {
+        propertyMapping: (char: string) => {
           if(char >= '\u1780' && char <= '\u17b3') {
             return "ALetter";
           } else {
@@ -279,7 +279,7 @@ describe('The default word breaker', function () {
         rules: [
           // WB5, but with differentiated consonants (ALetter) and vowels (AVowel)
           {
-            match: (context) => {
+            match: (context: BreakerContext) => {
               if(context.propertyMatch(null, ["ALetter", "AVowel"], ["ALetter", "AVowel"], null)) {
                 return true;
               } else {
@@ -290,7 +290,7 @@ describe('The default word breaker', function () {
           },
           // Proposed WB5a
           {
-            match: (context) => {
+            match: (context: BreakerContext) => {
               if(context.propertyMatch(null, ["Single_Quote"], ["AVowel"], null)) {
                 return true;
               } else {
@@ -301,7 +301,7 @@ describe('The default word breaker', function () {
           },
           // WB6, 7
           {
-            match: (context) => {
+            match: (context: BreakerContext) => {
               if(context.propertyMatch(null,
                                        ["ALetter", "AVowel"],
                                        ["MidLetter", "MidNumLet", "Single_Quote"],
@@ -321,7 +321,7 @@ describe('The default word breaker', function () {
           // Similar extensions to WB9, 10, 13a, and 13b would also be needed for robustness.
           // And I kind of left the Hebrew_Letter out of the WB5, 6, and 7 rewrites.
         ],
-        propertyMapping: (char) => {
+        propertyMapping: (char: string) => {
           const vowels = ['a', 'e', 'i', 'o', 'u'];
           if(vowels.includes(char)) {
             return "AVowel";
diff --git a/web/src/engine/predictive-text/wordbreakers/tests/placeholder-word-breaker.tests.js b/web/src/test/auto/headless/engine/predictive-text/wordbreakers/placeholder-word-breaker.tests.ts
similarity index 100%
rename from web/src/engine/predictive-text/wordbreakers/tests/placeholder-word-breaker.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/wordbreakers/placeholder-word-breaker.tests.ts
diff --git a/web/src/engine/predictive-text/wordbreakers/tests/search-property.tests.js b/web/src/test/auto/headless/engine/predictive-text/wordbreakers/search-property.tests.ts
similarity index 91%
rename from web/src/engine/predictive-text/wordbreakers/tests/search-property.tests.js
rename to web/src/test/auto/headless/engine/predictive-text/wordbreakers/search-property.tests.ts
index 9f33e4cc0c..e345154fa0 100644
--- a/web/src/engine/predictive-text/wordbreakers/tests/search-property.tests.js
+++ b/web/src/test/auto/headless/engine/predictive-text/wordbreakers/search-property.tests.ts
@@ -3,8 +3,7 @@
  */
 
 import { assert } from 'chai';
-import { searchForProperty } from '../build/main/obj/default/searchForProperty.js';
-import { propertyMap } from '../build/main/obj/default/data.inc.js';
+import { propertyMap, searchForProperty } from '@keymanapp/models-wordbreakers/test-index';
 
 describe('searchForProperty', () => {
   it('correctly finds character classes for standard ASCII characters', () => {
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/alignment-helpers.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/context/alignment-helpers.tests.ts
similarity index 82%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/alignment-helpers.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/context/alignment-helpers.tests.ts
index 8c3f313556..2c9d7d1992 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/alignment-helpers.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/context/alignment-helpers.tests.ts
@@ -1,21 +1,31 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ *
+ * Created by jahorton on 2025-07-30
+ *
+ * This file contains low-level tests designed to validate helper functions
+ * used when aligning cached context states to incoming contexts and when
+ * validating potential substitution edit operations.
+ */
+
 import { assert } from 'chai';
-import { getEditPathLastMatch, isSubstitutionAlignable } from '#./correction/alignment-helpers.js';
+import { EditOperation, getEditPathLastMatch, isSubstitutionAlignable } from '@keymanapp/lm-worker/test-index';
 
 describe('getEditPathLastMatch', () => {
   it('returns the last match when no substitutions exist', () => {
-    const path = ['delete', 'delete', 'match', 'match', 'match', 'match', 'insert'];
+    const path: EditOperation[] = ['delete', 'delete', 'match', 'match', 'match', 'match', 'insert'];
     assert.equal(getEditPathLastMatch(path), path.lastIndexOf('match'));
   });
 
   it('returns the last match when no substitutions exist left of a "match"', () => {
-    const path = ['delete', 'delete', 'match', 'match', 'match', 'match', 'substitute', 'insert'];
+    const path: EditOperation[] = ['delete', 'delete', 'match', 'match', 'match', 'match', 'substitute', 'insert'];
     assert.equal(getEditPathLastMatch(path), path.lastIndexOf('match'));
   });
 
   // is intended to handle application of suggestions.
   it('returns the second-to-last match when a substitution exists before final "match"', () => {
     // limitation:  if there is _anything_ after that last match, the first assertion will fail.
-    const path = ['delete', 'delete', 'match', 'match', 'match', 'substitute', 'match'];
+    const path: EditOperation[] = ['delete', 'delete', 'match', 'match', 'match', 'substitute', 'match'];
     assert.notEqual(getEditPathLastMatch(path), path.lastIndexOf('match'));
     assert.equal(getEditPathLastMatch(path), path.lastIndexOf('match', path.lastIndexOf('match')-1));
   });
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/context-state.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-state.tests.ts
similarity index 78%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/context-state.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-state.tests.ts
index e6387cba57..10196bd708 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/context-state.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-state.tests.ts
@@ -1,20 +1,18 @@
 import { assert } from 'chai';
 
-import { ContextState } from '#./correction/context-state.js';
-import * as models from '#./models/index.js';
-
 import { default as defaultBreaker } from '@keymanapp/models-wordbreakers';
-
 import { jsonFixture } from '@keymanapp/common-test-resources/model-helpers.mjs';
 
-var TrieModel = models.TrieModel;
+import { ContextState, models } from '@keymanapp/lm-worker/test-index';
+
+import TrieModel = models.TrieModel;
 
 var plainModel = new TrieModel(jsonFixture('models/tries/english-1000'),
   {wordBreaker: defaultBreaker});
 
 describe('ContextState', () => {
   it('<constructor>', () => {
-    let context = { left: '', right: '' };
+    let context = { left: '', right: '', startOfBuffer: true, endOfBuffer: true };
     let state = new ContextState(context, plainModel);
 
     assert.equal(state.context, context);
@@ -27,7 +25,7 @@ describe('ContextState', () => {
 
   describe('initializing without prior tokenization', () => {
     it('creates one empty token for an empty context', () => {
-      let context = { left: '', right: '' };
+      let context = { left: '', right: '', startOfBuffer: true, endOfBuffer: true };
       let state = new ContextState(context, plainModel);
       assert.isOk(state.tokenization);
       assert.equal(state.tokenization.tokens.length, 1);
@@ -35,7 +33,7 @@ describe('ContextState', () => {
     });
 
     it('creates tokens for initial text (without ending whitespace)', () => {
-      let context = { left: 'the quick brown fox', right: '' };
+      let context = { left: 'the quick brown fox', right: '', startOfBuffer: true, endOfBuffer: true };
       let state = new ContextState(context, plainModel);
       assert.isOk(state.tokenization);
       assert.equal(state.tokenization.tokens.length, 7);
@@ -43,7 +41,7 @@ describe('ContextState', () => {
     });
 
     it('creates tokens for initial text (with extra empty token for ending whitespace)', () => {
-      let context = { left: 'the quick brown fox ', right: '' };
+      let context = { left: 'the quick brown fox ', right: '', startOfBuffer: true, endOfBuffer: true };
       let state = new ContextState(context, plainModel);
       assert.isOk(state.tokenization);
       assert.equal(state.tokenization.tokens.length, 9);
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/context-token.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-token.tests.ts
similarity index 89%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/context-token.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-token.tests.ts
index 78df8e9c2b..ae21e14432 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/context-token.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-token.tests.ts
@@ -1,14 +1,22 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ *
+ * Created by jahorton on 2025-07-30
+ *
+ * This file contains low-level unit tests designed to validate the behavior
+ * of the ContextToken class.
+ */
+
 import { assert } from 'chai';
 
-import { ContextToken } from '#./correction/context-token.js';
-import { ExecutionTimer } from '#./correction/execution-timer.js';
-import * as models from '#./models/index.js';
-
+// Aliased due to JS keyword.
 import { default as defaultBreaker } from '@keymanapp/models-wordbreakers';
-
 import { jsonFixture } from '@keymanapp/common-test-resources/model-helpers.mjs';
 
-var TrieModel = models.TrieModel;
+import { ContextToken, correction, models } from '@keymanapp/lm-worker/test-index';
+
+import ExecutionTimer = correction.ExecutionTimer;
+import TrieModel = models.TrieModel;
 
 var plainModel = new TrieModel(jsonFixture('models/tries/english-1000'),
   {wordBreaker: defaultBreaker});
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/context-tokenization.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-tokenization.tests.ts
similarity index 95%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/context-tokenization.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-tokenization.tests.ts
index 9924a506b9..67146d9f2a 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/context-tokenization.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-tokenization.tests.ts
@@ -1,21 +1,31 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ *
+ * Created by jahorton on 2025-07-30
+ *
+ * This file contains low-level tests designed to validate the behavior of the
+ * of the ContextTokenization class and its integration with the lower-level
+ * classes that it utilizes.
+ */
+
 import { assert } from 'chai';
 
-import { ContextTokenization } from "#./correction/context-tokenization.js";
-import { ContextToken } from '#./correction/context-token.js';
-
-import { jsonFixture } from '@keymanapp/common-test-resources/model-helpers.mjs';
-import { TrieModel } from '#./models/index.js';
 import { default as defaultBreaker } from '@keymanapp/models-wordbreakers';
+import { jsonFixture } from '@keymanapp/common-test-resources/model-helpers.mjs';
+
+import { ContextToken, ContextTokenization, models } from '@keymanapp/lm-worker/test-index';
+
+import TrieModel = models.TrieModel;
 
 var plainModel = new TrieModel(jsonFixture('models/tries/english-1000'),
   {wordBreaker: defaultBreaker});
 
-function buildBaseTokenization(textTokens) {
+function buildBaseTokenization(textTokens: string[]) {
   const tokens = textTokens.map((entry) => new ContextToken(plainModel, entry));
   return new ContextTokenization(tokens);
 }
 
-function toToken(text) {
+function toToken(text: string) {
   let isWhitespace = text == ' ';
   let token = new ContextToken(plainModel, text);
   token.isWhitespace = isWhitespace;
@@ -75,7 +85,10 @@ describe('ContextTokenization', function() {
 
       // The `.searchSpace` instances will not be deep-equal; there are class properties
       // that hold functions with closures, configured at runtime.
+
+      // @ts-ignore - TS2704 b/c deleting a readonly property.
       baseTokenization.tokens.forEach((token) => delete token.searchSpace);
+      // @ts-ignore - TS2704 b/c deleting a readonly property.
       cloned.tokens.forEach((token) => delete token.searchSpace);
 
       assert.deepEqual(cloned, baseTokenization);
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/context-tracker.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-tracker.tests.ts
similarity index 80%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/context-tracker.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-tracker.tests.ts
index 9db2abed9e..95d7ece70c 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/context-tracker.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/context/context-tracker.tests.ts
@@ -1,27 +1,23 @@
 import { assert } from 'chai';
 
-import { ContextTracker } from '#./correction/context-tracker.js';
-import { tokenizeTransformDistribution } from '#./correction/transform-tokenization.js';
-import ModelCompositor from '#./model-compositor.js';
-import * as models from '#./models/index.js';
-import * as wordBreakers from '@keymanapp/models-wordbreakers';
-import { determineModelTokenizer } from '#./model-helpers.js';
-
 import { default as defaultBreaker } from '@keymanapp/models-wordbreakers';
-import { deepCopy } from '@keymanapp/web-utils';
-
 import { jsonFixture } from '@keymanapp/common-test-resources/model-helpers.mjs';
-import { ContextState } from '#./correction/context-state.js';
+import { LexicalModelTypes } from '@keymanapp/common-types';
+
+import { ContextState, ContextTracker, determineModelTokenizer, ModelCompositor, models, tokenizeTransformDistribution } from '@keymanapp/lm-worker/test-index';
+
+import Suggestion = LexicalModelTypes.Suggestion;
+import Transform = LexicalModelTypes.Transform;
+import TrieModel = models.TrieModel;
+
+const plainModel = new TrieModel(jsonFixture('models/tries/english-1000'),
+  {wordBreaker: defaultBreaker}
+);
 
 const tokenizer = determineModelTokenizer(new models.DummyModel({wordbreaker: defaultBreaker}));
 
-var TrieModel = models.TrieModel;
-
-var plainModel = new TrieModel(jsonFixture('models/tries/english-1000'),
-  {wordBreaker: wordBreakers.default});
-
 describe('ContextTracker', function() {
-  function toWrapperDistribution(transforms) {
+  function toWrapperDistribution(transforms: Transform | Transform[]) {
     transforms = Array.isArray(transforms) ? transforms : [transforms];
     return [{
       sample: transforms,
@@ -32,14 +28,18 @@ describe('ContextTracker', function() {
   describe('attemptMatchContext', function() {
     it("properly matches and aligns when lead token is removed", function() {
       let existingContext = {
-        left: "an apple a day keeps the doctor"
+        left: "an apple a day keeps the doctor",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
-      let transform = {
+      let transform: Transform = {
         insert: '',
         deleteLeft: 0
       };
       let newContext = {
-        left: " apple a day keeps the doctor"
+        left: " apple a day keeps the doctor",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
       let rawTokens = [" ", "apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor"];
 
@@ -53,14 +53,18 @@ describe('ContextTracker', function() {
 
     it("properly matches and aligns when lead token + following whitespace are removed", function() {
       let existingContext = {
-        left: "an apple a day keeps the doctor"
+        left: "an apple a day keeps the doctor",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
       let transform = {
         insert: '',
         deleteLeft: 0
       };
       let newContext = {
-        left: "apple a day keeps the doctor"
+        left: "apple a day keeps the doctor",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
       let rawTokens = ["apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor"];
 
@@ -74,14 +78,18 @@ describe('ContextTracker', function() {
 
     it("properly matches and aligns when final token is edited", function() {
       let existingContext = {
-        left: "an apple a day keeps the docto"
+        left: "an apple a day keeps the docto",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
-      let transform = {
+      let transform: Transform = {
         insert: 'r',
         deleteLeft: 0
       }
       let newContext = {
-        left: "an apple a day keeps the doctor"
+        left: "an apple a day keeps the doctor",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
       let rawTokens = ["an", " ", "apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor"];
 
@@ -96,14 +104,18 @@ describe('ContextTracker', function() {
     // Needs improved context-state management (due to 2x tokens)
     it("properly matches and aligns when a 'wordbreak' is added", function() {
       let existingContext = {
-        left: "an apple a day keeps the doctor"
+        left: "an apple a day keeps the doctor",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
       let transform = {
         insert: ' ',
         deleteLeft: 0
       }
       let newContext = {
-        left: "an apple a day keeps the doctor "
+        left: "an apple a day keeps the doctor ",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
       let rawTokens = ["an", " ", "apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor", " ", ""];
 
@@ -124,14 +136,18 @@ describe('ContextTracker', function() {
 
     it("properly matches and aligns when a 'wordbreak' is removed via backspace", function() {
       let existingContext = {
-        left: "an apple a day keeps the doctor "
+        left: "an apple a day keeps the doctor ",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
       let transform = {
         insert: '',
         deleteLeft: 1
       }
       let newContext = {
-        left: "an apple a day keeps the doctor"
+        left: "an apple a day keeps the doctor",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
       let rawTokens = ["an", " ", "apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor"];
 
@@ -147,14 +163,18 @@ describe('ContextTracker', function() {
 
     it("properly matches and aligns when an implied 'wordbreak' occurs (as when following \"'\")", function() {
       let existingContext = {
-        left: "'"
+        left: "'",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
       let transform = {
         insert: 'a',
         deleteLeft: 0
       }
       let newContext = {
-        left: "'a"
+        left: "'a",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
       let rawTokens = ["'", "a"];
 
@@ -176,14 +196,18 @@ describe('ContextTracker', function() {
     // Needs improved context-state management (due to 2x tokens)
     it("properly matches and aligns when lead token is removed AND a 'wordbreak' is added'", function() {
       let existingContext = {
-        left: "an apple a day keeps the doctor"
+        left: "an apple a day keeps the doctor",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
       let transform = {
         insert: ' ',
         deleteLeft: 0
       }
       let newContext = {
-        left: "apple a day keeps the doctor "
+        left: "apple a day keeps the doctor ",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
       let rawTokens = ["apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor", " ", ""];
 
@@ -205,14 +229,18 @@ describe('ContextTracker', function() {
 
     it("properly matches and aligns when initial token is modified AND a 'wordbreak' is added'", function() {
       let existingContext = {
-        left: "an"
+        left: "an",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
       let transform = {
         insert: 'd ',
         deleteLeft: 0
       }
       let newContext = {
-        left: "and "
+        left: "and ",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
       let rawTokens = ["and", " ", ""];
 
@@ -221,7 +249,7 @@ describe('ContextTracker', function() {
         newContext,
         plainModel,
         baseState,
-        tokenizeTransformDistribution(tokenizer, {left: "an"}, [{sample: transform, p: 1}])
+        tokenizeTransformDistribution(tokenizer, {left: "an", startOfBuffer: true, endOfBuffer: true}, [{sample: transform, p: 1}])
       );
       assert.isNotNull(newContextMatch?.state);
       assert.deepEqual(newContextMatch.state.tokenization.tokens.map(token => token.exampleInput), rawTokens);
@@ -239,14 +267,18 @@ describe('ContextTracker', function() {
 
     it("properly matches and aligns when tail token is modified AND a 'wordbreak' is added'", function() {
       let existingContext = {
-        left: "apple a day keeps the doc"
+        left: "apple a day keeps the doc",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
       let transform = {
         insert: 'tor ',
         deleteLeft: 0
       }
       let newContext = {
-        left: "apple a day keeps the doctor "
+        left: "apple a day keeps the doctor ",
+        startOfBuffer: true,
+        endOfBuffer: true
       };
       let rawTokens = ["apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor", " ", ""];
 
@@ -255,7 +287,7 @@ describe('ContextTracker', function() {
         newContext,
         plainModel,
         baseState,
-        tokenizeTransformDistribution(tokenizer, {left: "apple a day keeps the doc"}, [{sample: transform, p: 1}])
+        tokenizeTransformDistribution(tokenizer, {left: "apple a day keeps the doc", startOfBuffer: true, endOfBuffer: true}, [{sample: transform, p: 1}])
       );
       assert.isNotNull(newContextMatch?.state);
       assert.deepEqual(newContextMatch.state.tokenization.tokens.map(token => token.exampleInput), rawTokens);
@@ -273,15 +305,19 @@ describe('ContextTracker', function() {
 
     it('rejects hard-to-handle case: tail token is split into three rather than two', function() {
       let baseContext = models.tokenize(defaultBreaker, {
-        left: "text'"
+        left: "text'",
+        startOfBuffer: true,
+        endOfBuffer: true
       });
       assert.equal(baseContext.left.length, 1);
 
-      let baseState = new ContextState({ left: "text'" }, plainModel);
+      let baseState = new ContextState({ left: "text'", startOfBuffer: true, endOfBuffer: true }, plainModel);
 
       // Now the actual check.
       let newContext = models.tokenize(defaultBreaker, {
-        left: "text'\""
+        left: "text'\"",
+        startOfBuffer: true,
+        endOfBuffer: true
       });
       // The reason it's a problem - current internal logic isn't prepared to shift
       // from 1 to 3 tokens in a single step.
@@ -292,10 +328,10 @@ describe('ContextTracker', function() {
         deleteLeft: 0
       }
       let problemContextMatch = ContextTracker.attemptMatchContext(
-        {left: "text'\""},
+        {left: "text'\"", startOfBuffer: true, endOfBuffer: true},
         plainModel,
         baseState,
-        tokenizeTransformDistribution(tokenizer, {left: "text'"}, [{sample: transform, p: 1}])
+        tokenizeTransformDistribution(tokenizer, {left: "text'", startOfBuffer: true, endOfBuffer: true}, [{sample: transform, p: 1}])
       );
       assert.isNull(problemContextMatch);
     });
@@ -303,7 +339,11 @@ describe('ContextTracker', function() {
 
   describe('modelContextState', function() {
     it('models without final wordbreak', function() {
-      let context = { left: "an apple a day keeps the doctor" };
+      let context = {
+        left: "an apple a day keeps the doctor",
+        startOfBuffer: true,
+        endOfBuffer: true
+      };
       let rawTokens = ["an", " ", "apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor"];
 
       let state = new ContextState(context, plainModel);
@@ -311,7 +351,11 @@ describe('ContextTracker', function() {
     });
 
     it('models with final wordbreak', function() {
-      let context = { left: "an apple a day keeps the doctor " };
+      let context = {
+        left: "an apple a day keeps the doctor ",
+        startOfBuffer: true,
+        endOfBuffer: true
+      };
       let rawTokens = ["an", " ", "apple", " ", "a", " ", "day", " ", "keeps", " ", "the", " ", "doctor", " ", ""];
 
       let state = new ContextState(context, plainModel);
@@ -327,7 +371,7 @@ describe('ContextTracker', function() {
 
     // Needs improved context-state management (due to 2x tokens)
     it('tracks an accepted suggestion', function() {
-      let baseSuggestion = {
+      let baseSuggestion: Suggestion = {
         transform: {
           insert: 'world ',
           deleteLeft: 3,
@@ -357,10 +401,7 @@ describe('ContextTracker', function() {
       let compositor = new ModelCompositor(model);
       let baseContextMatch = compositor.contextTracker.analyzeState(model, baseContext);
 
-      baseContextMatch.state.tokenization.tail.replacements = [{
-        suggestion: baseSuggestion,
-        tokenWidth: 1
-      }];
+      baseContextMatch.state.tokenization.tail.suggestions = [ baseSuggestion ];
 
       let reversion = compositor.acceptSuggestion(baseSuggestion, baseContext, postTransform);
 
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/classical-calculation.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/classical-calculation.tests.ts
similarity index 98%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/classical-calculation.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/classical-calculation.tests.ts
index 07a86b2bbb..998a8b2ec7 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/classical-calculation.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/classical-calculation.tests.ts
@@ -1,7 +1,9 @@
 import { assert } from 'chai';
-import { ClassicalDistanceCalculation } from '#./correction/classical-calculation.js';
+import { ClassicalDistanceCalculation } from '@keymanapp/lm-worker/test-index';
 
-function prettyPrintMatrix(matrix) {
+// Very useful for diagnosing unit test issues when path inspection is needed.
+// Not currently used ('cause that's noisy during test runs).
+export function prettyPrintMatrix(matrix: number[][]) {
   for(let r = 0; r < matrix.length; r++) {
     console.log(JSON.stringify(matrix[r], function(key, value) {
       if(value == Number.MAX_VALUE) {
@@ -15,7 +17,7 @@ function prettyPrintMatrix(matrix) {
   }
 }
 
-function compute(input, match, mode, bandSize) {
+function compute(input: string, match: string, mode?: string, bandSize?: number) {
   let buffer = new ClassicalDistanceCalculation();
 
   /* SUPPORTED MODES:
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/distance-modeler.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/distance-modeler.tests.ts
similarity index 93%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/distance-modeler.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/distance-modeler.tests.ts
index b49b511e37..deb8d03d16 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/distance-modeler.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/distance-modeler.tests.ts
@@ -1,19 +1,21 @@
 import { assert } from 'chai';
-import * as models from '#./models/index.js';
-import * as correction from '#./correction/index.js';
 
 import { PriorityQueue } from '@keymanapp/web-utils';
 import { jsonFixture } from '@keymanapp/common-test-resources/model-helpers.mjs';
 
+import { correction, models } from '@keymanapp/lm-worker/test-index';
+
+import TrieModel = models.TrieModel;
+
 function buildTestTimer() {
   return new correction.ExecutionTimer(Number.MAX_VALUE, Number.MAX_VALUE);
 }
 
-function assertEdgeChars(edge, input, match) {
+function assertEdgeChars(edge: correction.SearchNode, input: string, match: string) {
   assert.isTrue(edgeHasChars(edge, input, match));
 }
 
-function edgeHasChars(edge, input, match) {
+function edgeHasChars(edge: correction.SearchNode, input: string, match: string) {
   if(edge.priorInput[edge.priorInput.length - 1].sample.insert != input) {
     return false;
   }
@@ -21,7 +23,7 @@ function edgeHasChars(edge, input, match) {
   return edge.calculation.lastMatchEntry.key == match;
 }
 
-function findEdgeWithChars(edgeArray, input, match) {
+function findEdgeWithChars(edgeArray: correction.SearchNode[], input: string, match: string) {
   let results = edgeArray.filter(function(value) {
     return value.calculation.lastMatchEntry.key == match && value.priorInput[value.priorInput.length - 1].sample.insert == input;
   });
@@ -32,10 +34,10 @@ function findEdgeWithChars(edgeArray, input, match) {
 
 describe('Correction Distance Modeler', function() {
   describe('SearchNode + SearchEdge', function() {
-    var testModel;
+    var testModel: TrieModel;
 
     before(function() {
-      testModel = new models.TrieModel(jsonFixture('models/tries/english-1000'));
+      testModel = new TrieModel(jsonFixture('models/tries/english-1000'));
     });
 
     it('SearchNode.buildInsertionEdges() - from root', function() {
@@ -247,17 +249,17 @@ describe('Correction Distance Modeler', function() {
   });
 
   describe('SearchSpaceTier + SearchSpace', function() {
-    var testModel;
+    var testModel: TrieModel;
 
     before(function() {
-      testModel = new models.TrieModel(jsonFixture('models/tries/english-1000'));
+      testModel = new TrieModel(jsonFixture('models/tries/english-1000'));
     });
 
-    let checkResults_teh = async function(iter) {
-      let firstResult = await iter.next();  // {value: <actual value>, done: <iteration complete?>}
-      assert.isFalse(firstResult.done);
+    let checkResults_teh = async function(iter: AsyncGenerator<correction.SearchResult, any, any>) {
+      let firstIterResult = await iter.next();  // {value: <actual value>, done: <iteration complete?>}
+      assert.isFalse(firstIterResult.done);
 
-      firstResult = firstResult.value; // Retrieves <actual value>
+      const firstResult: correction.SearchResult = firstIterResult.value; // Retrieves <actual value>
       // No checks on the first set's cost.
       assert.equal(firstResult.matchString, "ten");
 
@@ -268,9 +270,8 @@ describe('Correction Distance Modeler', function() {
         'the'
       ];
 
-      async function checkBatch(batch, prevCost) {
+      async function checkBatch(batch: string[], prevCost: number) {
         let cost;
-        firstResult = firstResult;
         while(batch.length > 0) {
           const iter_result = await iter.next();
           assert.isFalse(iter_result.done);
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/early-correction-search-stopping.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/early-correction-search-stopping.tests.ts
similarity index 87%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/early-correction-search-stopping.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/early-correction-search-stopping.tests.ts
index 299f5069d4..bf45e3b94e 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/early-correction-search-stopping.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/early-correction-search-stopping.tests.ts
@@ -1,7 +1,6 @@
 import { assert } from 'chai';
 
-import { CORRECTION_SEARCH_THRESHOLDS, shouldStopSearchingEarly } from "#./predict-helpers.js";
-import { ModelCompositor } from '#./model-compositor.js';
+import { CORRECTION_SEARCH_THRESHOLDS, CorrectionPredictionTuple, ModelCompositor, shouldStopSearchingEarly } from "@keymanapp/lm-worker/test-index";
 
 describe('correction-search: shouldStopSearchingEarly', () => {
   it('stops early once new corrections are less likely than currently discovered predictions', () => {
@@ -17,7 +16,7 @@ describe('correction-search: shouldStopSearchingEarly', () => {
     const predictions = predictionProbs.map((entry) => {
       return {
         totalProb: entry
-      }
+      } as CorrectionPredictionTuple
     });
 
     // Thresholding is performed in log-space.
@@ -34,8 +33,8 @@ describe('correction-search: shouldStopSearchingEarly', () => {
     //
     // Can technically run the method with an empty array, but the actual scenario would have
     // at least one prediction present in the "found predictions" array.
-    assert.isFalse(shouldStopSearchingEarly(baseCost, baseCost + expectedThreshold - 0.01, [{ totalProb: Math.exp(-1) }]));
-    assert.isTrue(shouldStopSearchingEarly( baseCost, baseCost + expectedThreshold + 0.01, [{ totalProb: Math.exp(-1) }]));
+    assert.isFalse(shouldStopSearchingEarly(baseCost, baseCost + expectedThreshold - 0.01, [{ totalProb: Math.exp(-1) } as CorrectionPredictionTuple]));
+    assert.isTrue(shouldStopSearchingEarly( baseCost, baseCost + expectedThreshold + 0.01, [{ totalProb: Math.exp(-1) } as CorrectionPredictionTuple]));
   });
 
   it('stops checking corrections earlier when enough predictions have been found', () => {
@@ -47,7 +46,7 @@ describe('correction-search: shouldStopSearchingEarly', () => {
     const predictions = predictionProbs.map((entry) => {
       return {
         totalProb: entry
-      }
+      } as CorrectionPredictionTuple
     });
 
     const baseCost = 1;
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/execution-timer.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/execution-timer.tests.ts
similarity index 97%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/execution-timer.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/execution-timer.tests.ts
index dcabec6f49..dfccaf684b 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/edit-distance/execution-timer.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/correction-search/execution-timer.tests.ts
@@ -1,11 +1,12 @@
 import { assert } from 'chai';
-import { useFakeTimers } from 'sinon';
+import { useFakeTimers, type SinonFakeTimers } from 'sinon';
 
-import { ExecutionBucket, ExecutionTimer } from '#./correction/index.js';
+import { correction } from '@keymanapp/lm-worker/test-index';
+import ExecutionBucket = correction.ExecutionBucket;
+import ExecutionTimer = correction.ExecutionTimer;
 
 describe('ExecutionTimer', () => {
-  /** @type {import('sinon').SinonFakeTimers} */
-  let timeControl;
+  let timeControl: SinonFakeTimers;
 
   beforeEach(() => {
     timeControl = useFakeTimers();
@@ -92,7 +93,7 @@ describe('ExecutionTimer', () => {
   it('defer() - alternate setup', async () => {
     const timer = new ExecutionTimer(50, 100);
 
-    const delaySetup = new Promise(async (resolve) => {
+    const delaySetup = new Promise<void>(async (resolve) => {
       // The passed-in function does not delay by default; this will wait for
       // one microtask delay before proceeding.
       //
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/auto-correct.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/auto-correct.tests.ts
similarity index 82%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/auto-correct.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/auto-correct.tests.ts
index 84bb8b412f..d32326e843 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/auto-correct.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/auto-correct.tests.ts
@@ -1,6 +1,6 @@
-import { AUTOSELECT_PROPORTION_THRESHOLD, SuggestionSimilarity, predictionAutoSelect, tupleDisplayOrderSort } from "#./predict-helpers.js";
 import { assert } from 'chai';
 
+import { AUTOSELECT_PROPORTION_THRESHOLD, CorrectionPredictionTuple, predictionAutoSelect, SuggestionSimilarity, tupleDisplayOrderSort } from "@keymanapp/lm-worker/test-index";
 /*
   * Preconditions:
   * - there should always be a 'keep' option.  Now, whether or not that option
@@ -9,10 +9,7 @@ import { assert } from 'chai';
   */
 describe('predictionAutoSelect', () => {
   it(`does not throw when no suggestions are available`, () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [];
+    const predictions: CorrectionPredictionTuple[] = [];
     const originalPredictions = [].concat(predictions);
     assert.doesNotThrow(() => predictionAutoSelect(predictions));
 
@@ -20,10 +17,7 @@ describe('predictionAutoSelect', () => {
   });
 
   it(`selects solitary 'keep' suggestion that does match the model`, () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [
+    const predictions: CorrectionPredictionTuple[] = [
       {
         correction: {
           sample: 'apple',
@@ -36,7 +30,8 @@ describe('predictionAutoSelect', () => {
               insert: 'e',
               deleteLeft: 0
             },
-            matchesModel: true
+            matchesModel: true,
+            displayAs: 'apple'
           },
           p: 1
         },
@@ -53,10 +48,7 @@ describe('predictionAutoSelect', () => {
   });
 
   it(`does not select suggestions if the root correction has no letters`, () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [
+    const predictions: CorrectionPredictionTuple[] = [
       {
         correction: {
           sample: '5',
@@ -69,7 +61,8 @@ describe('predictionAutoSelect', () => {
               insert: '5',
               deleteLeft: 0
             },
-            matchesModel: false
+            matchesModel: false,
+            displayAs: '5'
           },
           p: 0.01
         },
@@ -86,7 +79,8 @@ describe('predictionAutoSelect', () => {
               insert: '5th',
               deleteLeft: 0
             },
-            matchesModel: true
+            matchesModel: true,
+            displayAs: '5th'
           },
           p: 0.8
         },
@@ -94,7 +88,7 @@ describe('predictionAutoSelect', () => {
       }
     ];
 
-    const originalPredictions = [].concat(predictions);
+    const originalPredictions = [...predictions];
     assert.doesNotThrow(() => predictionAutoSelect(predictions));
     assert.sameDeepOrderedMembers(predictions, originalPredictions);
 
@@ -103,10 +97,7 @@ describe('predictionAutoSelect', () => {
   });
 
   it(`does not select solitary 'keep' suggestion that doesn't match the model`, () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [
+    const predictions: CorrectionPredictionTuple[] = [
       {
         correction: {
           sample: 'appl',
@@ -119,7 +110,8 @@ describe('predictionAutoSelect', () => {
               insert: 'l',
               deleteLeft: 0
             },
-            matchesModel: false
+            matchesModel: false,
+            displayAs: '"appl"'
           },
           p: 1
         },
@@ -136,10 +128,7 @@ describe('predictionAutoSelect', () => {
   });
 
   it(`selects 'keep' suggestion that does match the model over any alternatives`, () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple}
-     */
-    const keepSuggestion = {
+    const keepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thin',
         p: .8
@@ -151,14 +140,15 @@ describe('predictionAutoSelect', () => {
             insert: 'n',
             deleteLeft: 0
           },
-          matchesModel: true
+          matchesModel: true,
+          displayAs: 'thin'
         },
         p: .05
       },
       totalProb: .04
     }
 
-    const highestNonKeepSuggestion = {
+    const highestNonKeepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thin',
         p: .8
@@ -169,16 +159,14 @@ describe('predictionAutoSelect', () => {
             insert: 'nk',
             deleteLeft: 0
           },
+          displayAs: 'think'
         },
         p: .55
       },
       totalProb: .44
     };
 
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [
+    const predictions: CorrectionPredictionTuple[] = [
       keepSuggestion,
       highestNonKeepSuggestion,
       {
@@ -192,6 +180,7 @@ describe('predictionAutoSelect', () => {
               insert: 'ng',
               deleteLeft: 0
             },
+            displayAs: 'thing'
           },
           p: .4
         },
@@ -208,6 +197,7 @@ describe('predictionAutoSelect', () => {
               insert: 'ck',
               deleteLeft: 0
             },
+            displayAs: 'thick'
           },
           p: 1
         },
@@ -215,21 +205,16 @@ describe('predictionAutoSelect', () => {
       }
     ];
 
-    predictions.sort(tupleDisplayOrderSort);
-
     const originalPredictions = [].concat(predictions);
     assert.doesNotThrow(() => predictionAutoSelect(predictions));
-    assert.sameDeepOrderedMembers(predictions, originalPredictions);
+    assert.sameDeepMembers(predictions, originalPredictions);
 
     const autoselected = predictions.find((entry) => entry.prediction.sample.autoAccept);
     assert.equal(autoselected, keepSuggestion);
   });
 
   it(`selects solitary non-'keep' suggestion when 'keep' does not match model`, () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple}
-     */
-    const keepSuggestion = {
+    const keepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thin',
         p: .8
@@ -241,6 +226,7 @@ describe('predictionAutoSelect', () => {
             insert: 'n',
             deleteLeft: 0
           },
+          displayAs: '"thin"',
           matchesModel: false
         },
         p: .05
@@ -252,7 +238,7 @@ describe('predictionAutoSelect', () => {
     // This threshold may be subject to change.
     //
     // Refer to AUTOSELECT_PROPORTION_THRESHOLD in predict-helpers.ts.
-    const onlyNonKeepSuggestion = {
+    const onlyNonKeepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thin',
         p: .8
@@ -263,16 +249,14 @@ describe('predictionAutoSelect', () => {
             insert: 'nk',
             deleteLeft: 0
           },
+          displayAs: 'think'
         },
         p: .01
       },
       totalProb: .008
     };
 
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [
+    const predictions: CorrectionPredictionTuple[] = [
       keepSuggestion,
       onlyNonKeepSuggestion
     ];
@@ -291,10 +275,7 @@ describe('predictionAutoSelect', () => {
   });
 
   it(`does not select non-'keep' without sufficient winning probability`, () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple}
-     */
-    const keepSuggestion = {
+    const keepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thin',
         p: .8
@@ -306,6 +287,7 @@ describe('predictionAutoSelect', () => {
             insert: 'n',
             deleteLeft: 0
           },
+          displayAs: '"thin"',
           matchesModel: false
         },
         p: .05
@@ -317,7 +299,7 @@ describe('predictionAutoSelect', () => {
     // This threshold may be subject to change.
     //
     // Refer to AUTOSELECT_PROPORTION_THRESHOLD in predict-helpers.ts.
-    const highestNonKeepSuggestion = {
+    const highestNonKeepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thin',
         p: .8
@@ -328,16 +310,14 @@ describe('predictionAutoSelect', () => {
             insert: 'nk',
             deleteLeft: 0
           },
+          displayAs: 'think'
         },
         p: .55
       },
       totalProb: .44
     };
 
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [
+    const predictions: CorrectionPredictionTuple[] = [
       keepSuggestion,
       highestNonKeepSuggestion,
       {
@@ -351,6 +331,7 @@ describe('predictionAutoSelect', () => {
               insert: 'ng',
               deleteLeft: 0
             },
+            displayAs: 'thing'
           },
           p: .4
         },
@@ -367,6 +348,7 @@ describe('predictionAutoSelect', () => {
               insert: 'ck',
               deleteLeft: 0
             },
+            displayAs: 'thick'
           },
           p: 1
         },
@@ -388,10 +370,7 @@ describe('predictionAutoSelect', () => {
   });
 
   it(`does select non-'keep' with sufficient winning probability`, () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple}
-     */
-    const keepSuggestion = {
+    const keepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thin',
         p: .8
@@ -403,6 +382,7 @@ describe('predictionAutoSelect', () => {
             insert: 'n',
             deleteLeft: 0
           },
+          displayAs: '"thin"',
           matchesModel: false
         },
         p: .05
@@ -410,7 +390,7 @@ describe('predictionAutoSelect', () => {
       totalProb: .04
     }
 
-    const highestNonKeepSuggestion = {
+    const highestNonKeepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thin',
         p: .9
@@ -421,16 +401,14 @@ describe('predictionAutoSelect', () => {
             insert: 'nk',
             deleteLeft: 0
           },
+          displayAs: 'think'
         },
         p: .75
       },
       totalProb: .675
     };
 
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [
+    const predictions: CorrectionPredictionTuple[] = [
       keepSuggestion,
       highestNonKeepSuggestion,
       {
@@ -444,6 +422,7 @@ describe('predictionAutoSelect', () => {
               insert: 'ng',
               deleteLeft: 0
             },
+            displayAs: 'thing'
           },
           p: .2
         },
@@ -460,6 +439,7 @@ describe('predictionAutoSelect', () => {
               insert: 'ck',
               deleteLeft: 0
             },
+            displayAs: 'thick'
           },
           p: 1
         },
@@ -470,21 +450,16 @@ describe('predictionAutoSelect', () => {
     const totalProb = predictions.reduce((accum, current) => accum + current.totalProb, 0);
     assert.isAbove(highestNonKeepSuggestion.totalProb, totalProb * AUTOSELECT_PROPORTION_THRESHOLD, 'test setup is no longer valid');
 
-    predictions.sort(tupleDisplayOrderSort);
-
     const originalPredictions = [].concat(predictions);
     assert.doesNotThrow(() => predictionAutoSelect(predictions));
-    assert.sameDeepOrderedMembers(predictions, originalPredictions);
+    assert.sameDeepMembers(predictions, originalPredictions);
 
     const autoselected = predictions.find((entry) => entry.prediction.sample.autoAccept);
     assert.equal(autoselected, highestNonKeepSuggestion);
   });
 
   it('ignores non key-matched suggestions when key-matched suggestions exist', () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple}
-     */
-    const keepSuggestion = {
+    const keepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'cant',
         p: 1
@@ -496,6 +471,7 @@ describe('predictionAutoSelect', () => {
             insert: 't',
             deleteLeft: 0
           },
+          displayAs: '"cant"',
           matchesModel: false
         },
         p: 1
@@ -504,7 +480,7 @@ describe('predictionAutoSelect', () => {
       matchLevel: SuggestionSimilarity.exact
     }
 
-    const expectedSuggestion = {
+    const expectedSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'cant',
         p: 1
@@ -515,6 +491,7 @@ describe('predictionAutoSelect', () => {
             insert: '\'t',
             deleteLeft: 0
           },
+          displayAs: "can't"
         },
         p: .2
       },
@@ -522,10 +499,7 @@ describe('predictionAutoSelect', () => {
       matchLevel: SuggestionSimilarity.sameKey
     };
 
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [
+    const predictions: CorrectionPredictionTuple[] = [
       keepSuggestion,
       expectedSuggestion,
       {
@@ -539,6 +513,7 @@ describe('predictionAutoSelect', () => {
               insert: 'teen',
               deleteLeft: 0
             },
+            displayAs: 'canteen'
           },
           p: .8
         },
@@ -547,11 +522,10 @@ describe('predictionAutoSelect', () => {
       }
     ];
 
-    predictions.sort(tupleDisplayOrderSort);
-
     const originalPredictions = [].concat(predictions);
     assert.doesNotThrow(() => predictionAutoSelect(predictions));
-    assert.sameDeepOrderedMembers(predictions, originalPredictions);
+
+    assert.sameDeepMembers(predictions, originalPredictions);
 
     const autoselected = predictions.find((entry) => entry.prediction.sample.autoAccept);
     assert.equal(autoselected, expectedSuggestion);
@@ -560,10 +534,7 @@ describe('predictionAutoSelect', () => {
   // The idea:  avoid "over-correcting" when a potential correction has a
   // super-high-frequency word.
   it('does not auto-select suggestion if its root correction is not most likely', () => {
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple}
-     */
-    const keepSuggestion = {
+    const keepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thi',
         p: .7
@@ -575,6 +546,7 @@ describe('predictionAutoSelect', () => {
             insert: 'i',
             deleteLeft: 0
           },
+          displayAs: '"thi"',
           matchesModel: false
         },
         p: .05
@@ -582,7 +554,7 @@ describe('predictionAutoSelect', () => {
       totalProb: .035
     }
 
-    const highestCorrectionSuggestion = {
+    const highestCorrectionSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'thi',
         p: .7
@@ -593,13 +565,14 @@ describe('predictionAutoSelect', () => {
             insert: 'in',
             deleteLeft: 0
           },
+          displayAs: 'thin'
         },
         p: .1
       },
       totalProb: .07
     };
 
-    const highestNonKeepSuggestion = {
+    const highestNonKeepSuggestion: CorrectionPredictionTuple = {
       correction: {
         sample: 'the',
         p: .3
@@ -610,16 +583,14 @@ describe('predictionAutoSelect', () => {
             insert: 'e',
             deleteLeft: 0
           },
+          displayAs: 'the'
         },
         p: 1
       },
       totalProb: .3
     };
 
-    /**
-     * @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]}
-     */
-    const predictions = [
+    const predictions: CorrectionPredictionTuple[] = [
       keepSuggestion,
       highestNonKeepSuggestion,
       highestCorrectionSuggestion
@@ -628,11 +599,9 @@ describe('predictionAutoSelect', () => {
     const totalProb = predictions.reduce((accum, current) => accum + current.totalProb, 0);
     assert.isAbove(highestNonKeepSuggestion.totalProb, totalProb * AUTOSELECT_PROPORTION_THRESHOLD, 'test setup is no longer valid');
 
-    predictions.sort(tupleDisplayOrderSort);
-
     const originalPredictions = [].concat(predictions);
     assert.doesNotThrow(() => predictionAutoSelect(predictions));
-    assert.sameDeepOrderedMembers(predictions, originalPredictions);
+    assert.sameDeepMembers(predictions, originalPredictions);
 
     const autoselected = predictions.find((entry) => entry.prediction.sample.autoAccept);
     assert.isNotOk(autoselected);
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/casing-detection.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/casing-detection.tests.ts
similarity index 97%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/casing-detection.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/casing-detection.tests.ts
index 98c7dcb742..84e80a00f2 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/casing-detection.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/casing-detection.tests.ts
@@ -1,8 +1,9 @@
 import { assert } from 'chai';
-import { ModelCompositor } from '#./model-compositor.js';
 
-import { detectCurrentCasing } from "#./model-helpers.js";
-import { DummyModel } from "#./models/dummy-model.js";
+import { LexicalModelTypes } from '@keymanapp/common-types';
+import { detectCurrentCasing, ModelCompositor, models } from '@keymanapp/lm-worker/test-index';
+
+import DummyModel = models.DummyModel;
 
 const defaultCasingModel = new DummyModel({
   languageUsesCasing: true,
@@ -37,8 +38,7 @@ const defaultCasingModel = new DummyModel({
   }
 });
 
-/** @type {CasingFunction} */
-const leetCasing = (casing, text) => {
+const leetCasing: LexicalModelTypes.CasingFunction = (casing, text) => {
   // Don't know if there's a standard analogue for '9', but this'll work well enough.
   const plain = ['O', 'L', 'Z', 'E', 'A', 'S', 'G', 'T', 'B']
   const leet  = ['0', '1', '2', '3', '4', '5', '6', '7', '8']
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/predict-from-corrections.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/predict-from-corrections.tests.ts
similarity index 86%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/predict-from-corrections.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/predict-from-corrections.tests.ts
index 3b89c94ef9..54eec72955 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/predict-from-corrections.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/predict-from-corrections.tests.ts
@@ -1,11 +1,21 @@
-import { deepCopy } from "@keymanapp/web-utils";
+
 import { assert } from 'chai';
 
-import { predictFromCorrections, tupleDisplayOrderSort } from "#./predict-helpers.js";
-import { DummyModel } from "#./models/dummy-model.js";
+import { deepCopy } from "@keymanapp/web-utils";
+import { LexicalModelTypes } from '@keymanapp/common-types';
+
+import { models, predictFromCorrections, tupleDisplayOrderSort } from "@keymanapp/lm-worker/test-index";
+
+import CasingFunction = LexicalModelTypes.CasingFunction;
+import Context = LexicalModelTypes.Context;
+import Distribution = LexicalModelTypes.Distribution;
+import DummyModel = models.DummyModel;
+import Outcome = LexicalModelTypes.Outcome;
+import Suggestion = LexicalModelTypes.Suggestion;
+import Transform = LexicalModelTypes.Transform;
 
 // See: developer/src/kmc-model/model-defaults.ts, defaultApplyCasing
-const applyCasing = (casing, text) => {
+const applyCasing: CasingFunction = (casing, text) => {
   switch(casing) {
     case 'lower':
       return text.toLowerCase();
@@ -44,7 +54,7 @@ const DUMMY_MODEL_CONFIG = {
     insertAfterWord: '\u00a0' // non-breaking space
   },
   applyCasing: applyCasing,
-  searchTermToKey: (wordform) => {
+  searchTermToKey: (wordform: string) => {
     // See: developer/src/kmc-model/model-defaults.ts, defaultCasedSearchTermToKey
     return applyCasing('lower', wordform)
       .normalize('NFKD')
@@ -63,16 +73,14 @@ const DUMMY_MODEL_CONFIG = {
 
 describe('predictFromCorrections', () => {
   it('handles a single correction prefixing multiple entries - no transform ID', () => {
-    /** @type {Context} */
-    const context = {
+    const context: Context = {
       left: 'It',
       right: '',
       startOfBuffer: true,
       endOfBuffer: true
     };
 
-    /** @type {Distribution<Transform>} */
-    const correctionDistribution = [{
+    const correctionDistribution: Distribution<Transform> = [{
         sample: {
           insert: 's',
           deleteLeft: 0
@@ -81,8 +89,7 @@ describe('predictFromCorrections', () => {
       }
     ];
 
-    /** @type {ProbabilityMass<Suggestion>[]} */
-    const dummied_suggestions = [
+    const dummied_suggestions: Outcome<Suggestion>[] = [
       {
         transform: {
           insert: "it's",
@@ -117,16 +124,14 @@ describe('predictFromCorrections', () => {
   });
 
   it('handles a single correction prefixing multiple entries - with transform ID', () => {
-    /** @type {Context} */
-    const context = {
+    const context: Context = {
       left: 'It',
       right: '',
       startOfBuffer: true,
       endOfBuffer: true
     };
 
-    /** @type {Distribution<Transform>} */
-    const correctionDistribution = [{
+    const correctionDistribution: Distribution<Transform> = [{
         sample: {
           insert: 's',
           deleteLeft: 0,
@@ -136,8 +141,7 @@ describe('predictFromCorrections', () => {
       }
     ];
 
-    /** @type {ProbabilityMass<Suggestion>[]} */
-    const dummied_suggestions = [
+    const dummied_suggestions: Outcome<Suggestion>[] = [
       {
         transform: {
           insert: "it's",
@@ -177,8 +181,7 @@ describe('predictFromCorrections', () => {
   });
 
   it('handles multiple corrections at once', () => {
-    /** @type {Context} */
-    const context = {
+    const context: Context = {
       left: 'It',
       right: '',
       startOfBuffer: true,
@@ -187,7 +190,7 @@ describe('predictFromCorrections', () => {
 
     // Note:  each correction is used in order in a separate model.predict call.
     /** @type {Distribution<Transform>} */
-    const correctionDistribution = [{
+    const correctionDistribution: Distribution<Transform> = [{
         // postContext:  is
         sample: {
           insert: 's',
@@ -204,8 +207,7 @@ describe('predictFromCorrections', () => {
       }
     ];
 
-    /** @type {ProbabilityMass<Suggestion>[]} */
-    const dummied_suggestions = [
+    const dummied_suggestions: Outcome<Suggestion>[][] = [
       // postContext:  is
       [{
         transform: {
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-deduplication.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-deduplication.tests.ts
similarity index 84%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-deduplication.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-deduplication.tests.ts
index 84babcf4b4..eea66d8ad0 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-deduplication.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-deduplication.tests.ts
@@ -1,9 +1,13 @@
-import * as wordBreakers from '@keymanapp/models-wordbreakers';
-import { deepCopy } from '@keymanapp/web-utils';
 import { assert } from 'chai';
 
-import { dedupeSuggestions } from "#./predict-helpers.js";
-import { DummyModel } from "#./models/dummy-model.js";
+import * as wordBreakers from '@keymanapp/models-wordbreakers';
+import { deepCopy } from '@keymanapp/web-utils';
+import { LexicalModelTypes } from '@keymanapp/common-types';
+
+import { CorrectionPredictionTuple, dedupeSuggestions, models } from "@keymanapp/lm-worker/test-index";
+
+import Context = LexicalModelTypes.Context;
+import DummyModel = models.DummyModel;
 
 /*
  * This file's tests use these parts of a lexical model:
@@ -20,8 +24,7 @@ const testModel = new DummyModel({
  * @returns
  */
 const build_its_is_set = () => {
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const its = {
+  const its: CorrectionPredictionTuple = {
     correction: {
       sample: 'its',
       p: 0.8
@@ -40,8 +43,7 @@ const build_its_is_set = () => {
     // matchLevel does not yet exist.
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const it_is = {
+  const it_is: CorrectionPredictionTuple = {
     correction: {
       sample: 'its',
       p: 0.8
@@ -59,8 +61,7 @@ const build_its_is_set = () => {
     totalProb: 0.64
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const is = {
+  const is: CorrectionPredictionTuple = {
     correction: {
       sample: 'is',
       p: 0.2
@@ -78,8 +79,7 @@ const build_its_is_set = () => {
     totalProb: 0.1
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const is_not = {
+  const is_not: CorrectionPredictionTuple = {
     correction: {
       sample: 'is',
       p: 0.2
@@ -107,8 +107,7 @@ const build_its_is_set = () => {
 
 describe('dedupeSuggestions', () => {
   it('preserves all entries when there are no duplicates', () => {
-    /** @type {Context} */
-    const context = {
+    const context: Context = {
       left: 'It',
       right: '',
       startOfBuffer: true,
@@ -125,8 +124,7 @@ describe('dedupeSuggestions', () => {
   });
 
   it('removes duplicates, combining their total-probabilities', () => {
-    /** @type {Context} */
-    const context = {
+    const context: Context = {
       left: 'It',
       right: '',
       startOfBuffer: true,
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-finalization.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-finalization.tests.ts
similarity index 94%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-finalization.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-finalization.tests.ts
index 1cf079fda3..4e63055a10 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-finalization.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-finalization.tests.ts
@@ -1,9 +1,15 @@
-import * as wordBreakers from '@keymanapp/models-wordbreakers';
+
 import { assert } from 'chai';
 
-import { finalizeSuggestions } from "#./predict-helpers.js";
-import { DummyModel } from "#./models/dummy-model.js";
 import { deepCopy } from '@keymanapp/web-utils';
+import * as wordBreakers from '@keymanapp/models-wordbreakers';
+import { LexicalModelTypes } from '@keymanapp/common-types';
+
+import { CorrectionPredictionTuple, finalizeSuggestions, models } from "@keymanapp/lm-worker/test-index";
+
+import DummyModel = models.DummyModel;
+import Outcome = LexicalModelTypes.Outcome;
+import Suggestion = LexicalModelTypes.Suggestion;
 
 /*
  * This file's tests use these parts of a lexical model:
@@ -39,11 +45,10 @@ const testModelWithoutSpacing = new DummyModel({
  * @param {'verbose'=} verbose
  * @returns
  */
-const build_its_is_set = (verbose) => {
+const build_its_is_set = (verbose?: string) => {
   const verboseFlag = (verbose == 'verbose' ? true : false);
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const its = {
+  const its: CorrectionPredictionTuple = {
     correction: {
       sample: 'its',
       p: 0.8
@@ -62,8 +67,7 @@ const build_its_is_set = (verbose) => {
     // matchLevel does not yet exist.
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const it_is = {
+  const it_is: CorrectionPredictionTuple = {
     correction: {
       sample: 'its',
       p: 0.8
@@ -81,8 +85,7 @@ const build_its_is_set = (verbose) => {
     totalProb: 0.64
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const is = {
+  const is: CorrectionPredictionTuple = {
     correction: {
       sample: 'is',
       p: 0.2
@@ -100,8 +103,7 @@ const build_its_is_set = (verbose) => {
     totalProb: 0.1
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const is_not = {
+  const is_not: CorrectionPredictionTuple = {
     correction: {
       sample: 'is',
       p: 0.2
@@ -129,7 +131,7 @@ const build_its_is_set = (verbose) => {
   const unfinalized = [...Object.values(baseDefinitions)].map((entry) => deepCopy(entry));
   const expected = unfinalized.map((entry) => {
 
-    const mapped = {
+    const mapped: Outcome<Suggestion & { 'correction-p'?: number, 'lexical-p'?: number }> = {
       ...deepCopy(entry.prediction.sample),
       p: entry.totalProb
     };
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-similarity.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-similarity.tests.ts
similarity index 85%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-similarity.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-similarity.tests.ts
index 18fa1307b1..ae5133cf4b 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/suggestion-similarity.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/prediction-helpers/suggestion-similarity.tests.ts
@@ -1,10 +1,18 @@
+import { assert } from 'chai';
+
 import { QuoteBehavior } from "@keymanapp/models-templates";
 import * as wordBreakers from '@keymanapp/models-wordbreakers';
 import { deepCopy } from '@keymanapp/web-utils';
-import { assert } from 'chai';
+import { LexicalModelTypes } from '@keymanapp/common-types';
 
-import { SuggestionSimilarity, processSimilarity, toAnnotatedSuggestion } from "#./predict-helpers.js";
-import { DummyModel } from "#./models/dummy-model.js";
+import { CorrectionPredictionTuple, models, processSimilarity, SuggestionSimilarity, toAnnotatedSuggestion } from "@keymanapp/lm-worker/test-index";
+
+import CasingFunction = LexicalModelTypes.CasingFunction;
+import Context = LexicalModelTypes.Context;
+import DummyModel = models.DummyModel;
+import DummyOptions = models.DummyOptions;
+import ProbabilityMass = LexicalModelTypes.ProbabilityMass;
+import Transform = LexicalModelTypes.Transform;
 
 /*
  * This file's tests use these parts of a lexical model:
@@ -14,8 +22,7 @@ import { DummyModel } from "#./models/dummy-model.js";
  * - model.punctuation
  */
 
-/** @type { import("#./models/dummy-model.js").DummyOptions } */
-const DUMMY_MODEL_CONFIG = {
+const DUMMY_MODEL_CONFIG: DummyOptions = {
   punctuation: {
     quotesForKeepSuggestion: {
       open: '<',
@@ -27,7 +34,7 @@ const DUMMY_MODEL_CONFIG = {
 };
 
 // See: developer/src/kmc-model/model-defaults.ts, defaultApplyCasing
-const applyCasing = (casing, text) => {
+const applyCasing: CasingFunction = (casing, text) => {
   switch(casing) {
     case 'lower':
       return text.toLowerCase();
@@ -102,8 +109,7 @@ const testModelWithCasing = new DummyModel({
  * @returns
  */
 const build_its_is_set = () => {
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const its = {
+  const its: CorrectionPredictionTuple = {
     correction: {
       sample: 'its',
       p: 0.8
@@ -122,8 +128,7 @@ const build_its_is_set = () => {
     // matchLevel does not yet exist.
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const it_is = {
+  const it_is: CorrectionPredictionTuple = {
     correction: {
       sample: 'its',
       p: 0.8
@@ -141,8 +146,7 @@ const build_its_is_set = () => {
     totalProb: 0.64
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const is = {
+  const is: CorrectionPredictionTuple = {
     correction: {
       sample: 'is',
       p: 0.2
@@ -160,8 +164,7 @@ const build_its_is_set = () => {
     totalProb: 0.1
   };
 
-  /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-  const is_not = {
+  const is_not: CorrectionPredictionTuple = {
     correction: {
       sample: 'is',
       p: 0.2
@@ -189,16 +192,14 @@ const build_its_is_set = () => {
 
 describe('processSimilarity', () => {
   it(`selects non-contraction as 'more similar' than same-keyed contraction when context is non-contraction`, () => {
-    /** @type {Context} */
-    const context = {
+    const context: Context = {
       left: 'It',
       right: '',
       startOfBuffer: true,
       endOfBuffer: true
     };
 
-    /** @type {ProbabilityMass<Transform>} */
-    const trueInput = {
+    const trueInput: ProbabilityMass<Transform> = {
       sample: {
         insert: 's',
         deleteLeft: 0
@@ -209,8 +210,7 @@ describe('processSimilarity', () => {
     const testSet = build_its_is_set();
     const distribution = [...Object.values(testSet)];
 
-    /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]} */
-    const expectation = [
+    const expectation: CorrectionPredictionTuple[] = [
       {
         ...testSet.its,
         matchLevel: SuggestionSimilarity.exact
@@ -239,16 +239,14 @@ describe('processSimilarity', () => {
   });
 
   it(`selects contraction as 'more similar' than same-keyed non-contraction when context is contraction`, () => {
-    /** @type {Context} */
-    const context = {
+    const context: Context = {
       left: 'It',
       right: '',
       startOfBuffer: true,
       endOfBuffer: true
     };
 
-    /** @type {ProbabilityMass<Transform>} */
-    const trueInput = {
+    const trueInput: ProbabilityMass<Transform> = {
       sample: {
         insert: '\'s',
         deleteLeft: 0
@@ -259,8 +257,7 @@ describe('processSimilarity', () => {
     const testSet = build_its_is_set();
     const distribution = [...Object.values(testSet)];
 
-    /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]} */
-    const expectation = [
+    const expectation: CorrectionPredictionTuple[] = [
       {
         ...testSet.its,
         matchLevel: SuggestionSimilarity.sameKey
@@ -289,16 +286,14 @@ describe('processSimilarity', () => {
   });
 
   it(`creates an 'exact'-match suggestion as 'keep' if no exact-match exists`, () => {
-    /** @type {Context} */
-    const context = {
+    const context: Context = {
       left: 'iphon',
       right: '',
       startOfBuffer: true,
       endOfBuffer: true
     };
 
-    /** @type {ProbabilityMass<Transform>} */
-    const trueInput = {
+    const trueInput: ProbabilityMass<Transform> = {
       sample: {
         insert: 'e',
         deleteLeft: 0
@@ -306,8 +301,7 @@ describe('processSimilarity', () => {
       p: 1
     };
 
-    /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-    const iPhone = {
+    const iPhone: CorrectionPredictionTuple = {
       correction: {
         sample: 'iphone',
         p: 0.8
@@ -326,13 +320,11 @@ describe('processSimilarity', () => {
       // matchLevel does not yet exist.
     };
 
-    /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]} */
-    const distribution = [
+    const distribution: CorrectionPredictionTuple[] = [
       iPhone
     ];
 
-    /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple} */
-    const keep_iphone = {
+    const keep_iphone: CorrectionPredictionTuple = {
       correction: {
         sample: 'iphone',
         p: 1
@@ -345,8 +337,7 @@ describe('processSimilarity', () => {
           },
           displayAs: '<iphone>',
           matchesModel: false,
-          tag: 'keep',
-          p: 1
+          tag: 'keep'
         },
         p: 1
       },
@@ -355,8 +346,7 @@ describe('processSimilarity', () => {
     };
 
 
-    /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]} */
-    const expectation = [
+    const expectation: CorrectionPredictionTuple[] = [
       {
         ...keep_iphone,
         matchLevel: SuggestionSimilarity.exact
@@ -380,16 +370,14 @@ describe('processSimilarity', () => {
     // keeps a separate entry for the two versions (or only has the title-cased
     // one).
     it(`differentiates same-keyed suggestions when one only mismatches due to casing`, () => {
-      /** @type {Context} */
-      const context = {
+      const context: Context = {
         left: 'It',
         right: '',
         startOfBuffer: true,
         endOfBuffer: true
       };
 
-      /** @type {ProbabilityMass<Transform>} */
-      const trueInput = {
+      const trueInput: ProbabilityMass<Transform> = {
         sample: {
           insert: '\'s',
           deleteLeft: 0
@@ -408,8 +396,7 @@ describe('processSimilarity', () => {
 
       const distribution = [...Object.values(testSet)];
 
-      /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]} */
-      const expectation = [
+      const expectation: CorrectionPredictionTuple[] = [
         {
           ...testSet.its,
           matchLevel: SuggestionSimilarity.sameKey
@@ -446,16 +433,14 @@ describe('processSimilarity', () => {
 
   describe('without casing', () => {
     it(`does not utilize casing behaviors when checking similarity`, () => {
-      /** @type {Context} */
-      const context = {
+      const context: Context = {
         left: 'It',
         right: '',
         startOfBuffer: true,
         endOfBuffer: true
       };
 
-      /** @type {ProbabilityMass<Transform>} */
-      const trueInput = {
+      const trueInput: ProbabilityMass<Transform> = {
         sample: {
           insert: '\'s',
           deleteLeft: 0
@@ -474,8 +459,7 @@ describe('processSimilarity', () => {
 
       const distribution = [...Object.values(testSet)];
 
-      /** @type {import('#./predict-helpers.js').CorrectionPredictionTuple[]} */
-      const expectation = [
+      const expectation: CorrectionPredictionTuple[] = [
         {
           ...testSet.its,
           matchLevel: SuggestionSimilarity.none
diff --git a/web/src/test/auto/headless/engine/predictive-text/worker-thread/suggestion-casing.tests.ts b/web/src/test/auto/headless/engine/predictive-text/worker-thread/suggestion-casing.tests.ts
new file mode 100644
index 0000000000..dd586eab64
--- /dev/null
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/suggestion-casing.tests.ts
@@ -0,0 +1,161 @@
+/*
+ * Keyman is copyright (C) SIL Global. MIT License.
+ *
+ * Created by jahorton on 2025-08-13.
+ *
+ * Defines simple unit tests for the internal method that applies a
+ * lexical-model's casing rules to generated suggestions.
+ */
+
+import { assert } from 'chai';
+
+import * as wordBreakers from '@keymanapp/models-wordbreakers';
+import { jsonFixture } from '@keymanapp/common-test-resources/model-helpers.mjs';
+import { LexicalModelTypes } from '@keymanapp/common-types';
+
+import { applySuggestionCasing, models } from '@keymanapp/lm-worker/test-index';
+
+import CasingFunction = LexicalModelTypes.CasingFunction;
+import TrieModel = models.TrieModel;
+
+describe('applySuggestionCasing', function() {
+  let plainApplyCasing: CasingFunction = function(caseToApply, text) {
+    switch(caseToApply) {
+      case 'lower':
+        return text.toLowerCase();
+      case 'upper':
+        return text.toUpperCase();
+      case 'initial':
+        return plainApplyCasing('upper', text.charAt(0)) . concat(text.substring(1));
+      default:
+        return text;
+    }
+  };
+
+  var plainCasedModel = new TrieModel(
+    jsonFixture('models/tries/english-1000'), {
+      languageUsesCasing: true,
+      applyCasing: plainApplyCasing,
+      wordBreaker: wordBreakers.default,
+      searchTermToKey: function(text: string) {
+        // We're dealing with very simple English text; no need to normalize or remove diacritics here.
+        return plainApplyCasing('lower', text);
+      }
+    }
+  );
+
+  it('properly cases suggestions with no suggestion root', function() {
+    let suggestion = {
+      transform: {
+        insert: 'the',
+        deleteLeft: 0
+      },
+      displayAs: 'the'
+    };
+
+    applySuggestionCasing(suggestion, '', plainCasedModel, 'initial');
+    assert.equal(suggestion.displayAs, 'The');
+    assert.equal(suggestion.transform.insert, 'The');
+
+    suggestion = {
+      transform: {
+        insert: 'thE',
+        deleteLeft: 0
+      },
+      displayAs: 'thE'
+    };
+
+    applySuggestionCasing(suggestion, '', plainCasedModel, 'initial');
+    assert.equal(suggestion.displayAs, 'ThE');
+    assert.equal(suggestion.transform.insert, 'ThE');
+
+    suggestion = {
+      transform: {
+        insert: 'the',
+        deleteLeft: 0
+      },
+      displayAs: 'the'
+    };
+
+    applySuggestionCasing(suggestion, '', plainCasedModel, 'upper');
+    assert.equal(suggestion.displayAs, 'THE');
+    assert.equal(suggestion.transform.insert, 'THE');
+  });
+
+  it('properly cases suggestions that fully replace the suggestion root', function() {
+    let suggestion = {
+      transform: {
+        insert: 'therefore',
+        deleteLeft: 3
+      },
+      displayAs: 'therefore'
+    };
+
+    applySuggestionCasing(suggestion, 'the', plainCasedModel, 'initial');
+    assert.equal(suggestion.displayAs, 'Therefore');
+    assert.equal(suggestion.transform.insert, 'Therefore');
+
+    suggestion = {
+      transform: {
+        insert: 'thereFore',
+        deleteLeft: 3
+      },
+      displayAs: 'thereFore'
+    };
+
+    applySuggestionCasing(suggestion, 'the', plainCasedModel, 'initial');
+    assert.equal(suggestion.displayAs, 'ThereFore');
+    assert.equal(suggestion.transform.insert, 'ThereFore');
+
+    suggestion = {
+      transform: {
+        insert: 'therefore',
+        deleteLeft: 3
+      },
+      displayAs: 'therefore'
+    };
+
+    applySuggestionCasing(suggestion, 'the', plainCasedModel, 'upper');
+    assert.equal(suggestion.displayAs, 'THEREFORE');
+    assert.equal(suggestion.transform.insert, 'THEREFORE');
+  });
+
+  it('properly cases suggestions that do not fully replace the suggestion root', function() {
+    let suggestion = {
+      transform: {
+        insert: 'erefore',
+        deleteLeft: 1
+      },
+      displayAs: 'therefore'
+    };
+
+    // When integrated, the 'the' string comes from a wordbreak operation on the current context.
+    applySuggestionCasing(suggestion, 'the', plainCasedModel, 'initial');
+    assert.equal(suggestion.displayAs, 'Therefore');
+    assert.equal(suggestion.transform.insert, 'Therefore');
+
+    suggestion = {
+      transform: {
+        insert: 'ereFore',
+        deleteLeft: 1
+      },
+      displayAs: 'thereFore'
+    };
+
+    applySuggestionCasing(suggestion, 'the', plainCasedModel, 'initial');
+    assert.equal(suggestion.displayAs, 'ThereFore');
+    assert.equal(suggestion.transform.insert, 'ThereFore');
+
+    suggestion = {
+      transform: {
+        insert: 'erefore',
+        deleteLeft: 1
+      },
+      displayAs: 'therefore'
+    };
+
+    applySuggestionCasing(suggestion, 'the', plainCasedModel, 'upper');
+    assert.equal(suggestion.displayAs, 'THEREFORE');
+    assert.equal(suggestion.transform.insert, 'THEREFORE');
+  });
+});
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/transform-tokenization.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/transform-tokenization.tests.ts
similarity index 83%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/transform-tokenization.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/transform-tokenization.tests.ts
index 41b2a912de..e048b322d8 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/transform-tokenization.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/transform-tokenization.tests.ts
@@ -1,18 +1,23 @@
 import { assert } from 'chai';
 
 import { default as defaultBreaker } from '@keymanapp/models-wordbreakers';
+import { Token, Tokenization, tokenize } from '@keymanapp/models-templates';
+import { LexicalModelTypes } from '@keymanapp/common-types';
 
-import { tokenize } from '@keymanapp/models-templates';
-import { tokenizeTransform } from '#./correction/transform-tokenization.js';
+import { tokenizeTransform } from '@keymanapp/lm-worker/test-index';
 
-const defaultTokenize = (context) => tokenize(defaultBreaker, context);
+import Context = LexicalModelTypes.Context;
+
+const defaultTokenize = (context: Context) => tokenize(defaultBreaker, context);
 
 describe('tokenizeTransform', () => {
   describe('with default wordbreaking', () => {
     it('properly handles simple token-edit transform', () => {
-      const context = {
+      const context: Context = {
         left: 'an apple a date',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -33,7 +38,9 @@ describe('tokenizeTransform', () => {
     it('properly handles simple token-replacing transform', () => {
       const context = {
         left: 'an apple a date',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -54,7 +61,9 @@ describe('tokenizeTransform', () => {
     it('handles simple token-replacing transform with cross-token deleteLeft', () => {
       const context = {
         left: 'an apple a date',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       // 'an apple any'
@@ -76,7 +85,9 @@ describe('tokenizeTransform', () => {
     it('properly handles a simple appended whitespace', () => {
       const context = {
         left: 'an apple a day',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -103,7 +114,9 @@ describe('tokenizeTransform', () => {
     it('properly handles a simple appended period', () => {
       const context = {
         left: 'an apple a day',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -128,7 +141,9 @@ describe('tokenizeTransform', () => {
     it('handles word-breakable transforms (case 1)', () => {
       const context = {
         left: 'an apple a dat',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -153,7 +168,9 @@ describe('tokenizeTransform', () => {
     it('handles word-breakable transforms (case 2)', () => {
       const context = {
         left: 'an apple a dat',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -179,7 +196,9 @@ describe('tokenizeTransform', () => {
     it('handles complex breakable cases', () => {
       const context = {
         left: 'an apple a date',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       // 'an apple any'
@@ -204,18 +223,20 @@ describe('tokenizeTransform', () => {
   });
 
   describe('with mocked dictionary-based wordbreaking', () => {
-    function mockedTokenization(entries) {
+    function mockedTokenization(entries: string[]) {
       return {
         left: entries.map((text) => {
-          return {text: text}
+          return {text: text} as Token
         })
-      };
+      } as Tokenization;
     }
 
     it('properly handles simple token-edit transform', () => {
       const context = {
         left: 'anappleadate',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -236,7 +257,9 @@ describe('tokenizeTransform', () => {
     it('properly handles simple token-replacing transform', () => {
       const context = {
         left: 'anappleadate',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -257,7 +280,9 @@ describe('tokenizeTransform', () => {
     it('handles simple token-replacing transform with cross-token deleteLeft', () => {
       const context = {
         left: 'anappleadate',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       // 'an apple any'
@@ -279,7 +304,9 @@ describe('tokenizeTransform', () => {
     it('handles word-breakable transforms (case 1)', () => {
       const context = {
         left: 'anappleadat',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -303,7 +330,9 @@ describe('tokenizeTransform', () => {
     it('handles word-breakable transforms (case 2)', () => {
       const context = {
         left: 'anappleadat',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -327,7 +356,9 @@ describe('tokenizeTransform', () => {
     it('handles word-breakable transforms (case 2 alternate output)', () => {
       const context = {
         left: 'anappleadat',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       const editTransform = {
@@ -352,7 +383,9 @@ describe('tokenizeTransform', () => {
     it('handles complex breakable cases', () => {
       const context = {
         left: 'anappleadate',
-        right: ''
+        right: '',
+        startOfBuffer: true,
+        endOfBuffer: true
       };
 
       // 'an apple any'
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/transform-utils.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/transform-utils.tests.ts
similarity index 95%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/transform-utils.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/transform-utils.tests.ts
index d4da4501f4..e7d992ae64 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/transform-utils.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/transform-utils.tests.ts
@@ -1,6 +1,6 @@
 import { assert } from 'chai';
 
-import TransformUtils from '#./transformUtils.js';
+import { TransformUtils } from '@keymanapp/lm-worker/test-index';
 
 describe('TransformUtils', function () {
   describe('isWhitespace', function () {
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-custom-punctuation.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-custom-punctuation.tests.ts
similarity index 92%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-custom-punctuation.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-custom-punctuation.tests.ts
index ee027b907a..9b9ab2c312 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-custom-punctuation.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-custom-punctuation.tests.ts
@@ -4,8 +4,8 @@
 
 import { assert } from 'chai';
 
-import DummyModel from '#./models/dummy-model.js';
-import ModelCompositor from '#./model-compositor.js';
+import { ModelCompositor, models } from '@keymanapp/lm-worker/test-index';
+import DummyModel = models.DummyModel;
 
 describe('Custom Punctuation', function () {
   it('appears in the keep suggestion', async function () {
@@ -31,6 +31,7 @@ describe('Custom Punctuation', function () {
         quotesForKeepSuggestion: {
           open: "«", close: "»"
         },
+        insertAfterWord: ''
       }
     });
 
@@ -76,6 +77,10 @@ describe('Custom Punctuation', function () {
           // U+1680 OGHAM SPACE MARK:
           // it's technically whitespace, but it don't look it!
           insertAfterWord: " ",
+          quotesForKeepSuggestion: {
+            open: "'",
+            close: "'"
+          }
         }
       });
 
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-initialization.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-initialization.tests.ts
similarity index 89%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-initialization.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-initialization.tests.ts
index 3c15543bce..08c5262484 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-initialization.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-initialization.tests.ts
@@ -1,14 +1,22 @@
+import fs from 'node:fs';
+import { createRequire } from 'node:module';
+
 import { assert } from 'chai';
 import sinon from 'sinon';
-import fs from 'fs';
-
-import LMLayerWorker from '#./index.js';
 
 import { configWorker, createMessageEventWithData, importScriptsWith } from '@keymanapp/common-test-resources/model-helpers.mjs';
 
-import { createRequire } from 'module';
+// @ts-ignore
+import { LMLayerWorker } from '@keymanapp/lm-worker/test-index';
+
 const require = createRequire(import.meta.url);
 
+interface MockedContext {
+  onmessage?: () => void;
+  importScripts?: () => void;
+  postMessage: sinon.SinonSpy<any, any>;
+}
+
 // Unit tests for instantiating and initializing the LMLayer Worker in isolation.
 //
 // Although the LMLayerWorker expects to be used inside a DedicatedWorkerGlobalScope,
@@ -18,7 +26,7 @@ describe('LMLayerWorker', function() {
   describe('#constructor()', function() {
     it('should allow for the mocking of postMessage()', function () {
       var fakePostMessage = sinon.fake();
-      var context = {
+      var context: MockedContext = {
         postMessage: fakePostMessage
       };
       context.importScripts = importScriptsWith(context);
@@ -42,7 +50,7 @@ describe('LMLayerWorker', function() {
 
   describe('#onMessage()', function() {
     it('should fail if not given the `message` attribute', function () {
-      var context = {
+      var context: MockedContext = {
         postMessage: sinon.fake()
       };
       context.importScripts = importScriptsWith(context);
@@ -60,9 +68,9 @@ describe('LMLayerWorker', function() {
 
   describe('.install()', function () {
     it('should create a new instance, installed on our global object', function () {
-      var fakeWorkerGlobal = {
+      var fakeWorkerGlobal: MockedContext = {
         onmessage: undefined,
-        postMessage: new sinon.fake(),
+        postMessage: sinon.fake(),
       };
       fakeWorkerGlobal.importScripts = importScriptsWith(fakeWorkerGlobal);
 
@@ -91,7 +99,7 @@ describe('LMLayerWorker', function() {
 
   describe('Message: config', function () {
     it('should disallow any other message', function () {
-      var context = {
+      var context: MockedContext = {
         postMessage: sinon.fake()
       };
       context.importScripts = importScriptsWith(context);
@@ -107,7 +115,7 @@ describe('LMLayerWorker', function() {
     });
 
     it('accepts a capability set and transitions to the "modelless" state', function () {
-      var context = {
+      var context: MockedContext = {
         postMessage: sinon.fake()
       };
       context.importScripts = importScriptsWith(context);
@@ -117,13 +125,13 @@ describe('LMLayerWorker', function() {
       // Trigger the config message
       configWorker(worker);
 
-      assert.equal(worker.state.name, 'modelless');
+      assert.equal(worker.unitTestEndPoints.getStateName(), 'modelless');
     });
   });
 
   describe('Message: load', function () {
     it('should disallow any other message', function () {
-      var context = {
+      var context: MockedContext = {
         postMessage: sinon.fake()
       };
       context.importScripts = importScriptsWith(context);
@@ -142,7 +150,7 @@ describe('LMLayerWorker', function() {
 
     it('should send back a "ready" message when given a file', function () {
       var fakePostMessage = sinon.fake();
-      var context = {
+      var context: MockedContext = {
         postMessage: fakePostMessage
       };
       context.importScripts = importScriptsWith(context);
@@ -165,7 +173,7 @@ describe('LMLayerWorker', function() {
 
     it('should send back a "ready" message when given raw code', function () {
       var fakePostMessage = sinon.fake();
-      var context = {
+      var context: MockedContext = {
         postMessage: fakePostMessage
       };
       context.importScripts = importScriptsWith(context);
@@ -190,7 +198,7 @@ describe('LMLayerWorker', function() {
 
     it('should send back configuration', function () {
       var fakePostMessage = sinon.fake();
-      var context = {
+      var context: MockedContext = {
         postMessage: fakePostMessage
       };
       context.importScripts = importScriptsWith(context);
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-model-compositor.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-model-compositor.tests.ts
similarity index 83%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-model-compositor.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-model-compositor.tests.ts
index 2f310693a9..9aa6940b3b 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-model-compositor.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-model-compositor.tests.ts
@@ -2,16 +2,22 @@
  * Integration tests for the model compositor with the trie model.
  */
 
-import ModelCompositor from '#./model-compositor.js';
-import { toAnnotatedSuggestion } from '#./predict-helpers.js';
-import * as models from '#./models/index.js';
-import * as wordBreakers from '@keymanapp/models-wordbreakers';
-
 import { assert } from 'chai';
 
+import * as wordBreakers from '@keymanapp/models-wordbreakers';
 import { jsonFixture } from '@keymanapp/common-test-resources/model-helpers.mjs';
+import { LexicalModelTypes } from '@keymanapp/common-types';
 
-var TrieModel = models.TrieModel;
+import { ModelCompositor, models, toAnnotatedSuggestion } from '@keymanapp/lm-worker/test-index';
+
+import CasingFunction = LexicalModelTypes.CasingFunction;
+import Context = LexicalModelTypes.Context;
+import Keep = LexicalModelTypes.Keep;
+import LexicalModelPunctuation = LexicalModelTypes.LexicalModelPunctuation
+import QuoteBehavior = models.QuoteBehavior;
+import Suggestion = LexicalModelTypes.Suggestion;
+import Transform = LexicalModelTypes.Transform;
+import TrieModel = models.TrieModel;
 
 describe('ModelCompositor', function() {
   describe('Prediction with 14.0+ models', function() {
@@ -255,154 +261,6 @@ describe('ModelCompositor', function() {
       });
     });
 
-    describe('applySuggestionCasing', function() {
-      let plainApplyCasing = function(caseToApply, text) {
-        switch(caseToApply) {
-          case 'lower':
-            return text.toLowerCase();
-          case 'upper':
-            return text.toUpperCase();
-          case 'initial':
-            return plainApplyCasing('upper', text.charAt(0)) . concat(text.substring(1));
-          default:
-            return text;
-        }
-      };
-
-      var plainCasedModel = new TrieModel(
-        jsonFixture('models/tries/english-1000'), {
-          languageUsesCasing: true,
-          applyCasing: plainApplyCasing,
-          wordBreaker: wordBreakers.default,
-          searchTermToKey: function(text) {
-            // We're dealing with very simple English text; no need to normalize or remove diacritics here.
-            return applyCasing('lower', text);
-          }
-        }
-      );
-
-      it('properly cases suggestions with no suggestion root', function() {
-        var compositor = new ModelCompositor(plainCasedModel, true);
-
-        let suggestion = {
-          transform: {
-            insert: 'the',
-            deleteLeft: 0
-          },
-          displayAs: 'the'
-        };
-
-        compositor.applySuggestionCasing(suggestion, '', 'initial');
-        assert.equal(suggestion.displayAs, 'The');
-        assert.equal(suggestion.transform.insert, 'The');
-
-        suggestion = {
-          transform: {
-            insert: 'thE',
-            deleteLeft: 0
-          },
-          displayAs: 'thE'
-        };
-
-        compositor.applySuggestionCasing(suggestion, '', 'initial');
-        assert.equal(suggestion.displayAs, 'ThE');
-        assert.equal(suggestion.transform.insert, 'ThE');
-
-        suggestion = {
-          transform: {
-            insert: 'the',
-            deleteLeft: 0
-          },
-          displayAs: 'the'
-        };
-
-        compositor.applySuggestionCasing(suggestion, '', 'upper');
-        assert.equal(suggestion.displayAs, 'THE');
-        assert.equal(suggestion.transform.insert, 'THE');
-      });
-
-      it('properly cases suggestions that fully replace the suggestion root', function() {
-        var compositor = new ModelCompositor(plainCasedModel, true);
-
-        let suggestion = {
-          transform: {
-            insert: 'therefore',
-            deleteLeft: 3
-          },
-          displayAs: 'therefore'
-        };
-
-        compositor.applySuggestionCasing(suggestion, 'the', 'initial');
-        assert.equal(suggestion.displayAs, 'Therefore');
-        assert.equal(suggestion.transform.insert, 'Therefore');
-
-        suggestion = {
-          transform: {
-            insert: 'thereFore',
-            deleteLeft: 3
-          },
-          displayAs: 'thereFore'
-        };
-
-        compositor.applySuggestionCasing(suggestion, 'the', 'initial');
-        assert.equal(suggestion.displayAs, 'ThereFore');
-        assert.equal(suggestion.transform.insert, 'ThereFore');
-
-        suggestion = {
-          transform: {
-            insert: 'therefore',
-            deleteLeft: 3
-          },
-          displayAs: 'therefore'
-        };
-
-        compositor.applySuggestionCasing(suggestion, 'the', 'upper');
-        assert.equal(suggestion.displayAs, 'THEREFORE');
-        assert.equal(suggestion.transform.insert, 'THEREFORE');
-      });
-
-      it('properly cases suggestions that do not fully replace the suggestion root', function() {
-        var compositor = new ModelCompositor(plainCasedModel, true);
-
-        let suggestion = {
-          transform: {
-            insert: 'erefore',
-            deleteLeft: 1
-          },
-          displayAs: 'therefore'
-        };
-
-        // When integrated, the 'the' string comes from a wordbreak operation on the current context.
-        compositor.applySuggestionCasing(suggestion, 'the', 'initial');
-        assert.equal(suggestion.displayAs, 'Therefore');
-        assert.equal(suggestion.transform.insert, 'Therefore');
-
-        suggestion = {
-          transform: {
-            insert: 'ereFore',
-            deleteLeft: 1
-          },
-          displayAs: 'thereFore'
-        };
-
-        compositor.applySuggestionCasing(suggestion, 'the', 'initial');
-        assert.equal(suggestion.displayAs, 'ThereFore');
-        assert.equal(suggestion.transform.insert, 'ThereFore');
-
-        suggestion = {
-          transform: {
-            insert: 'erefore',
-            deleteLeft: 1
-          },
-          displayAs: 'therefore'
-        };
-
-        compositor.applySuggestionCasing(suggestion, 'the', 'upper');
-        assert.equal(suggestion.displayAs, 'THEREFORE');
-        assert.equal(suggestion.transform.insert, 'THEREFORE');
-      });
-    });
-
     describe('Model uses default-style keying, no casing', function () {
       var uncasedModel = new TrieModel(
         jsonFixture('models/tries/english-1000'), {
@@ -466,7 +324,7 @@ describe('ModelCompositor', function() {
     });
 
     describe('Model uses default-style keying, provides casing', function () {
-      let applyCasing = function(caseToApply, text) {
+      let applyCasing: CasingFunction = function(caseToApply, text) {
         switch(caseToApply) {
           case 'lower':
             return text.toLowerCase();
@@ -605,9 +463,21 @@ describe('ModelCompositor', function() {
 
   describe('Prediction with legacy Models (12.0 / 13.0)', function() {
     it('should compose suggestions from a fat-fingered keypress (no keying needed)', async function () {
-      var model = new TrieModel(
-        jsonFixture('models/tries/english-1000')
-      );
+      var model = new models.DummyModel({
+        futureSuggestions: [
+          [], [{
+            transform: { insert: 'e', deleteLeft: 0 },
+            displayAs: "the",
+            id: 1,
+            p: 0.7
+          }], [{
+            transform: { insert: 'ree', deleteLeft: 0},
+            displayAs: "three",
+            id: 2,
+            p: 0.3
+          }]
+        ]
+      });
       let compositor = new ModelCompositor(model, true);
 
       // Initialize context
@@ -617,8 +487,8 @@ describe('ModelCompositor', function() {
       await compositor.predict({insert: '', deleteLeft: 0}, context);
 
       // Pretend to fat finger "the" as "thr"
-      var the = { sample: { insert: 'r', deleteLeft: 0}, p: 0.45 };
-      var thr = { sample: { insert: 'e', deleteLeft: 0}, p: 0.55 };
+      var the = { sample: { insert: 'r', deleteLeft: 0 }, p: 0.45 };
+      var thr = { sample: { insert: 'e', deleteLeft: 0 }, p: 0.55 };
       var suggestions = await compositor.predict([thr, the], context);
 
       // Get the top suggest for 'the' and 'thr*'.
@@ -634,44 +504,14 @@ describe('ModelCompositor', function() {
       assert.isAbove(theSuggestion.p, thrSuggestion.p);
     });
 
-    it('should compose suggestions from a fat-fingered keypress (keying needed)', async function () {
-      var model = new TrieModel(
-        jsonFixture('models/tries/english-1000')
-      );
-      let compositor = new ModelCompositor(model, true);
-
-      // Initialize context
-      let context = {
-        left: 'Th', startOfBuffer: false, endOfBuffer: true,
-      };
-      await compositor.predict({insert: '', deleteLeft: 0}, context);
-
-      // Pretend to fat finger "the" as "thr"
-      var the = { sample: { insert: 'r', deleteLeft: 0}, p: 0.45 };
-      var thr = { sample: { insert: 'e', deleteLeft: 0}, p: 0.55 };
-      var suggestions = await compositor.predict([thr, the], context);
-
-      // Get the top suggest for 'the' and 'thr*'.
-      // As of 15.0+, because of #5429, the keep suggestion `"The"` will not be merged
-      // with the model's suggestion of `the`.
-      var capTheSuggestion = suggestions.filter(function (s) { return s.displayAs === '“The”'; })[0];
-      var theSuggestion = suggestions.filter(function (s) { return s.displayAs === 'the'})[0];
-      var thrSuggestion = suggestions.filter(function (s) { return s.displayAs.startsWith('thr'); })[0];
-
-      // Sanity check: do we have actual real-valued probabilities?
-      assert.isAbove(thrSuggestion.p, 0.0);
-      assert.isBelow(thrSuggestion.p, 1.0);
-      assert.isAbove(theSuggestion.p, 0.0);
-      assert.isBelow(theSuggestion.p, 1.0);
-      assert.equal(capTheSuggestion.tag, 'keep'); // The keep suggestion
-      // 'the' should be the intended the result here.
-      assert.isAbove(theSuggestion.p, thrSuggestion.p);
+    it.skip('should compose suggestions from a fat-fingered keypress (keying needed)', async function () {
+      // No known 12.0 / 13.0 model is available that can leverage keying to run this test properly.
     });
   });
 
   // The nomenclature's a minor sneak-peek from child PRs.
   describe('toAnnotatedSuggestion', function() {
-    let baseSuggestion = {
+    let baseSuggestion: Suggestion = {
       transform: {
         insert: 'hello',
         deleteLeft: 0,
@@ -692,14 +532,14 @@ describe('ModelCompositor', function() {
     }
 
     describe("'keep'", function() {
-      let annotationTest = function(punctuation, displayText, quoteStyle) {
+      let annotationTest = function(punctuation: LexicalModelPunctuation, displayText: string, quoteStyle?: QuoteBehavior) {
         let options = {
           punctuation: punctuation
         };
 
         let model = new models.DummyModel(options);
 
-        var keep;
+        var keep: Keep;
         if(quoteStyle) {
           keep = toAnnotatedSuggestion(model, baseSuggestion, 'keep', quoteStyle);
         } else {
@@ -735,7 +575,7 @@ describe('ModelCompositor', function() {
   });
 
   describe('acceptSuggestion', function() {
-    let acceptanceTest = function(punctuation, suggestion, context, postTransform) {
+    let acceptanceTest = function(punctuation: LexicalModelPunctuation, suggestion: Suggestion, context: Context, postTransform?: Transform) {
       let options = {
         punctuation: punctuation
       };
@@ -923,12 +763,6 @@ describe('ModelCompositor', function() {
   });
 
   describe('acceptReversion', function() {
-    let executeAcceptance = function(model, suggestion, context, postTransform) {
-      let compositor = new ModelCompositor(model, true);
-
-      return {compositor: compositor, reversion: compositor.acceptSuggestion(suggestion, context, postTransform)};
-    }
-
     let englishPunctuation = {
       quotesForKeepSuggestion: { open: `“`, close: `”`},
       insertAfterWord: ' '
@@ -1074,7 +908,7 @@ describe('ModelCompositor', function() {
       assert.equal(compositor.contextTracker.item(1), suggestionContextState);
 
       // The replacement should no longer be marked for the context-tracking token.
-      assert.equal(suggestionContextState.tokenization.tail.appliedSuggestionId);
+      assert.isNotOk(suggestionContextState.tokenization.tail.appliedSuggestionId);
     });
   });
 });
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-predict-dummy.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-predict-dummy.tests.ts
similarity index 96%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-predict-dummy.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-predict-dummy.tests.ts
index f552f6e29d..536c8d266f 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-predict-dummy.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-predict-dummy.tests.ts
@@ -3,10 +3,12 @@
  */
 
 import { assert } from 'chai';
-import DummyModel from '#./models/dummy-model.js';
 
 import { emptyContext, iGotDistractedByHazel, zeroTransform } from '@keymanapp/common-test-resources/model-helpers.mjs';
 
+import { models } from '@keymanapp/lm-worker/test-index'
+import DummyModel = models.DummyModel;
+
 describe('LMLayerWorker dummy model', function() {
   describe('instantiation', function () {
     it('can be instantiated with no arguments', function () {
diff --git a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-predict.js b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-predict.tests.ts
similarity index 79%
rename from web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-predict.js
rename to web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-predict.tests.ts
index abfe3a1a5d..8099215bdf 100644
--- a/web/src/engine/predictive-text/worker-thread/src/tests/mocha/cases/worker-predict.js
+++ b/web/src/test/auto/headless/engine/predictive-text/worker-thread/worker-predict.tests.ts
@@ -1,33 +1,43 @@
-import { assert } from 'chai';
+
+import { createRequire } from 'node:module';
 import sinon from 'sinon';
 
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
-
-import LMLayerWorker from '#./index.js';
-
+import { LexicalModelTypes } from '@keymanapp/common-types';
 import { configWorker, createMessageEventWithData, emptyContext, iGotDistractedByHazel,
          importScriptsWith, randomToken, zeroTransform } from '@keymanapp/common-test-resources/model-helpers.mjs';
 import { timedPromise } from '@keymanapp/web-utils';
 
+import { LMLayerWorker } from '@keymanapp/lm-worker/test-index';
+import { OutgoingMessage } from '@keymanapp/lm-message-types';
+
+import Suggestion = LexicalModelTypes.Suggestion;
+
+const require = createRequire(import.meta.url);
+
+interface MockedContext {
+  onmessage?: () => void;
+  importScripts?: () => void;
+  postMessage: (e: any) => void;
+}
+
 describe('LMLayerWorker', function () {
   describe('#predict()', function () {
     it('should send back suggestions', async function () {
       // Initialize the worker with a model that will produce one suggestion.
       var fakePostMessage = sinon.fake();
-      var filteredFakePostMessage = function(event) {
+      var filteredFakePostMessage = function(event: OutgoingMessage) {
         if(event.message == 'suggestions') {
           let suggestions = event.suggestions;
 
           // Strip any IDs set by the model compositor.
-          suggestions.forEach(function(suggestion) {
+          suggestions.forEach(function(suggestion: Suggestion) {
             delete suggestion.id;
           });
         }
 
         fakePostMessage(event);
       }
-      var context = {
+      var context: MockedContext = {
         postMessage: filteredFakePostMessage
       };
       context.importScripts = importScriptsWith(context);
diff --git a/web/src/engine/predictive-text/templates/tests/fixtures/tries/accented.json b/web/src/test/auto/resources/fixtures/tries/accented.json
similarity index 100%
rename from web/src/engine/predictive-text/templates/tests/fixtures/tries/accented.json
rename to web/src/test/auto/resources/fixtures/tries/accented.json
diff --git a/web/src/engine/predictive-text/templates/tests/fixtures/tries/english-1000.json b/web/src/test/auto/resources/fixtures/tries/english-1000.json
similarity index 100%
rename from web/src/engine/predictive-text/templates/tests/fixtures/tries/english-1000.json
rename to web/src/test/auto/resources/fixtures/tries/english-1000.json
diff --git a/web/src/engine/predictive-text/templates/tests/fixtures/tries/smp-apple.json b/web/src/test/auto/resources/fixtures/tries/smp-apple.json
similarity index 100%
rename from web/src/engine/predictive-text/templates/tests/fixtures/tries/smp-apple.json
rename to web/src/test/auto/resources/fixtures/tries/smp-apple.json
diff --git a/web/src/test/auto/tsconfig.json b/web/src/test/auto/tsconfig.json
index f88f147539..066b6446f5 100644
--- a/web/src/test/auto/tsconfig.json
+++ b/web/src/test/auto/tsconfig.json
@@ -12,6 +12,7 @@
     "dom/**/*.ts",
     "headless/**/*.ts",
     "integrated/**/*.ts",
-    "resources/**/*.ts"
+    "resources/**/*.ts",
+    "predictive-text/**/*.ts"
   ]
 }
diff --git a/web/src/test/manual/build.sh b/web/src/test/manual/build.sh
index 8b564480b8..b2eed53d0a 100755
--- a/web/src/test/manual/build.sh
+++ b/web/src/test/manual/build.sh
@@ -3,10 +3,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 # ################################ Main script ################################
 
diff --git a/web/src/test/manual/embed/android-harness/build.sh b/web/src/test/manual/embed/android-harness/build.sh
index 31c53e73a0..d672fd4489 100755
--- a/web/src/test/manual/embed/android-harness/build.sh
+++ b/web/src/test/manual/embed/android-harness/build.sh
@@ -3,9 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
+
 builder_describe "Builds a debug-host page simulating Keyman Android's WebView setup for KMW use" \
   "@/common/web/keyman-version" \
   "@/web/src/app/webview" \
@@ -28,7 +30,7 @@ fi
 ### CONFIGURE ACTIONS
 
 if builder_start_action configure; then
-  verify_npm_setup
+  node_select_version_and_npm_ci
   builder_finish_action success configure
 fi
 
diff --git a/web/src/tools/build.sh b/web/src/tools/build.sh
index b9d1e27bda..6572cc7e26 100755
--- a/web/src/tools/build.sh
+++ b/web/src/tools/build.sh
@@ -5,10 +5,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 ################################ Main script ################################
 
diff --git a/web/src/tools/building/check-build-size.sh b/web/src/tools/building/check-build-size.sh
index 5b96459035..ce19e0b226 100755
--- a/web/src/tools/building/check-build-size.sh
+++ b/web/src/tools/building/check-build-size.sh
@@ -14,7 +14,7 @@ SIZE_THRESHOLD=1024
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 . "$KEYMAN_ROOT/resources/build/jq.inc.sh"
 . "$KEYMAN_ROOT/resources/build/github.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
diff --git a/web/src/tools/building/sourcemap-root/build.sh b/web/src/tools/building/sourcemap-root/build.sh
index 3e9a9759f1..8e5db5e73f 100755
--- a/web/src/tools/building/sourcemap-root/build.sh
+++ b/web/src/tools/building/sourcemap-root/build.sh
@@ -5,10 +5,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -26,6 +27,6 @@ builder_parse "$@"
 
 ### CONFIGURE ACTIONS
 
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action clean      rm -rf ../../../../build/tools/building/sourcemap-root
 builder_run_action build      tsc --build tsconfig.json
\ No newline at end of file
diff --git a/web/src/tools/es-bundling/build.sh b/web/src/tools/es-bundling/build.sh
index ec2deee862..3a05714120 100755
--- a/web/src/tools/es-bundling/build.sh
+++ b/web/src/tools/es-bundling/build.sh
@@ -3,10 +3,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -21,6 +22,6 @@ builder_describe_outputs \
 
 builder_parse "$@"
 
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action clean      rm -rf build/
 builder_run_action build      tsc -b tsconfig.json
diff --git a/web/src/tools/testing/bulk_rendering/build.sh b/web/src/tools/testing/bulk_rendering/build.sh
index 53ad43da17..6c93d9862c 100755
--- a/web/src/tools/testing/bulk_rendering/build.sh
+++ b/web/src/tools/testing/bulk_rendering/build.sh
@@ -5,12 +5,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=tools/testing/bulk_rendering
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -39,6 +40,6 @@ function do_build ( ) {
      "${KEYMAN_ROOT}/web/build/$SUBPROJECT_NAME/lib/zip.min.js"
 }
 
-builder_run_action configure  verify_npm_setup
+builder_run_action configure  node_select_version_and_npm_ci
 builder_run_action clean      rm -rf ../../../../build/$SUBPROJECT_NAME
 builder_run_action build      do_build
\ No newline at end of file
diff --git a/web/src/tools/testing/recorder-core/build.sh b/web/src/tools/testing/recorder-core/build.sh
index 0b89ce7701..4bd56ee2b8 100755
--- a/web/src/tools/testing/recorder-core/build.sh
+++ b/web/src/tools/testing/recorder-core/build.sh
@@ -7,10 +7,11 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -29,7 +30,7 @@ builder_describe_outputs \
 builder_parse "$@"
 
 if builder_start_action configure; then
-  verify_npm_setup
+  node_select_version_and_npm_ci
   builder_finish_action success configure
 fi
 
diff --git a/web/src/tools/testing/recorder/build.sh b/web/src/tools/testing/recorder/build.sh
index 91f27d09e5..7a9b0187ec 100755
--- a/web/src/tools/testing/recorder/build.sh
+++ b/web/src/tools/testing/recorder/build.sh
@@ -5,12 +5,13 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 SUBPROJECT_NAME=tools/testing/recorder
 . "$KEYMAN_ROOT/web/common.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
+. "$KEYMAN_ROOT/resources/build/node.inc.sh"
 
 ################################ Main script ################################
 
@@ -37,6 +38,6 @@ do_build ( ) {
     --format esm
 }
 
-builder_run_action configure verify_npm_setup
+builder_run_action configure node_select_version_and_npm_ci
 builder_run_action clean rm -rf ../../../../build/$SUBPROJECT_NAME/
 builder_run_action build do_build
\ No newline at end of file
diff --git a/web/test.sh b/web/test.sh
index ea4f9e0abc..9c877e8d6e 100755
--- a/web/test.sh
+++ b/web/test.sh
@@ -5,11 +5,11 @@ set -eu
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 # This script runs from its own folder
 cd "$THIS_SCRIPT_PATH"
diff --git a/windows/build.sh b/windows/build.sh
index b75967a4ce..74269abcc3 100755
--- a/windows/build.sh
+++ b/windows/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD UTILITY SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../resources/build/builder-basic.inc.sh"
 ## END STANDARD UTILITY SCRIPT INCLUDE
 
 # This is not a builder script but calls a builder script
diff --git a/windows/src/build.sh b/windows/src/build.sh
index c6cbbaa82b..8fd078cd55 100755
--- a/windows/src/build.sh
+++ b/windows/src/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 builder_describe \
   "Keyman for Windows" \
diff --git a/windows/src/buildtools/sentry-upload-difs.sh b/windows/src/buildtools/sentry-upload-difs.sh
index 3d6b9faadb..1856f03db7 100755
--- a/windows/src/buildtools/sentry-upload-difs.sh
+++ b/windows/src/buildtools/sentry-upload-difs.sh
@@ -20,7 +20,7 @@ set -u
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 cd "$KEYMAN_ROOT/windows/src"
diff --git a/windows/src/desktop/build.sh b/windows/src/desktop/build.sh
index 96d0324cfd..bcfd7cdc20 100755
--- a/windows/src/desktop/build.sh
+++ b/windows/src/desktop/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 . "$KEYMAN_ROOT/resources/build/build-utils-ci.inc.sh"
 . "$KEYMAN_ROOT/developer/src/packages.inc.sh"
 
diff --git a/windows/src/desktop/help/build.sh b/windows/src/desktop/help/build.sh
index 807f7047ab..619fc85fc9 100755
--- a/windows/src/desktop/help/build.sh
+++ b/windows/src/desktop/help/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+. "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 builder_describe "Help documentation for Keyman for Windows" \
   clean configure build test install \
diff --git a/windows/src/desktop/inst/build.sh b/windows/src/desktop/inst/build.sh
index bcedcef95c..f3fefa9c58 100755
--- a/windows/src/desktop/inst/build.sh
+++ b/windows/src/desktop/inst/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-source "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+source "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 builder_describe "Installation files for Keyman for Windows" \
   @/common/windows/data \
@@ -21,7 +21,7 @@ builder_parse "$@"
 
 . "$KEYMAN_ROOT/resources/build/win/environment.inc.sh"
 . "$KEYMAN_ROOT/resources/build/win/wix.inc.sh"
-. "$KEYMAN_ROOT/resources/build/win/zip.inc.sh"
+. "$KEYMAN_ROOT/resources/build/zip.inc.sh"
 
 # In dev environments, we'll hack the tier to alpha; CI sets this for us in real builds.
 if [[ -z ${KEYMAN_TIER+x} ]]; then
@@ -53,7 +53,7 @@ function do_build_desktop_resources() {
 }
 
 function do_publish() {
-  verify-program-signatures
+  builder_if_release_build_level verify-program-signatures
 
   "$KEYMAN_ROOT/common/windows/cef-checkout.sh"
 
@@ -73,6 +73,7 @@ function do_publish() {
     -sice:ICE82 -sice:ICE80 \
     -nologo \
     -dWixUILicenseRtf=License.rtf \
+    "$WIXLIGHTCOMPRESSION" \
     -out keymandesktop.msi -ext WixUIExtension \
     keymandesktop.wixobj desktopui.wixobj cef.wixobj locale.wixobj
 
@@ -85,7 +86,7 @@ function do_publish() {
   # Build self-extracting archive
   #
   create-setup-inf
-  wzzip keymandesktop.zip keymandesktop.msi license.html setup.inf
+  add_zip_files keymandesktop.zip keymandesktop.msi license.html setup.inf
   rm -f setup.inf
   cat "$WINDOWS_PROGRAM_APP/setup-redist.exe" keymandesktop.zip > keymandesktop.exe
   rm -f keymandesktop.zip
@@ -106,10 +107,14 @@ function copy-installer() {
   cp keymandesktop.exe "$KEYMAN_ROOT/windows/release/${KEYMAN_VERSION}/keyman-${KEYMAN_VERSION}.exe"
   cp "$WINDOWS_PROGRAM_APP/setup.exe" "$KEYMAN_ROOT/windows/release/${KEYMAN_VERSION}/setup.exe"
 
-  verify-installer-signatures
+  builder_if_release_build_level verify-installer-signatures
 
   # Copy the unsigned setup.exe for use in bundling scenarios; zip it up for clarity
-  wzzip "$KEYMAN_ROOT/windows/release/${KEYMAN_VERSION}/setup-redist.zip" "$WINDOWS_PROGRAM_APP/setup-redist.exe"
+  (
+    # shellcheck disable=SC2164
+    cd "${WINDOWS_PROGRAM_APP}"
+    add_zip_files "${KEYMAN_ROOT}/windows/release/${KEYMAN_VERSION}/setup-redist.zip" "setup-redist.exe"
+  )
 }
 
 function verify-program-signatures() {
diff --git a/windows/src/desktop/insthelp/build.sh b/windows/src/desktop/insthelp/build.sh
index de21cb4014..d57a4b935f 100755
--- a/windows/src/desktop/insthelp/build.sh
+++ b/windows/src/desktop/insthelp/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman installation helper module" \
@@ -33,7 +33,7 @@ function do_build() {
   tds2dbg "$WIN32_TARGET"
 
   cp "$WIN32_TARGET" "$WINDOWS_PROGRAM_APP"
-  cp "$WIN32_TARGET_PATH/insthelp.dbg" "$WINDOWS_DEBUGPATH_APP/insthelp.dbg"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/insthelp.dbg" "$WINDOWS_DEBUGPATH_APP/insthelp.dbg"
 }
 
 function do_publish() {
diff --git a/windows/src/desktop/kmbrowserhost/build.sh b/windows/src/desktop/kmbrowserhost/build.sh
index f716c29b74..ab309a09b0 100755
--- a/windows/src/desktop/kmbrowserhost/build.sh
+++ b/windows/src/desktop/kmbrowserhost/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Chromium browser host process for Keyman" \
@@ -32,7 +32,7 @@ function do_build() {
   tds2dbg "$WIN32_TARGET"
 
   cp "$WIN32_TARGET" "$WINDOWS_PROGRAM_APP"
-  cp "$WIN32_TARGET_PATH/kmbrowserhost.dbg" "$WINDOWS_DEBUGPATH_APP/kmbrowserhost.dbg"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/kmbrowserhost.dbg" "$WINDOWS_DEBUGPATH_APP/kmbrowserhost.dbg"
 }
 
 function do_publish() {
diff --git a/windows/src/desktop/kmconfig/build.sh b/windows/src/desktop/kmconfig/build.sh
index 8507f68ac5..bfe07e5868 100755
--- a/windows/src/desktop/kmconfig/build.sh
+++ b/windows/src/desktop/kmconfig/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman low-level configuration tool" \
@@ -32,7 +32,7 @@ function do_build() {
   tds2dbg "$WIN32_TARGET"
 
   cp "$WIN32_TARGET" "$WINDOWS_PROGRAM_APP"
-  cp "$WIN32_TARGET_PATH/kmconfig.dbg" "$WINDOWS_DEBUGPATH_APP/kmconfig.dbg"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/kmconfig.dbg" "$WINDOWS_DEBUGPATH_APP/kmconfig.dbg"
 }
 
 function do_publish() {
diff --git a/windows/src/desktop/kmshell/build.sh b/windows/src/desktop/kmshell/build.sh
index 3ce57b9088..f4e95eadc0 100755
--- a/windows/src/desktop/kmshell/build.sh
+++ b/windows/src/desktop/kmshell/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman Configuration" \
@@ -39,7 +39,7 @@ function do_build() {
   tds2dbg "$WIN32_TARGET"
 
   cp "$WIN32_TARGET" "$WINDOWS_PROGRAM_APP"
-  cp "$WIN32_TARGET_PATH/kmshell.dbg" "$WINDOWS_DEBUGPATH_APP/kmshell.dbg"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/kmshell.dbg" "$WINDOWS_DEBUGPATH_APP/kmshell.dbg"
 
   do_build_data
 }
diff --git a/windows/src/desktop/kmshell/locale/es-ES/strings.xml b/windows/src/desktop/kmshell/locale/es-ES/strings.xml
index 144f49fd26..711760afc9 100644
--- a/windows/src/desktop/kmshell/locale/es-ES/strings.xml
+++ b/windows/src/desktop/kmshell/locale/es-ES/strings.xml
@@ -466,14 +466,22 @@
   <!-- String Type: PlainText -->
   <!-- Introduced: 18.0.168 -->
   <string name="S_Updates_Available" comment="Update tab - informs user updates are available ">Hay actualizaciones disponibles que se aplicarán cuando se reinicie Windows:</string>
+  <!-- Context: Configuration Dialog - Update tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.217 -->
+  <string name="S_Update_Current_Version" comment="Update tab Currently Installed Version">Versión instalada actualmente</string>
+  <!-- Context: Configuration Dialog - Update tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.217 -->
+  <string name="S_Update_New_Version" comment="Update tab New Version">Nueva versión</string>
   <!-- Context: Configuration Dialog - Update tab pop up -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 18.0.168 -->
-  <string name="S_Update_Restart_Req" comment="Update tab pop up - warns user restart will require restart ">Actualizar ahora requerirá un reinicio del ordenador.</string>
+  <string name="S_Update_Restart_Req" comment="Update tab pop up - warns user restart will require restart ">Instalar la actualización ahora requerirá reiniciar su equipo antes de poder usar Keyman de nuevo. ¿Actualizar ahora?</string>
   <!-- Context: Configuration Dialog - Update on boot pop up -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 18.0.168 -->
-  <string name="S_Ready_To_Install" comment="Update on boot pop up - inform user update about to install">Una actualización de Keyman está lista para instalarse.</string>
+  <string name="S_Ready_To_Install" comment="Update on boot pop up - inform user update about to install">Se ha descargado una actualización de Keyman y está lista para instalar.</string>
   <!-- Context: Download Keyboard Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
@@ -569,6 +577,10 @@
   <string name="S_Update" comment="Update tab name">Actualizar</string>
   <!-- Context: Online Update Dialog -->
   <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.230.0 -->
+  <string name="S_Update_Now" comment="Update now button">Actualizar ahora</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
   <string name="S_Update_Title" comment="Update dialog title, where Keyman = product name">Keyman actualizado - Componentes disponibles</string>
   <!-- Context: Online Update Dialog -->
@@ -638,12 +650,20 @@
   <!-- String Type: FormatString -->
   <!-- Introduced: 8.0.288.0 -->
   <string name="SKUpdate_IconMenuExit" comment="Update icon - exit menu item">Salir verificar actualizaciones en línea</string>
+  <!-- Context: Install Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 17.0233.0 -->
+  <string name="S_Later" comment="Apply Update Later">Más tarde</string>
   <!-- Context: Update Dialog -->
   <!-- String Type: FormatString -->
   <!-- Introduced: 17.0233.0 -->
   <string name="S_Button_Update_ApplyNow" comment="Apply update now button - update dialog">Aplicar actualización ahora</string>
   <!-- Context: Update Dialog -->
   <!-- String Type: FormatString -->
+  <!-- Introduced: 18.0.217 -->
+  <string name="S_Button_Update_InstallNow" comment="Install update now button - update dialog">¿Instalar la actualización ahora</string>
+  <!-- Context: Update Dialog -->
+  <!-- String Type: FormatString -->
   <!-- Introduced: 17.0233.0 -->
   <string name="S_Button_Update_CheckNow" comment="Check for updates now button - update dialog">Buscar nuevas actualizaciones</string>
   <!-- Context: Splash Dialog -->
diff --git a/windows/src/desktop/kmshell/main/Keyman.System.DownloadUpdate.pas b/windows/src/desktop/kmshell/main/Keyman.System.DownloadUpdate.pas
index 2e6ddb4ffe..6ee1d454f3 100644
--- a/windows/src/desktop/kmshell/main/Keyman.System.DownloadUpdate.pas
+++ b/windows/src/desktop/kmshell/main/Keyman.System.DownloadUpdate.pas
@@ -159,7 +159,7 @@ begin
     else
     begin
       ErrorLogMessage('DoDownloadUpdates Failed to download' + Params.InstallURL);
-      TKeymanSentryClient.Breadcrumb('error', 'Download failded for keyboard: '+  Params.InstallURL, 'cli.download');
+      TKeymanSentryClient.Breadcrumb('error', 'Download failded for Keyman Update: '+  Params.InstallURL, 'cli.download');
     end;
   end
   else
diff --git a/windows/src/desktop/kmshell/main/Keyman.System.RemoteUpdateCheck.pas b/windows/src/desktop/kmshell/main/Keyman.System.RemoteUpdateCheck.pas
index 0e4cf2cf51..dc41ae59bc 100644
--- a/windows/src/desktop/kmshell/main/Keyman.System.RemoteUpdateCheck.pas
+++ b/windows/src/desktop/kmshell/main/Keyman.System.RemoteUpdateCheck.pas
@@ -21,7 +21,15 @@ const
 type
   ERemoteUpdateCheck = class(Exception);
 
-  TRemoteUpdateCheckResult = (wucUnknown, wucSuccess, wucNoUpdates, wucFailure, wucOffline);
+  (**
+   * wucUnknown: The result of the check is unknown.
+   * wucUpdateAvailable: The check was successful and a keyboard package or Keyman Installer file is available.
+   * wucNotChecked: The check was not performed, due to time between check value
+   * wucNoUpdates: The check was successful but no updates are available.
+   * wucFailure: The check failed due to an error.
+   * wucOffline: The user is offline, so the check could not be performed.
+   *)
+  TRemoteUpdateCheckResult = (wucUnknown, wucUpdateAvailable, wucNotChecked, wucNoUpdates, wucFailure, wucOffline);
 
   TRemoteUpdateCheckDownloadParams = record
     TotalSize: Integer;
@@ -141,7 +149,7 @@ begin
   proceed := ConfigCheckContinue;
   if not proceed and not FForce then
   begin
-    Result := wucNoUpdates;
+    Result := wucNotChecked;
     Exit;
   end;
 
@@ -184,7 +192,10 @@ begin
         if ucr.Parse(http.Response.MessageBodyAsString, 'bundle', CKeymanVersionInfo.Version) then
         begin
           TUpdateCheckStorage.SaveUpdateCacheData(ucr);
-          Result := wucSuccess;
+          if TUpdateCheckStorage.HasKeyboardPackages(ucr) or TUpdateCheckStorage.HasKeymanInstallFileUpdate(ucr) then
+            Result := wucUpdateAvailable
+          else
+            Result := wucNoUpdates;
         end
         else
         begin
diff --git a/windows/src/desktop/kmshell/main/Keyman.System.UpdateCheckStorage.pas b/windows/src/desktop/kmshell/main/Keyman.System.UpdateCheckStorage.pas
index a7a822df7c..5a09d35068 100644
--- a/windows/src/desktop/kmshell/main/Keyman.System.UpdateCheckStorage.pas
+++ b/windows/src/desktop/kmshell/main/Keyman.System.UpdateCheckStorage.pas
@@ -10,11 +10,25 @@ type
   private
     class function MetadataFilename: string; static;
   public
-    class function HasUpdates: Boolean; static;
     class function LoadUpdateCacheData(var data: TUpdateCheckResponse): Boolean; static;
     class procedure SaveUpdateCacheData(const data: TUpdateCheckResponse); static;
     class function HasKeyboardPackages(const data: TUpdateCheckResponse): Boolean; static;
+
+    (** In most cases the function `HasKeymanInstallFileUpdate` will be required.
+        @return  True  if there is keyman installer file in the metadata cache file *)
     class function HasKeymanInstallFile(const data: TUpdateCheckResponse): Boolean; static;
+
+    (** @return  True   if there is keyman installer file in the metadata cache file and it is newer
+                        then the current installed version. `TUpdateCheckResponse.DoParse`
+                        checks this and sets `ucrsUpdateReady` flag.
+    *)
+    class function HasKeymanInstallFileUpdate(const data: TUpdateCheckResponse): Boolean; static;
+
+    (** @return  True   if there is at least one keyboard package or a newer Keyman installer file in the Metadata
+                        cache file.
+                        *)
+    class function CheckMetaDataForUpdate: Boolean; static;
+
   end;
 
 implementation
@@ -40,15 +54,19 @@ begin
   data.SaveToFile(MetadataFilename);
 end;
 
-class function TUpdateCheckStorage.HasUpdates: Boolean;
+class function TUpdateCheckStorage.CheckMetaDataForUpdate: Boolean;
+var
+  ucr: TUpdateCheckResponse;
 begin
-  Result := FileExists(MetadataFilename);
+  Result := TUpdateCheckStorage.LoadUpdateCacheData(ucr) and
+            (TUpdateCheckStorage.HasKeyboardPackages(ucr) or
+             TUpdateCheckStorage.HasKeymanInstallFileUpdate(ucr));
 end;
 
 class function TUpdateCheckStorage.LoadUpdateCacheData(var data: TUpdateCheckResponse): Boolean;
 begin
   Result :=
-    HasUpdates and
+    FileExists(MetadataFilename) and
     data.LoadFromFile(MetadataFilename, 'bundle', CKeymanVersionInfo.Version);
 end;
 
@@ -79,4 +97,9 @@ begin
     Result := False
 end;
 
+class function TUpdateCheckStorage.HasKeymanInstallFileUpdate(const data: TUpdateCheckResponse): Boolean;
+begin
+  Result := HasKeymanInstallFile(data) and (data.Status = ucrsUpdateReady);
+end;
+
 end.
diff --git a/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas b/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas
index 9f1b4b73d7..5c89e795d7 100644
--- a/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas
+++ b/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas
@@ -618,12 +618,11 @@ begin
     CheckForUpdates.Free;
   end;
 
-  { Response OK and Update is available }
-  if Result = wucSuccess then
+  if (Result = wucUpdateAvailable) then
   begin
     ChangeState(UpdateAvailableState);
   end;
-  // else staty in idle state
+  // else stay in idle state
 end;
 
 function IdleState.HandleKmShell;
@@ -641,7 +640,7 @@ begin
     CheckForUpdates.Free;
   end;
   { Response OK and Update is available }
-  if UpdateCheckResult = wucSuccess then
+  if UpdateCheckResult = wucUpdateAvailable then
   begin
     ChangeState(UpdateAvailableState);
   end;
@@ -723,7 +722,7 @@ begin
   finally
     CheckForUpdates.Free;
   end;
-  if Result <> wucSuccess then
+  if Result = wucFailure then
     begin
       KL.Log('UpdateAvailableState.HandleCheck CheckForUpdates not successful: '+
         GetEnumName(TypeInfo(TUpdateState), Ord(Result)));
@@ -762,7 +761,6 @@ end;
 procedure DownloadingState.EnterState;
 var
   DownloadResult: Boolean;
-  RetryCount: Integer;
   FMutex: TKeymanMutex;
 begin
   // Enter DownloadingState
@@ -778,12 +776,16 @@ begin
       TKeymanSentryClient.Breadcrumb('default', 'DownloadingState.EnterState: Unable to get Mutex download process exists', 'update');
       Exit;
     end;
+    // verify there is an update available
+    if not TUpdateCheckStorage.CheckMetaDataForUpdate then
+    begin
+      // Return to Idle state
+      bucStateContext.RemoveCachedFiles;
+      ChangeState(IdleState);
+      Exit;
+    end;
 
-    RetryCount := 0;
-    repeat
-      DownloadResult := DownloadUpdatesBackground;
-      Inc(RetryCount);
-    until DownloadResult or (RetryCount >= 3);
+    DownloadResult := DownloadUpdatesBackground;
     FMutex.ReleaseOwnership;
   finally
     FreeAndNil(FMutex);
@@ -791,10 +793,10 @@ begin
 
   if (not DownloadResult) then
   begin
-    // Failed three times in this process; return to the
+    // Failed download; return to the
     // IdleState to wait 'CheckPeriod' before trying again
     TKeymanSentryClient.Client.MessageEvent(Sentry.Client.SENTRY_LEVEL_ERROR,
-    'Error Updates not downloaded after 3 attempts');
+    'Error Updates not downloaded');
     bucStateContext.RemoveCachedFiles;
     ChangeState(IdleState);
   end
@@ -919,16 +921,15 @@ begin
     CheckForUpdates.Free;
   end;
   { Response OK and go back to update available so files can be downloaded }
-  if Result = wucSuccess then
+  // TODO: This actually needs to check if the updates available are newer than the already downloaded updates
+
+  if Result = wucUpdateAvailable then
   begin
     ChangeState(UpdateAvailableState);
   end;
 end;
 
 function WaitingRestartState.HandleKmShell;
-var
-  ucr: TUpdateCheckResponse;
-  hasPackages, hasKeymanInstall: Boolean;
 begin
   // Still can't go if keyman has run
   if HasKeymanRun then
@@ -937,14 +938,7 @@ begin
   end
   else
   begin
-    hasPackages := False;
-    hasKeymanInstall := False;
-    if (TUpdateCheckStorage.LoadUpdateCacheData(ucr)) then
-    begin
-      hasPackages := TUpdateCheckStorage.HasKeyboardPackages(ucr);
-      hasKeymanInstall := TUpdateCheckStorage.HasKeymanInstallFile(ucr);
-    end;
-    if not (hasPackages Or hasKeymanInstall) then
+    if not (TUpdateCheckStorage.CheckMetaDataForUpdate) then
     begin
       // Return to Idle state and check for Updates state
       ChangeState(IdleState);
@@ -1120,7 +1114,7 @@ begin
   if (TUpdateCheckStorage.LoadUpdateCacheData(ucr)) then
   begin
     hasPackages := TUpdateCheckStorage.HasKeyboardPackages(ucr);
-    hasKeymanInstall := TUpdateCheckStorage.HasKeymanInstallFile(ucr);
+    hasKeymanInstall := TUpdateCheckStorage.HasKeymanInstallFileUpdate(ucr);
   end;
   { Notes: The reason packages (keyboards) is installed first is
   because we are trying to reduce the number of times the user has
@@ -1184,7 +1178,7 @@ var
   hasKeymanInstall : Boolean;
 begin
   TUpdateCheckStorage.LoadUpdateCacheData(ucr);
-  hasKeymanInstall := TUpdateCheckStorage.HasKeymanInstallFile(ucr);
+  hasKeymanInstall := TUpdateCheckStorage.HasKeymanInstallFileUpdate(ucr);
   // This event should only be reached in elevated process if not then
   // move on to just installing Keyman
   if not kmcom.SystemInfo.IsAdministrator then
@@ -1202,6 +1196,12 @@ begin
   if hasKeymanInstall then
   begin
     DoInstallKeyman;
+  end
+  else
+  begin
+    // There is no Keyman installer we can return to the IdleState
+    bucStateContext.RemoveCachedFiles;
+    ChangeState(IdleState);
   end;
 end;
 
diff --git a/windows/src/desktop/locale/crowdin-control.sh b/windows/src/desktop/locale/crowdin-control.sh
index 34c7608377..766edc1a72 100755
--- a/windows/src/desktop/locale/crowdin-control.sh
+++ b/windows/src/desktop/locale/crowdin-control.sh
@@ -12,7 +12,7 @@ set -u
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 LOCALE_DIR="$KEYMAN_ROOT/windows/src/desktop/locale/"
diff --git a/windows/src/desktop/setup/build.sh b/windows/src/desktop/setup/build.sh
index bb72965c86..5b97dda8ba 100755
--- a/windows/src/desktop/setup/build.sh
+++ b/windows/src/desktop/setup/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman Setup bootstrap" \
@@ -43,7 +43,7 @@ function do_build() {
   cp "$WIN32_TARGET" "$WINDOWS_PROGRAM_APP"
   # setup-redist.exe does not get signed as it is intended for a bundled installer
   cp "$WIN32_TARGET" "$WINDOWS_PROGRAM_APP/setup-redist.exe"
-  cp "$WIN32_TARGET_PATH/setup.dbg" "$WINDOWS_DEBUGPATH_APP/setup.dbg"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/setup.dbg" "$WINDOWS_DEBUGPATH_APP/setup.dbg"
 }
 
 function do_build_debug_manifest() {
diff --git a/windows/src/engine/build.sh b/windows/src/engine/build.sh
index 9c9a6d2d0f..524ad91437 100755
--- a/windows/src/engine/build.sh
+++ b/windows/src/engine/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/windows/src/engine/inst/build.sh b/windows/src/engine/inst/build.sh
index 22cd5954a6..3f98ed7688 100755
--- a/windows/src/engine/inst/build.sh
+++ b/windows/src/engine/inst/build.sh
@@ -2,10 +2,10 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-source "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
+source "$KEYMAN_ROOT/resources/build/utils.inc.sh"
 
 builder_describe "Installation files for Keyman Engine for Windows" \
   clean configure build test publish
@@ -20,7 +20,6 @@ builder_parse "$@"
 
 . "$KEYMAN_ROOT/resources/build/win/environment.inc.sh"
 . "$KEYMAN_ROOT/resources/build/win/wix.inc.sh"
-. "$KEYMAN_ROOT/resources/build/win/zip.inc.sh"
 
 # In dev environments, we'll hack the tier to alpha; CI sets this for us in real builds.
 if [[ -z ${KEYMAN_TIER+x} ]]; then
@@ -30,7 +29,7 @@ fi
 #-------------------------------------------------------------------------------------------------------------------
 
 function do_publish() {
-  verify-program-signatures
+  builder_if_release_build_level verify-program-signatures
 
   #
   # Build the installation archive
@@ -38,7 +37,12 @@ function do_publish() {
   "$WIXCANDLE" -dKEYMAN_VERSION=$KEYMAN_VERSION_WIN -dRELEASE=$KEYMAN_VERSION_RELEASE -ext WixUtilExtension keymanengine.wxs components.wxs
 
   # warning 1072 relates to Error table defined by WixUtilExtension. Doesn't really affect us.
-  "$WIXLIGHT" -sw1072 -ext WixUtilExtension keymanengine.wixobj components.wixobj -o keymanengine.msm
+  "$WIXLIGHT" \
+    -sw1072 \
+    -ext WixUtilExtension \
+    "$WIXLIGHTCOMPRESSION" \
+    keymanengine.wixobj components.wixobj \
+    -o keymanengine.msm
 
   #
   # Sign the installation archive
diff --git a/windows/src/engine/insthelper/build.sh b/windows/src/engine/insthelper/build.sh
index a31fc605fc..62aec62586 100755
--- a/windows/src/engine/insthelper/build.sh
+++ b/windows/src/engine/insthelper/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Installation helper module" \
@@ -31,7 +31,7 @@ function do_build() {
   tds2dbg "$WIN32_TARGET"
 
   cp "$WIN32_TARGET" "$WINDOWS_PROGRAM_ENGINE"
-  cp "$WIN32_TARGET_PATH/insthelper.dbg" "$WINDOWS_DEBUGPATH_ENGINE/insthelper.dbg"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/insthelper.dbg" "$WINDOWS_DEBUGPATH_ENGINE/insthelper.dbg"
 }
 
 function do_publish() {
diff --git a/windows/src/engine/keyman/build.sh b/windows/src/engine/keyman/build.sh
index 5f142c350c..efdaf0698c 100755
--- a/windows/src/engine/keyman/build.sh
+++ b/windows/src/engine/keyman/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman main host process (32-bit)" \
@@ -42,7 +42,7 @@ function do_build() {
   tds2dbg "$WIN32_TARGET"
 
   cp "$WIN32_TARGET" "$WINDOWS_PROGRAM_ENGINE"
-  cp "$WIN32_TARGET_PATH/keyman.dbg" "$WINDOWS_DEBUGPATH_ENGINE/keyman.dbg"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/keyman.dbg" "$WINDOWS_DEBUGPATH_ENGINE/keyman.dbg"
 
   # Also copy sentry files here
   cp "$KEYMAN_ROOT/common/windows/delphi/ext/sentry/sentry.dll" \
diff --git a/windows/src/engine/keyman/langswitch/LangSwitchManager.pas b/windows/src/engine/keyman/langswitch/LangSwitchManager.pas
index 80da078728..31481be316 100644
--- a/windows/src/engine/keyman/langswitch/LangSwitchManager.pas
+++ b/windows/src/engine/keyman/langswitch/LangSwitchManager.pas
@@ -1,4 +1,4 @@
-(*
+(*
   Name:             LangSwitchManager
   Copyright:        Copyright (C) SIL International.
   Documentation:
@@ -47,6 +47,7 @@ unit LangSwitchManager;
 interface
 
 uses
+  ErrorControlledRegistry,
   System.Classes,
   System.Contnrs,
   System.SysUtils,
@@ -230,6 +231,19 @@ type
     FLanguageToggle: string;
     FLayoutToggle: string;
     procedure LoadCurrentHotkey;
+    (**
+     * Ensures that the specified registry value has a valid string data type.
+     * If the registry value exists but is not of type `rdString` or `rdExpandString`,
+     * the function deletes the existing value and writes a default string value
+     * of `'3'`.
+     *
+     * @param    RegistryKey   The registry key object wrapper used to access the registry.
+     * @param    ValueName     The name of the registry value to check and correct.
+     *
+     * @returns  True if the data type was incorrect and the value was reset;
+     *           False if the value did not exist or was already a valid string type.
+     *)
+    function  FixRegistryDataType(RegistryKey: TRegistryErrorControlled; const ValueName: string): Boolean;
     procedure DisableWindowsHotkey;
     procedure RestoreWindowsHotkey;
   public
@@ -251,7 +265,6 @@ uses
   InterfaceHotkeys,
   kmint,
   LoadIndirectStringUnit,
-  ErrorControlledRegistry,
   Registry,
   RegistryKeys,
   UfrmKeyman7Main,
@@ -981,42 +994,76 @@ begin
   FCurrentHotkey := FindHotkey(kmcom.Hotkeys);
 end;
 
+function TLangSwitchConfiguration.FixRegistryDataType(
+  RegistryKey: TRegistryErrorControlled;
+  const ValueName: string
+): Boolean;
+var
+  RegType: TRegDataType;
+  const CHotkeyNotAssigned = '3';
+begin
+  Result := False;
+
+  if RegistryKey.ValueExists(ValueName) then
+  begin
+    RegType := RegistryKey.GetDataType(ValueName);
+    if not ((RegType = rdString) or (RegType = rdExpandString)) then
+    begin
+      RegistryKey.DeleteValue(ValueName);
+      RegistryKey.WriteString(ValueName, CHotkeyNotAssigned);
+      Result := True;
+    end;
+  end;
+
+end;
+
 procedure TLangSwitchConfiguration.DisableWindowsHotkey;
 var
   MatchValue: string;
+  KeyboardToggleReg: TRegistryErrorControlled;
   FReset: Boolean;
+  const CHotkeyNotAssigned = '3';
 begin
   if FCurrentHotkey = (HK_ALT or HK_SHIFT) then MatchValue := '1'
   else if FCurrentHotkey = (HK_CTRL or HK_SHIFT) then MatchValue := '2'
   else Exit;
 
-  FLanguageToggle := '3';
-  FLayoutToggle := '3';
+  FLanguageToggle := CHotkeyNotAssigned;
+  FLayoutToggle := CHotkeyNotAssigned;
 
   FReset := False;
 
-  with TRegistryErrorControlled.Create do  // I2890
+  KeyboardToggleReg := TRegistryErrorControlled.Create; // I2890
   try
-    if not OpenKey(SRegKey_KeyboardLayoutToggle, True) then  // I2890
-      RaiseLastRegistryError;
+    if not KeyboardToggleReg.OpenKey(SRegKey_KeyboardLayoutToggle, True) then  // I2890
+      KeyboardToggleReg.RaiseLastRegistryError;
+    // Fix potential corrupted registry keys
+    if FixRegistryDataType(KeyboardToggleReg, SRegValue_Toggle_Hotkey) then
+      FReset := True;
+    if FixRegistryDataType(KeyboardToggleReg, SRegValue_Toggle_LanguageHotkey) then
+      FReset := True;
+    if FixRegistryDataType(KeyboardToggleReg, SRegValue_Toggle_LayoutHotkey) then
+      FReset := True;
 
-    if ValueExists(SRegValue_Toggle_Hotkey) then FLanguageToggle := ReadString(SRegValue_Toggle_Hotkey);
+    if KeyboardToggleReg.ValueExists(SRegValue_Toggle_Hotkey) then
+      FLanguageToggle := KeyboardToggleReg.ReadString(SRegValue_Toggle_Hotkey);
     if FLanguageToggle = MatchValue then
     begin
-      WriteString(SRegValue_Toggle_Hotkey, '3');
-      WriteString(SRegValue_Toggle_LanguageHotkey, '3');
+      KeyboardToggleReg.WriteString(SRegValue_Toggle_Hotkey, CHotkeyNotAssigned);
+      KeyboardToggleReg.WriteString(SRegValue_Toggle_LanguageHotkey, CHotkeyNotAssigned);
       FReset := True;
     end;
 
-    if ValueExists(SRegValue_Toggle_LayoutHotkey) then FLayoutToggle := ReadString(SRegValue_Toggle_LayoutHotkey);
+    if KeyboardToggleReg.ValueExists(SRegValue_Toggle_LayoutHotkey) then
+      FLayoutToggle := KeyboardToggleReg.ReadString(SRegValue_Toggle_LayoutHotkey);
 
     if FLayoutToggle = MatchValue then
     begin
-      WriteString(SRegValue_Toggle_LayoutHotkey, '3');
+      KeyboardToggleReg.WriteString(SRegValue_Toggle_LayoutHotkey, CHotkeyNotAssigned);
       FReset := True;
     end;
   finally
-    Free;
+    KeyboardToggleReg.Free;
   end;
 
   if FReset then SystemParametersInfo(SPI_SETLANGTOGGLE, 0, nil, 0);
@@ -1024,31 +1071,42 @@ end;
 
 procedure TLangSwitchConfiguration.RestoreWindowsHotkey;
 var
-  FReset: Boolean;
+  FReset, Changed: Boolean;
+  KeyboardToggleReg: TRegistryErrorControlled;
 begin
   FReset := False;
 
   if FLanguageToggle = '' then Exit;
 
-  with TRegistryErrorControlled.Create do  // I2890
+  KeyboardToggleReg := TRegistryErrorControlled.Create; // I2890
   try
-    if not OpenKey(SRegKey_KeyboardLayoutToggle, True) then  // I2890
-      RaiseLastRegistryError;
+    if not KeyboardToggleReg.OpenKey(SRegKey_KeyboardLayoutToggle, True) then  // I2890
+      KeyboardToggleReg.RaiseLastRegistryError;
 
-    if not ValueExists(SRegValue_Toggle_Hotkey) or (ReadString(SRegValue_Toggle_Hotkey) <> FLanguageToggle) then
+    // Fix potential corrupted registry keys
+    if FixRegistryDataType(KeyboardToggleReg, SRegValue_Toggle_Hotkey) then
+      FReset := True;
+    if FixRegistryDataType(KeyboardToggleReg, SRegValue_Toggle_LanguageHotkey) then
+      FReset := True;
+    if FixRegistryDataType(KeyboardToggleReg, SRegValue_Toggle_LayoutHotkey) then
+      FReset := True;
+
+    if not KeyboardToggleReg.ValueExists(SRegValue_Toggle_Hotkey) or
+      (KeyboardToggleReg.ReadString(SRegValue_Toggle_Hotkey) <> FLanguageToggle) then
     begin
-      WriteString(SRegValue_Toggle_Hotkey, FLanguageToggle);
-      WriteString(SRegValue_Toggle_LanguageHotkey, FLanguageToggle);
+      KeyboardToggleReg.WriteString(SRegValue_Toggle_Hotkey, FLanguageToggle);
+      KeyboardToggleReg.WriteString(SRegValue_Toggle_LanguageHotkey, FLanguageToggle);
       FReset := True;
     end;
 
-    if not ValueExists(SRegValue_Toggle_LayoutHotkey) or (ReadString(SRegValue_Toggle_LayoutHotkey) <> FLayoutToggle) then
+    if not KeyboardToggleReg.ValueExists(SRegValue_Toggle_LayoutHotkey) or
+      (KeyboardToggleReg.ReadString(SRegValue_Toggle_LayoutHotkey) <> FLayoutToggle) then
     begin
-      WriteString(SRegValue_Toggle_LayoutHotkey, FLayoutToggle);
+      KeyboardToggleReg.WriteString(SRegValue_Toggle_LayoutHotkey, FLayoutToggle);
       FReset := True;
     end;
   finally
-    Free;
+    KeyboardToggleReg.Free;
   end;
 
   if FReset then
diff --git a/windows/src/engine/keyman32/build.sh b/windows/src/engine/keyman32/build.sh
index c452809958..1c52948921 100755
--- a/windows/src/engine/keyman32/build.sh
+++ b/windows/src/engine/keyman32/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keystroke processing engine" \
@@ -41,7 +41,7 @@ function do_build_x86() {
   build_version.res
   vs_msbuild keyman32.vcxproj //t:Build "//p:Platform=Win32"
   cp "$WIN32_TARGET" "$WINDOWS_PROGRAM_ENGINE"
-  cp "$WIN32_TARGET_PATH/keyman32.pdb" "$WINDOWS_DEBUGPATH_ENGINE"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/keyman32.pdb" "$WINDOWS_DEBUGPATH_ENGINE"
 }
 
 function do_build_x64() {
@@ -49,7 +49,7 @@ function do_build_x64() {
   run_in_vs_env rc version64.rc
   vs_msbuild keyman32.vcxproj //t:Build "//p:Platform=x64"
   cp "$X64_TARGET" "$WINDOWS_PROGRAM_ENGINE"
-  cp "$X64_TARGET_PATH/keyman64.pdb" "$WINDOWS_DEBUGPATH_ENGINE"
+  builder_if_release_build_level cp "$X64_TARGET_PATH/keyman64.pdb" "$WINDOWS_DEBUGPATH_ENGINE"
 }
 
 function do_publish_x86() {
diff --git a/windows/src/engine/keymanmc/build.sh b/windows/src/engine/keymanmc/build.sh
index 10fc74c65e..8ad933abb7 100755
--- a/windows/src/engine/keymanmc/build.sh
+++ b/windows/src/engine/keymanmc/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Message library for Event Viewer" \
diff --git a/windows/src/engine/keymanx64/build.sh b/windows/src/engine/keymanx64/build.sh
index 35c7ad470b..b893b07b26 100755
--- a/windows/src/engine/keymanx64/build.sh
+++ b/windows/src/engine/keymanx64/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Keyman main host process (64-bit)" \
@@ -33,7 +33,7 @@ function do_build() {
   build_manifest.res
   vs_msbuild keymanx64.vcxproj //t:Build "//p:Platform=x64"
   cp "$X64_TARGET" "$WINDOWS_PROGRAM_ENGINE"
-  cp "$X64_TARGET_PATH/keymanx64.pdb" "$WINDOWS_DEBUGPATH_ENGINE"
+  builder_if_release_build_level cp "$X64_TARGET_PATH/keymanx64.pdb" "$WINDOWS_DEBUGPATH_ENGINE"
 }
 
 function do_publish() {
diff --git a/windows/src/engine/kmcomapi/build.sh b/windows/src/engine/kmcomapi/build.sh
index b808bc4d5b..935cb91c6a 100755
--- a/windows/src/engine/kmcomapi/build.sh
+++ b/windows/src/engine/kmcomapi/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "COM API library" \
@@ -44,7 +44,7 @@ function do_build() {
   mv -f "$WIN64_TARGET_PATH/kmcomapi.dll" "$WIN64_TARGET_PATH/kmcomapi.x64.dll"
 
   cp "$WIN32_TARGET" "$WINDOWS_PROGRAM_ENGINE"
-  cp "$WIN32_TARGET_PATH/kmcomapi.dbg" "$WINDOWS_DEBUGPATH_ENGINE/kmcomapi.dbg"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/kmcomapi.dbg" "$WINDOWS_DEBUGPATH_ENGINE/kmcomapi.dbg"
   cp "$WIN64_TARGET_PATH/kmcomapi.x64.dll" "$WINDOWS_PROGRAM_ENGINE/kmcomapi.x64.dll"
 
   # x64 Delphi symbols not supported: cp "$WIN64_TARGET_PATH/kmcomapi.dbg" "$WINDOWS_PROGRAM_ENGINE/kmcomapi.x64.dbg"
diff --git a/windows/src/engine/kmrefresh/build.sh b/windows/src/engine/kmrefresh/build.sh
index b04d53f043..47a1310209 100755
--- a/windows/src/engine/kmrefresh/build.sh
+++ b/windows/src/engine/kmrefresh/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Helper app to refresh Windows language settings" \
@@ -34,9 +34,9 @@ function do_build() {
   vs_msbuild kmrefresh.vcxproj //t:Build "//p:Platform=Win32"
   vs_msbuild kmrefresh.vcxproj //t:Build "//p:Platform=x64"
   cp "$WIN32_TARGET" "$WINDOWS_PROGRAM_ENGINE"
-  cp "$WIN32_TARGET_PATH/kmrefresh.x86.pdb" "$WINDOWS_DEBUGPATH_ENGINE"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/kmrefresh.x86.pdb" "$WINDOWS_DEBUGPATH_ENGINE"
   cp "$X64_TARGET" "$WINDOWS_PROGRAM_ENGINE"
-  cp "$X64_TARGET_PATH/kmrefresh.x64.pdb" "$WINDOWS_DEBUGPATH_ENGINE"
+  builder_if_release_build_level cp "$X64_TARGET_PATH/kmrefresh.x64.pdb" "$WINDOWS_DEBUGPATH_ENGINE"
 }
 
 function do_publish() {
diff --git a/windows/src/engine/kmtip/build.sh b/windows/src/engine/kmtip/build.sh
index 346a2a9678..082125373e 100755
--- a/windows/src/engine/kmtip/build.sh
+++ b/windows/src/engine/kmtip/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Text Services Framework Text Input Processor" \
@@ -35,9 +35,9 @@ function do_build() {
   vs_msbuild kmtip.vcxproj //t:Build "//p:Platform=Win32"
   vs_msbuild kmtip.vcxproj //t:Build "//p:Platform=x64"
   cp "$WIN32_TARGET" "$WINDOWS_PROGRAM_ENGINE"
-  cp "$WIN32_TARGET_PATH/kmtip.pdb" "$WINDOWS_DEBUGPATH_ENGINE"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/kmtip.pdb" "$WINDOWS_DEBUGPATH_ENGINE"
   cp "$X64_TARGET" "$WINDOWS_PROGRAM_ENGINE"
-  cp "$X64_TARGET_PATH/kmtip64.pdb" "$WINDOWS_DEBUGPATH_ENGINE"
+  builder_if_release_build_level cp "$X64_TARGET_PATH/kmtip64.pdb" "$WINDOWS_DEBUGPATH_ENGINE"
 }
 
 function do_publish() {
diff --git a/windows/src/engine/mcompile/build.sh b/windows/src/engine/mcompile/build.sh
index f3a79e0079..919391e2ab 100755
--- a/windows/src/engine/mcompile/build.sh
+++ b/windows/src/engine/mcompile/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Helper app to refresh Windows language settings" \
@@ -33,7 +33,7 @@ function do_build() {
   build_manifest.res
   vs_msbuild mcompile.vcxproj //t:Build "//p:Platform=Win32"
   cp "$WIN32_TARGET" "$WINDOWS_PROGRAM_ENGINE"
-  cp "$WIN32_TARGET_PATH/mcompile.pdb" "$WINDOWS_DEBUGPATH_ENGINE"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/mcompile.pdb" "$WINDOWS_DEBUGPATH_ENGINE"
 }
 
 function do_publish() {
diff --git a/windows/src/engine/testhost/build.sh b/windows/src/engine/testhost/build.sh
index ea9ef97c54..2ff6b844c2 100755
--- a/windows/src/engine/testhost/build.sh
+++ b/windows/src/engine/testhost/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test application for interacting with Keyman Engine" \
diff --git a/windows/src/engine/tsysinfo/UfrmEmail.pas b/windows/src/engine/tsysinfo/UfrmEmail.pas
index 0999e7f2c7..ec096cc057 100644
--- a/windows/src/engine/tsysinfo/UfrmEmail.pas
+++ b/windows/src/engine/tsysinfo/UfrmEmail.pas
@@ -7,12 +7,12 @@
 
   Modified Date:    8 Jun 2012
   Authors:          mcdurdin
-  Related Files:    
-  Dependencies:     
+  Related Files:
+  Dependencies:
 
-  Bugs:             
-  Todo:             
-  Notes:            
+  Bugs:
+  Todo:
+  Notes:
   History:          13 May 2005 - mcdurdin - Integrated into kmshell from tsysinfo
                     16 Aug 2005 - mcdurdin - Add privacy statement
                     20 Jul 2008 - mcdurdin - I1554 - Don't require password for tsysinfo
@@ -136,6 +136,11 @@ begin
       Request.UrlPath := API_Path_SubmitDiag;
 
       Upload;
+      if Response.StatusCode = 413 then
+      begin
+        ShowMessage('The diagnostic report file was too large: '+IntToStr(Response.StatusCode)+ '. Contact us via the Keyman Community Forum for help.');
+        Exit;
+      end;
       if Response.StatusCode <> 200 then
       begin
         ShowMessage('The report was not successfully sent. An error was returned: '+IntToStr(Response.StatusCode));
diff --git a/windows/src/engine/tsysinfo/build.sh b/windows/src/engine/tsysinfo/build.sh
index 01688a6a70..e3390b899b 100755
--- a/windows/src/engine/tsysinfo/build.sh
+++ b/windows/src/engine/tsysinfo/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Diagnostics (32-bit)" \
@@ -47,7 +47,7 @@ function do_build() {
 
   cp "$WIN32_TARGET" "$WINDOWS_PROGRAM_ENGINE"
   cp *.xslt "$WINDOWS_PROGRAM_ENGINE/"
-  cp "$WIN32_TARGET_PATH/tsysinfo.dbg" "$WINDOWS_DEBUGPATH_ENGINE/tsysinfo.dbg"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/tsysinfo.dbg" "$WINDOWS_DEBUGPATH_ENGINE/tsysinfo.dbg"
 }
 
 function do_publish() {
diff --git a/windows/src/engine/tsysinfo/sysinfo_main.pas b/windows/src/engine/tsysinfo/sysinfo_main.pas
index 3f411e36f8..b1916be9a7 100644
--- a/windows/src/engine/tsysinfo/sysinfo_main.pas
+++ b/windows/src/engine/tsysinfo/sysinfo_main.pas
@@ -343,56 +343,17 @@ end;
 procedure TfrmDiagnostics.mnuSendToKeymanClick(Sender: TObject);
 var
   ffilename: string;
-  i: Integer;
-  f: TSearchRec;
-  FTotalSize: Int64;
-  FSavedFileList: string;
-  FDeleteFiles: Boolean;
 begin
   ffilename := TempFileName('.tsi');
-
-  FTotalSize := 0;
-
-  for i := 0 to FSIList.Files.Count - 1 do
-  begin
-    if FindFirst(FSIList.Files[i], 0, f) = 0 then
-    begin
-      FTotalSize := FTotalSize + f.Size;
-      FindClose(f);
-    end
-  end;
-
-  FSavedFileList := FSIList.Files.Text;
-
-  FDeleteFiles := False; // I2240
-
-  if FTotalSize > 1024 * 1024 * 8 then // 8MB
-  begin
-    case MessageDlg('The attached files are very large (' +
-      FileSizeKB(FTotalSize) +
-      ').  Do you want to send them - this may take some time?', mtConfirmation,
-      mbYesNoCancel, 0) of
-      mrYes:
-        FDeleteFiles := True;
-      mrNo:
-        FSIList.Files.Text := '';
-      mrCancel:
-        Exit;
-    end;
-  end
-  else
-    FDeleteFiles := True; // I2240
+  // No longer sending log files to Keyman via this upload method
+  FSIList.Files.Clear;
 
   FSIList.Save(ffilename);
 
-  FSIList.Files.Text := FSavedFileList;
-
   with TfrmEmail.Create(Self) do
     try
       AttachFile := ffilename;
       if ShowModal = mrOk then
-        if FDeleteFiles then
-          DeleteDiagFiles; // I2240
     finally
       DeleteFile(ffilename);
       Free;
diff --git a/windows/src/engine/tsysinfox64/build.sh b/windows/src/engine/tsysinfox64/build.sh
index b9a38be7c3..0a97e01c22 100755
--- a/windows/src/engine/tsysinfox64/build.sh
+++ b/windows/src/engine/tsysinfox64/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Diagnostics (64-bit)" \
diff --git a/windows/src/global/delphi/build.sh b/windows/src/global/delphi/build.sh
index 5628d216d4..34e5f0875b 100755
--- a/windows/src/global/delphi/build.sh
+++ b/windows/src/global/delphi/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/windows/src/support/build.sh b/windows/src/support/build.sh
index f9f20f1716..af4d26a9d4 100755
--- a/windows/src/support/build.sh
+++ b/windows/src/support/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/windows/src/support/etl2log/build.sh b/windows/src/support/etl2log/build.sh
index e2fdee1acd..21ac7ee659 100755
--- a/windows/src/support/etl2log/build.sh
+++ b/windows/src/support/etl2log/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "etl2log" \
@@ -31,7 +31,7 @@ function do_build() {
   build_version.res
   vs_msbuild etl2log.vcxproj //t:Build "//p:Platform=Win32"
   cp "$WIN32_TARGET" "$WINDOWS_PROGRAM_SUPPORT"
-  cp "$WIN32_TARGET_PATH/etl2log.pdb" "$WINDOWS_DEBUGPATH_SUPPORT"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/etl2log.pdb" "$WINDOWS_DEBUGPATH_SUPPORT"
 }
 
 builder_run_action clean:project        do_clean
diff --git a/windows/src/support/oskbulkrenderer/build.sh b/windows/src/support/oskbulkrenderer/build.sh
index 7d7dc22918..2b139be912 100755
--- a/windows/src/support/oskbulkrenderer/build.sh
+++ b/windows/src/support/oskbulkrenderer/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "oskbuildrenderer" \
diff --git a/windows/src/support/texteditor/build.sh b/windows/src/support/texteditor/build.sh
index 312ee1d0f4..6d58124a5d 100755
--- a/windows/src/support/texteditor/build.sh
+++ b/windows/src/support/texteditor/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "texteditor" \
@@ -34,8 +34,8 @@ function do_build() {
   vs_msbuild Editor.vcxproj //t:Build "//p:Platform=x64"
   cp "$WIN32_TARGET" "$WINDOWS_PROGRAM_SUPPORT"
   cp "$X64_TARGET" "$WINDOWS_PROGRAM_SUPPORT"
-  cp "$WIN32_TARGET_PATH/editor32.pdb" "$WINDOWS_DEBUGPATH_SUPPORT"
-  cp "$X64_TARGET_PATH/editor64.pdb" "$WINDOWS_DEBUGPATH_SUPPORT"
+  builder_if_release_build_level cp "$WIN32_TARGET_PATH/editor32.pdb" "$WINDOWS_DEBUGPATH_SUPPORT"
+  builder_if_release_build_level cp "$X64_TARGET_PATH/editor64.pdb" "$WINDOWS_DEBUGPATH_SUPPORT"
 }
 
 builder_run_action clean:project        do_clean
diff --git a/windows/src/test/manual-tests/i18n-check-unused-strings/i18n-check-unused-strings.sh b/windows/src/test/manual-tests/i18n-check-unused-strings/i18n-check-unused-strings.sh
index fabddb3e03..6c343bddba 100755
--- a/windows/src/test/manual-tests/i18n-check-unused-strings/i18n-check-unused-strings.sh
+++ b/windows/src/test/manual-tests/i18n-check-unused-strings/i18n-check-unused-strings.sh
@@ -21,7 +21,7 @@ set -u # die on undefined variables
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/build-utils.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-basic.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 # Preparation
diff --git a/windows/src/test/unit-tests/androidstringtokeymanlocalestring/build.sh b/windows/src/test/unit-tests/androidstringtokeymanlocalestring/build.sh
index e8e1bd47ca..d905bb3002 100755
--- a/windows/src/test/unit-tests/androidstringtokeymanlocalestring/build.sh
+++ b/windows/src/test/unit-tests/androidstringtokeymanlocalestring/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test android locale string conversion to Keyman locale string" clean configure build test
diff --git a/windows/src/test/unit-tests/build.sh b/windows/src/test/unit-tests/build.sh
index d62f29a041..ca0d5bfb29 100755
--- a/windows/src/test/unit-tests/build.sh
+++ b/windows/src/test/unit-tests/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe \
diff --git a/windows/src/test/unit-tests/group-helper-rsp19902/build.sh b/windows/src/test/unit-tests/group-helper-rsp19902/build.sh
index dba7f65df4..7946bc3e0e 100755
--- a/windows/src/test/unit-tests/group-helper-rsp19902/build.sh
+++ b/windows/src/test/unit-tests/group-helper-rsp19902/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test RSP-19902 workaround" clean configure build test
diff --git a/windows/src/test/unit-tests/jsonutil/build.sh b/windows/src/test/unit-tests/jsonutil/build.sh
index 2773d710eb..907fc6ca86 100755
--- a/windows/src/test/unit-tests/jsonutil/build.sh
+++ b/windows/src/test/unit-tests/jsonutil/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test JSON utils" clean configure build test
diff --git a/windows/src/test/unit-tests/shared-data/build.sh b/windows/src/test/unit-tests/shared-data/build.sh
index ee4230ecd8..0262202238 100755
--- a/windows/src/test/unit-tests/shared-data/build.sh
+++ b/windows/src/test/unit-tests/shared-data/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "test shared data consistency" \
diff --git a/windows/src/test/unit-tests/shared-data/cpp/build.sh b/windows/src/test/unit-tests/shared-data/cpp/build.sh
index 71597fbf2b..8f1afce9d3 100755
--- a/windows/src/test/unit-tests/shared-data/cpp/build.sh
+++ b/windows/src/test/unit-tests/shared-data/cpp/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "shared data C++" clean configure build
diff --git a/windows/src/test/unit-tests/shared-data/delphi/build.sh b/windows/src/test/unit-tests/shared-data/delphi/build.sh
index bc2dae2fba..4c0968fcec 100755
--- a/windows/src/test/unit-tests/shared-data/delphi/build.sh
+++ b/windows/src/test/unit-tests/shared-data/delphi/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "shared data Delphi" clean configure build
diff --git a/windows/src/test/unit-tests/standards-data/build.sh b/windows/src/test/unit-tests/standards-data/build.sh
index e610a5faed..f744bf3875 100755
--- a/windows/src/test/unit-tests/standards-data/build.sh
+++ b/windows/src/test/unit-tests/standards-data/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test standards data import compliance" clean configure build test
diff --git a/windows/src/test/unit-tests/ui-language-manager/build.sh b/windows/src/test/unit-tests/ui-language-manager/build.sh
index a27cd5dc1f..62383ec4ec 100755
--- a/windows/src/test/unit-tests/ui-language-manager/build.sh
+++ b/windows/src/test/unit-tests/ui-language-manager/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test UI language manager" clean configure build test
diff --git a/windows/src/test/unit-tests/windows-setup/build.sh b/windows/src/test/unit-tests/windows-setup/build.sh
index dad789c810..ffc83ea8c2 100755
--- a/windows/src/test/unit-tests/windows-setup/build.sh
+++ b/windows/src/test/unit-tests/windows-setup/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD BUILD SCRIPT INCLUDE
 # adjust relative paths as necessary
 THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
+. "${THIS_SCRIPT%/*}/../../../../../resources/build/builder-full.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "Test Setup" clean configure build test