diff --git a/HISTORY.md b/HISTORY.md
index 9de791f041..03bd4cf1a8 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,9 @@
 # Keyman Version History
 
+## 19.0.10 alpha 2025-03-01
+
+* chore: merge beta into master B18S2 (#13391)
+
 ## 19.0.9 alpha 2025-02-27
 
 * docs: move node.js before Emscripten (#13366)
@@ -42,6 +46,102 @@
 * refactor(windows): rename `TKeymanMutex.MutexOwned` to `TakeOwnership` and add `ReleaseOwnership` (#13168)
 * chore: increment to alpha 19.0 (#13187)
 
+## 18.0.203 beta 2025-02-28
+
+* feat(windows): keyman configuration icon refresh (#13294)
+* fix(windows): if kmshell is "silent" don't start a Keyman update (#13330)
+* chore(windows): Update crowdin strings for Khmer (#13364)
+* docs: clean up links in builder.md (#13328)
+* chore: add build.sh edit action for Delphi projects (#13327)
+* fix(developer): handle line breaks in debugger correctly (#13334)
+* fix(developer): use U+0001 for deadkey markers in the debugger (#13336)
+* feat(developer): use .kps folder as initial dir for Add Files (#13324)
+* fix(developer): verify `context(n)` offsets are valid in kmcmplib (#13308)
+* chore(core): add unit tests to validate `nul` with `index` and `context` (#13311)
+* fix(core): include `nul` in context offset calculations in kmx processor (#13314)
+* fix(developer): include `nul` in offset calculations for kmw v10 compiler (#13326)
+
+## 18.0.202 beta 2025-02-27
+
+* fix(android): Direct user to switch system IME when WebView fails (#13352)
+* fix(android): Filter out SocketTimeoutExceptions (#13353)
+* refactor(linux): extract method for setting up mocks in tests (#13355)
+* chore(linux): update to current Debian policy version (#13362)
+* fix(developer): prevent double action of editor hotkeys in debugger (#13345)
+* fix(linux): ignore DBusException during install and uninstall (#13356)
+* fix(linux): ignore exception when fcitx5-configtool is not found (#13363)
+* fix(developer): prevent simultaneous opening of the same project by two processes (#13341)
+* chore: add a workflow to automatically close linked issues (#13369)
+
+## 18.0.201 beta 2025-02-26
+
+* fix(web): prevent cookie-default behavior from mangling engine init (#13331)
+* chore(linux): adjust to renamed xdg module (#13354)
+
+## 18.0.200 beta 2025-02-25
+
+* fix(web): properly support workerless use of Web engine (#13290)
+* fix(web): reconnect, patch up engine/main headless unit tests (#13291)
+* change(ios): re-order host page script load so Sentry can report script load failures (#13332)
+* chore(linux): Update to new Debian policy version (#13325)
+
+## 18.0.199 beta 2025-02-24
+
+* fix(windows): Update Greek Polytonic for keyboard help (#13323)
+
+## 18.0.198 beta 2025-02-21
+
+* fix(android): Update system keyboard height consistently (#13273)
+
+## 18.0.197 beta 2025-02-20
+
+* fix(linux): address compiling with ICU 76 (#13285)
+
+## 18.0.196 beta 2025-02-19
+
+* fix(windows): remove sentry report on firstrun in idle state (#13266)
+* fix(android): Correct the scope of `tier` in build.gradle (#13268)
+* chore(common): Update crowdin strings for Polytonic Greek (#13277)
+* fix(web): provide informative error + message when loading UI without the engine (#13269)
+* fix(developer): Use 'desktop' for target in OSK fill temp keyboard (#13271)
+* fix(linux): add missing dependency for uploading to llso (#13279)
+* refactor(linux): re-enable integration tests (#13234)
+
+## 18.0.195 beta 2025-02-18
+
+* docs(web): use promise-chaining in manual-control example (#13272)
+
+## 18.0.194 beta 2025-02-17
+
+* fix(android): Use TIER.md to determine Play Store tier (#13259)
+* fix(android): prevent update-checks from crashing system keyboard and app if `DownloadManager` is disabled (#13218)
+* feat(linux): add `--remote-debug` flag to `run-tests.sh` script (#13233)
+* chore(linux): improve output when running tests (#13247)
+* refactor(linux): cleanup code of test fixture (#13248)
+
+## 18.0.193 beta 2025-02-14
+
+* chore(developer): add INFO messages for `kmc copy` and `kmc generate` (#13200)
+* fix(android): Remove sendOptionsToKeyboard function from Engine API (#13219)
+* docs(android): Document removing sendOptionsToKeyboard API (#13220)
+* chore(ios): increase minimum ios version to 15 (#13201)
+* fix(android): Catch WebView exceptions and prompt user to install WebView (#13140)
+* chore(common): Update crowdin strings for Mon (#13241)
+* chore(ios,windows): Update Crowdin strings for Czech (#13242)
+* change(web): drop 'dom' unit test concurrency when run in CI mode (#13141)
+* chore(web): ensure /web/build.sh clean triggers all predictive-text child actions (#13158)
+* chore(web): fix coverage-reporting artifact (#13196)
+
+## 18.0.192 beta 2025-02-14
+
+* chore(common): Fix 17.0.335 tier in HISTORY.md (#13213)
+* docs(linux): update what's new for 18.0 (#13207)
+* chore(linux): additional code cleanup after Focal removal (#13206)
+* docs(windows): update keyman for windows 18.0 whats-new (#13211)
+* chore: undo master merge (#13238)
+* change(ios): prevent memory leaks from keyboard-related notification observers (#13129)
+* change(ios): mitigate keyboard input-view memory leak by force-discarding WebView (#13169)
+
 ## 18.0.191 beta 2025-02-12
 
 * feat(windows): handle a hard windows reset occurring while downloading updated keyman files (#13128)
diff --git a/VERSION.md b/VERSION.md
index 0394531a29..a88b08f552 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.10
\ No newline at end of file
+19.0.11
\ No newline at end of file
diff --git a/android/KMAPro/kMAPro/build.gradle b/android/KMAPro/kMAPro/build.gradle
index 11ec4efd2d..768d98d933 100644
--- a/android/KMAPro/kMAPro/build.gradle
+++ b/android/KMAPro/kMAPro/build.gradle
@@ -9,6 +9,8 @@ plugins {
 ext.rootPath = '../../'
 apply from: "$rootPath/version.gradle"
 
+String tier = new File('../../TIER.md').getText('UTF-8').trim();
+
 android {
     compileSdk 34
     namespace="com.tavultesoft.kmapro"
@@ -75,7 +77,7 @@ android {
         //  - PR builds also have "-test-1234" suffix (where 1234 is PR#)
         // Gradle sync will nullify these values, so have a fallback
         String appSuffix = ''
-        String tag = VERSION_TAG ? VERSION_TAG : '-' + new File('../../TIER.md').getText('UTF-8');
+        String tag = VERSION_TAG ? VERSION_TAG : '-' + tier;
         if (tag.startsWithAny("-beta", "beta")) {
             appSuffix = ' Beta';
         } else if (tag.startsWithAny("-alpha", "alpha")) {
@@ -127,7 +129,7 @@ if (env_keys_json_file != null && file(env_keys_json_file).exists()) {
 
         // Deactivate lower conflicting version APKs
         resolutionStrategy.set(com.github.triplet.gradle.androidpublisher.ResolutionStrategy.IGNORE)
-        switch (System.env.TIER) {
+        switch (tier) {
             case 'beta':
                 track.set("beta")
                 println "TIER set to beta"
diff --git a/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java b/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java
index 5ca3de5807..05c82082ad 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/keyman/android/SystemKeyboard.java
@@ -4,6 +4,7 @@
 
 package com.keyman.android;
 
+import com.keyman.engine.util.DownloadFileUtils;
 import com.tavultesoft.kmapro.AdjustLongpressDelayActivity;
 import com.tavultesoft.kmapro.BuildConfig;
 import com.tavultesoft.kmapro.DefaultLanguageResource;
@@ -84,7 +85,12 @@ public class SystemKeyboard extends InputMethodService implements OnKeyboardEven
     boolean mayHaveHapticFeedback = prefs.getBoolean(KeymanSettingsActivity.hapticFeedbackKey, false);
     KMManager.setHapticFeedback(mayHaveHapticFeedback);
 
-    KMManager.executeResourceUpdate(this);
+    // Checking for updates should never be allowed to crash the keyboard.
+    // Just silently fail if this occurs.
+    if(DownloadFileUtils.getDownloadManager(this) != null) {
+      // Will try to emit a toast if it fails - i.e., is not silent.
+      KMManager.executeResourceUpdate(this);
+    }
   }
 
   @Override
@@ -149,16 +155,7 @@ public class SystemKeyboard extends InputMethodService implements OnKeyboardEven
     KMManager.onStartInput(attribute, restarting);
     KMManager.resetContext(KeyboardType.KEYBOARD_TYPE_SYSTEM);
 
-    // This method (likely) includes the IME equivalent to `onResume` for `Activity`-based classes,
-    // making it an important time to detect orientation changes.
     Context appContext = getApplicationContext();
-    int newOrientation = KMManager.getOrientation(appContext);
-    if(newOrientation != lastOrientation) {
-      lastOrientation = newOrientation;
-      Configuration newConfig = this.getResources().getConfiguration();
-      KMManager.onConfigurationChanged(newConfig);
-    }
-
     // Temporarily disable predictions on certain fields (e.g. hidden password field or numeric)
     int inputType = attribute.inputType;
     KMManager.setMayPredictOverride(inputType);
@@ -228,6 +225,16 @@ public class SystemKeyboard extends InputMethodService implements OnKeyboardEven
   public void onComputeInsets(InputMethodService.Insets outInsets) {
     super.onComputeInsets(outInsets);
 
+    // This method (likely) includes the IME equivalent to `onResume` for `Activity`-based classes,
+    // making it an important time to detect orientation changes.
+    Context appContext = getApplicationContext();
+    int newOrientation = KMManager.getOrientation(appContext);
+    if(newOrientation != lastOrientation) {
+      lastOrientation = newOrientation;
+      Configuration newConfig = this.getResources().getConfiguration();
+      KMManager.onConfigurationChanged(newConfig);
+    }
+
     // We should extend the touchable region so that Keyman sub keys menu can receive touch events outside the keyboard frame
     Point size = KMManager.getWindowSize(getApplicationContext());
 
@@ -250,8 +257,6 @@ public class SystemKeyboard extends InputMethodService implements OnKeyboardEven
       if (exText != null)
         exText = null;
     }
-    // Initialize keyboard options
-    KMManager.sendOptionsToKeyboard();
   }
 
   @Override
diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/AdjustLongpressDelayActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/AdjustLongpressDelayActivity.java
index e79cb917ff..596c247d09 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/AdjustLongpressDelayActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/AdjustLongpressDelayActivity.java
@@ -133,7 +133,6 @@ public class AdjustLongpressDelayActivity extends BaseActivity {
     // Store the longpress delay as a reference
     // and then update KeymanWeb with the longpress delay
     KMManager.setLongpressDelay(currentDelayTimeMS);
-    KMManager.sendOptionsToKeyboard();
 
     super.onBackPressed();
   }
diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KMPBrowserActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KMPBrowserActivity.java
index 4410761e6d..e66d5e9ebc 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KMPBrowserActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KMPBrowserActivity.java
@@ -11,6 +11,7 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.AndroidRuntimeException;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -70,7 +71,13 @@ public class KMPBrowserActivity extends BaseActivity {
       }
     }
 
-    setContentView(R.layout.activity_kmp_browser);
+    try {
+      setContentView(R.layout.activity_kmp_browser);
+    } catch (AndroidRuntimeException e) {
+      // WebView not enabled
+      finish();
+      return;
+    }
 
     webView = (WebView) findViewById(R.id.kmpBrowserWebView);
     webView.getSettings().setLayoutAlgorithm(WebSettings.LayoutAlgorithm.NORMAL);
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 908d2f4538..989c7716a6 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
@@ -43,7 +43,9 @@ import com.keyman.android.DownloadIntentService;
 import com.keyman.engine.util.KMLog;
 import com.keyman.engine.util.KMPLink;
 import com.keyman.engine.util.KMString;
+import com.keyman.engine.util.WebViewUtils;
 import com.keyman.engine.util.WebViewUtils.EngineWebViewVersionStatus;
+import com.keyman.engine.util.WebViewUtils.SystemWebViewStatus;
 
 import android.Manifest;
 import android.app.ProgressDialog;
@@ -153,7 +155,9 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
       KMManager.setDebugMode(true);
     }
 
+    // Verify WebView installed and enabled before attempting to initialize KMManager
     KMManager.initialize(getApplicationContext(), KeyboardType.KEYBOARD_TYPE_INAPP);
+
     KMManager.executeResourceUpdate(this);
 
     DefaultLanguageResource.install(context);
@@ -181,8 +185,11 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
     textView.setTextSize((float) textSize);
     textView.setSelection(textView.getText().length());
 
-    // Use in-app keyboard WebView to check the Chrome version
-    checkChromeVersion(KMManager.getKMKeyboard(KeyboardType.KEYBOARD_TYPE_INAPP));
+    // Check WebView enabled and Chrome version
+    SystemWebViewStatus webViewStatus = WebViewUtils.getSystemWebViewStatus(context);
+    EngineWebViewVersionStatus chromeStatus = KMManager.getEngineWebViewVersionStatus();
+    updateWebViewIfNeeded(chromeStatus, webViewStatus);
+
     CheckInstallReferrer.checkGooglePlayInstallReferrer(this, context);
     checkGetStarted();
   }
@@ -475,8 +482,7 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
 
   @Override
   public void onKeyboardLoaded(KeyboardType keyboardType) {
-    // Initialize keyboard options
-    KMManager.sendOptionsToKeyboard();
+    // Do nothing
   }
 
   @Override
@@ -770,39 +776,114 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
     KMManager.setHapticFeedback(mayHaveHapticFeedback);
   }
 
-  private void checkChromeVersion(WebView webView) {
-    if (KMManager.getEngineWebViewVersionStatus() != EngineWebViewVersionStatus.FULL) {
-      LinearLayout updateChromeLayout = (LinearLayout) findViewById(R.id.updateChromeLayout);
-      updateChromeLayout.setVisibility(View.VISIBLE);
-
-      Button updateChromeButton = (Button)findViewById(R.id.updateChromeButton);
-      updateChromeButton.setOnClickListener(new View.OnClickListener() {
-        public void onClick(View v) {
-          // Launch PlayStore to update Chrome
-          try {
-            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=com.android.chrome"));
-            if (intent.resolveActivity(getPackageManager()) != null) {
-              startActivity(intent);
-            } else {
-              intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=com.android.chrome"));
-              if (intent.resolveActivity(getPackageManager()) != null) {
-                startActivity(intent);
-              } else {
-                Toast.makeText(getApplicationContext(), getString(R.string.unable_to_open_browser), Toast.LENGTH_SHORT).show();
-              }
-            }
-          } catch (android.content.ActivityNotFoundException e) {
-            // Link to Chrome if user is not signed in to Play Store
-            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=com.android.chrome"));
-            if (intent.resolveActivity(getPackageManager()) != null) {
-              startActivity(intent);
-            } else {
-              Toast.makeText(getApplicationContext(), getString(R.string.unable_to_open_browser), Toast.LENGTH_SHORT).show();
-            }
-          }
-        }
-      });
+  /**
+   * Based on whether Chrome and WebView are installed & enabled,
+   * display the corresponding update panel
+   * @param chromeStatus
+   * @param webViewStatus
+   */
+  private void updateWebViewIfNeeded(EngineWebViewVersionStatus chromeStatus, SystemWebViewStatus webViewStatus) {
+    if (chromeStatus == EngineWebViewVersionStatus.FULL && webViewStatus == SystemWebViewStatus.FULL) {
+      return;
     }
+
+    if (webViewStatus == SystemWebViewStatus.NOT_INSTALLED) {
+      displayInstallWebView();
+    } else if (webViewStatus == SystemWebViewStatus.DISABLED) {
+      displayEnableWebView();
+    } else {
+      // Otherwise, display update Chrome
+      displayUpdateChrome();
+    }
+  }
+
+  private void displayInstallWebView() {
+    TextView textView = (TextView)findViewById((R.id.kmWebViewChromeTextView));
+    textView.setText(getString(R.string.body_install_webview));
+
+    Button button = (Button)findViewById(R.id.webViewChromeButton);
+    button.setText(getString(R.string.label_install_webview));
+    button.setOnClickListener(new View.OnClickListener() {
+      public void onClick(View v) {
+        // Play Store link to install WebView
+        Intent intent = new Intent(Intent.ACTION_VIEW,
+            Uri.parse("https://play.google.com/store/apps/details?id=com.google.android.webview"));
+
+        // Launch intent
+        try {
+          PackageManager packageManager = context.getPackageManager();
+          if (intent.resolveActivity(packageManager) != null) {
+            startActivity(intent);
+          }
+        } catch (android.content.ActivityNotFoundException e) {
+          Toast.makeText(getApplicationContext(), getString(R.string.unable_to_open_browser), Toast.LENGTH_SHORT).show();
+        }
+      }
+    });
+
+    LinearLayout webViewChromeLayout = (LinearLayout) findViewById(R.id.checkWebViewChromeLayout);
+    webViewChromeLayout.setVisibility(View.VISIBLE);
+  }
+
+  private void displayEnableWebView() {
+    TextView textView = (TextView)findViewById((R.id.kmWebViewChromeTextView));
+    textView.setText(getString(R.string.body_enable_webview));
+
+    Button button = (Button)findViewById(R.id.webViewChromeButton);
+    button.setText(getString(R.string.label_enable_webview));
+    button.setOnClickListener(new View.OnClickListener() {
+      public void onClick(View v) {
+        // Application settings to enable WebView
+        Intent intent = new Intent("android.settings.APPLICATION_DETAILS_SETTINGS",
+          Uri.parse("package:com.google.android.webview"));
+
+        // Launch intent
+        try {
+          PackageManager packageManager = context.getPackageManager();
+          if (intent.resolveActivity(packageManager) != null) {
+            startActivity(intent);
+          }
+        } catch (android.content.ActivityNotFoundException e) {
+          Toast.makeText(getApplicationContext(), getString(R.string.unable_to_open_browser), Toast.LENGTH_SHORT).show();
+        }
+      }
+    });
+
+    LinearLayout webViewChromeLayout = (LinearLayout) findViewById(R.id.checkWebViewChromeLayout);
+    webViewChromeLayout.setVisibility(View.VISIBLE);
+  }
+
+  private void displayUpdateChrome() {
+    // TextView's default string is to update Chrome
+
+    Button button = (Button)findViewById(R.id.webViewChromeButton);
+    button.setText(getString(R.string.button_update_chrome));
+    button.setOnClickListener(new View.OnClickListener() {
+      public void onClick(View v) {
+        // Primary Play Store link to install/update Chrome
+        Intent intent = new Intent(Intent.ACTION_VIEW,
+          Uri.parse("market://details?id=com.android.chrome"));
+
+        try {
+          PackageManager packageManager = context.getPackageManager();
+          if (intent.resolveActivity(packageManager) != null) {
+            startActivity(intent);
+          } else {
+            // (alternate Play Store link to install/update Chrome)
+            intent = new Intent(Intent.ACTION_VIEW,
+              Uri.parse("https://play.google.com/store/apps/details?id=com.android.chrome"));
+
+            intent.resolveActivity(packageManager);
+            startActivity(intent);
+          }
+        } catch (android.content.ActivityNotFoundException e) {
+          Toast.makeText(getApplicationContext(), getString(R.string.unable_to_open_browser), Toast.LENGTH_SHORT).show();
+        }
+      }
+    });
+
+    LinearLayout webViewChromeLayout = (LinearLayout) findViewById(R.id.checkWebViewChromeLayout);
+    webViewChromeLayout.setVisibility(View.VISIBLE);
   }
 
   private Uri requestPermissionIntentUri;
diff --git a/android/KMAPro/kMAPro/src/main/res/layout/activity_main.xml b/android/KMAPro/kMAPro/src/main/res/layout/activity_main.xml
index 87c7fe16f9..c2911272d1 100644
--- a/android/KMAPro/kMAPro/src/main/res/layout/activity_main.xml
+++ b/android/KMAPro/kMAPro/src/main/res/layout/activity_main.xml
@@ -11,7 +11,7 @@
 
     <include layout="@layout/titlebar" />
 
-    <include layout="@layout/update_chrome_layout"
+    <include layout="@layout/check_chrome_webview_layout"
       android:visibility="gone"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
         android:background="@drawable/textview_bg"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/updateChromeLayout"
+        android:layout_below="@id/checkWebViewChromeLayout"
         android:ems="10"
         android:inputType="textMultiLine|textNoSuggestions"
         android:hint="@string/textview_hint"
diff --git a/android/KMAPro/kMAPro/src/main/res/layout/update_chrome_layout.xml b/android/KMAPro/kMAPro/src/main/res/layout/check_chrome_webview_layout.xml
similarity index 86%
rename from android/KMAPro/kMAPro/src/main/res/layout/update_chrome_layout.xml
rename to android/KMAPro/kMAPro/src/main/res/layout/check_chrome_webview_layout.xml
index 5c01c4533c..09716bdd8a 100644
--- a/android/KMAPro/kMAPro/src/main/res/layout/update_chrome_layout.xml
+++ b/android/KMAPro/kMAPro/src/main/res/layout/check_chrome_webview_layout.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:id="@+id/updateChromeLayout"
+  android:id="@+id/checkWebViewChromeLayout"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:background="@android:color/white"
   android:orientation="horizontal">
 
-  <!-- Banner to display if old version of Chrome installed -->
+  <!-- Banner to display if WebView is not installed/enabled or old version of Chrome installed -->
   <TextView
-    android:id="@+id/kmUpgradeChromeTextView"
+    android:id="@+id/kmWebViewChromeTextView"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_weight="1"
@@ -20,7 +20,7 @@
     android:textSize="@dimen/update_chrome_label_textsize" />
 
   <Button
-    android:id="@+id/updateChromeButton"
+    android:id="@+id/webViewChromeButton"
     style="@style/Widget.AppCompat.Button.Colored"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/android/KMAPro/kMAPro/src/main/res/values-b+el/strings.xml b/android/KMAPro/kMAPro/src/main/res/values-b+el/strings.xml
index 428bf5ad59..8a213122e7 100644
--- a/android/KMAPro/kMAPro/src/main/res/values-b+el/strings.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values-b+el/strings.xml
@@ -16,7 +16,7 @@
   <!-- Context: Menu Action -->
   <string name="action_settings" comment="Menu action to open Settings menu">Ρυθμίσεις</string>
   <!-- Context: Menu Action -->
-  <string name="action_install_updates" comment="Menu notification that keyboard or dictionary updates available">Εγκατάσταση Ενημερώσεων</string>
+  <string name="action_install_updates" comment="Menu notification that keyboard or dictionary updates available">Ἐγκατάσταση Ἐνημερώσεων</string>
   <!-- Context: Title -->
   <string name="title_version" comment="Title of Keyman for Android version">Ἔκδοση %1$s</string>
   <!-- Context: Text label when old Chrome version installed -->
@@ -38,11 +38,11 @@
   <!-- Context: Clear Text dialog -->
   <string name="all_text_will_be_cleared" comment="Erase all the text">\nΤὸ κείμενο θὰ ἐκκαθαρισθεῖ πλήρως\n</string>
   <!-- Context: Get Started menu -->
-  <string name="get_started" comment="Menu for getting started">Μικρύνετε τὸ κείμενο</string>
+  <string name="get_started" comment="Menu for getting started">Ξεκινῆστε</string>
   <!-- Context: Get Started menu -->
   <string name="add_a_keyboard" comment="Menu item to add a keyboard">Προσθέστε πληκτρολόγιο γιὰ τὴν γλῶσσα σας</string>
   <!-- Context: Get Started menu -->
-  <string name="enable_system_keyboard" comment="Menu item to enable Keyman as system keyboard">Ὁρίστε τὸ Κῆμαν ὡς παν-συστημικὸ πληκτρολόγιο</string>
+  <string name="enable_system_keyboard" comment="Menu item to enable Keyman as system keyboard">Ὁρίστε τὸ Keyman ὡς πληκτρολόγιο συστήματος</string>
   <!-- Context: Get Started menu -->
   <string name="set_keyman_as_default" comment="Menu item to set Keyman as default system keyboard">Ὁρίστε τὸ Κῆμαν ὡς προεπιλεγμένο πληκτρολόγιο</string>
   <!-- Context: Get Started menu -->
@@ -68,6 +68,8 @@
   <!-- Context: Keyman Settings menu -->
   <string name="adjust_keyboard_height" comment="Menu action to adjust keyboard height">Μεταβολὴ ὕψους πληκτρολογίου</string>
   <!-- Context: Keyman Settings menu -->
+  <string name="adjust_longpress_delay" comment="Menu action to adjust longpress delay duration">Καθυστέρηση παρατεταμένου πατήματος</string>
+  <!-- Context: Keyman Settings menu -->
   <string name="spacebar_caption" comment="Menu action to set the spacebar caption">Λεζάντα πλήκτρου διαστήματος</string>
   <!-- Context: Keyman Settings menu / Spacebar caption -->
   <string name="spacebar_caption_keyboard" comment="Spacebar caption option - keyboard">Πληκτρολόγιο</string>
@@ -87,11 +89,11 @@
   <string name="spacebar_caption_hint_blank" comment="Spacebar caption hint - blank">Καμμία λεζάντα στὸ πλῆκτρο διαστήματος</string>
   <!-- Context: Keyman Settings menu / Haptic feedback -->
   <string name="haptic_feedback" comment="haptic feedback on key press">Δὸνηση κατὰ τὴν πληκτρολόγηση</string>
-  <!-- Context: Keyman Settings menu -->
+  <!-- Context: Keyman Settings menu. Removed in Keyman 18 -->
   <string name="show_banner" comment="text suggestions banner">Νὰ ἐμφανίζεται πάντα banner</string>
-  <!-- Context: Keyman Settings menu -->
+  <!-- Context: Keyman Settings menu. Removed in Keyman 18 -->
   <string name="show_banner_on" comment="Description when toggle is on">Πρὸς ὑλοποίησιν</string>
-  <!-- Context: Keyman Settings menu -->
+  <!-- Context: Keyman Settings menu. Removed in Keyman 18 -->
   <string name="show_banner_off" comment="Description when toggle is off">OFF: ἐμφάνιση μόνον ὅταν ἔχει ἐνεργοποιηθεῖ ἡ πρόβλεψη κειμένου</string>
   <!-- Context: Keyman Settings menu -->
   <string name="show_send_crash_report" comment="permission for sending crash reports">Ἐπιτρέψτε τὴν ἀποστολὴ ἀναφορῶν κατάρρευσης μέσῳ δικτύου</string>
@@ -123,6 +125,14 @@
   <string name="rotate_the_device" comment="Second line of adjusting keyboard height">Περιστρέψτε τὴν συσκευὴ γιὰ προσαρμογὴ τοῦ ὕψους σὲ λειτουργία πορτραίτου καὶ τοπίου</string>
   <!-- Context: Adjust Keyboard Height menu -->
   <string name="reset_to_defaults" comment="Button to reset to default heights">Ἐπαναφέρετε τὶς προεπιλεγμένες ρυθμίσεις</string>
+  <!-- Context: Adjust Longpress Delay Time menu -->
+  <string name="longpress_delay_time" comment="Current longpress delay time (seconds)">Χρόνος καθυστέρησης: %1$.1f δευτ</string>
+  <!-- Context: Adjust Longpress Delay Time menu -->
+  <string name="ic_delay_time_up" comment="Make longpress delay longer">Μεγαλύτερος χρόνος καθυστέρησης</string>
+  <!-- Context: Adjust Longpress Delay Time menu -->
+  <string name="ic_delay_time_down" comment="Make longpress delay shorter">Μικρότερος χρόνος καθυστέρησης</string>
+  <!-- Context: Adjust Longpress Delay Time menu -->
+  <string name="ic_longpress_delay_slider" comment="Adjust longpress delay time">Ρυθμιστής καθυστέρησης πατήματος</string>
   <!-- Context: Keyman Web Browser -->
   <string name="hint_text" comment="Prompt to type in the browser search bar">Ἀναζητῆστε ἢ πληκτρολογῆστε URL</string>
   <!-- Context: Keyman Web Browser -->
diff --git a/android/KMAPro/kMAPro/src/main/res/values-mnw-rMM/strings.xml b/android/KMAPro/kMAPro/src/main/res/values-mnw-rMM/strings.xml
index 340a0024ee..bd230d5f4e 100644
--- a/android/KMAPro/kMAPro/src/main/res/values-mnw-rMM/strings.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values-mnw-rMM/strings.xml
@@ -67,6 +67,8 @@
   <!-- Context: Keyman Settings menu -->
   <string name="adjust_keyboard_height" comment="Menu action to adjust keyboard height">ချိၚ်ဆသမၠုၚ်ကဳဗုဒ်ညိ</string>
   <!-- Context: Keyman Settings menu -->
+  <string name="adjust_longpress_delay" comment="Menu action to adjust longpress delay duration">ချိၚ်အခိၚ် ဍဵုလအ်အ်</string>
+  <!-- Context: Keyman Settings menu -->
   <string name="spacebar_caption" comment="Menu action to set the spacebar caption">က္တိုပ်လိက် Spacebar</string>
   <!-- Context: Keyman Settings menu / Spacebar caption -->
   <string name="spacebar_caption_keyboard" comment="Spacebar caption option - keyboard">ကဳဗုဒ်</string>
@@ -87,11 +89,11 @@
   <string name="spacebar_caption_hint_blank" comment="Spacebar caption hint - blank">လ္ပဓမံက်ထ္ၜးမလိက်ပ္ဍဲspacebarညိ</string>
   <!-- Context: Keyman Settings menu / Haptic feedback -->
   <string name="haptic_feedback" comment="haptic feedback on key press">ပ္ဍဲကာလမတက်လိက် ချဳဒတဝ်ညိ</string>
-  <!-- Context: Keyman Settings menu -->
+  <!-- Context: Keyman Settings menu. Removed in Keyman 18 -->
   <string name="show_banner" comment="text suggestions banner">ဓမံက်ထ္ၜးbannerလၟိုန်ညိ</string>
-  <!-- Context: Keyman Settings menu -->
+  <!-- Context: Keyman Settings menu. Removed in Keyman 18 -->
   <string name="show_banner_on" comment="Description when toggle is on">သွက်ဂွံဓမံက်ရုပ်ရဴ</string>
-  <!-- Context: Keyman Settings menu -->
+  <!-- Context: Keyman Settings menu. Removed in Keyman 18 -->
   <string name="show_banner_off" comment="Description when toggle is off">ကၟာတ်လဝ်မ္ဂး မလိက်ချိၚ်ဆလဝ်တံဂှ် ထ္ၜးအဃောပံက်လဝ်ဟေၚ်</string>
   <!-- Context: Keyman Settings menu -->
   <string name="show_send_crash_report" comment="permission for sending crash reports">ကဵုအခေါၚ် ပၠံၚ်လိက်စဳရေၚ်လ္တူ အေန်တာနက်ညိ</string>
@@ -123,6 +125,14 @@
   <string name="rotate_the_device" comment="Second line of adjusting keyboard height">ဂွံချိၚ် လံက်သတိက် လံက်ဇမၠိၚ်ဂှ် ဗဂေတ်ကဵုစက်ပိုဲညိ။</string>
   <!-- Context: Adjust Keyboard Height menu -->
   <string name="reset_to_defaults" comment="Button to reset to default heights">ကလေၚ်သ္ပနူပကတိ</string>
+  <!-- Context: Adjust Longpress Delay Time menu -->
+  <string name="longpress_delay_time" comment="Current longpress delay time (seconds)">အခိၚ်ဖအိၚ်: %1$.1f စက္က</string>
+  <!-- Context: Adjust Longpress Delay Time menu -->
+  <string name="ic_delay_time_up" comment="Make longpress delay longer">ဖအိၚ်အခိၚ်လအ်အ်</string>
+  <!-- Context: Adjust Longpress Delay Time menu -->
+  <string name="ic_delay_time_down" comment="Make longpress delay shorter">ဖအိၚ်အခိၚ်အောန်န်</string>
+  <!-- Context: Adjust Longpress Delay Time menu -->
+  <string name="ic_longpress_delay_slider" comment="Adjust longpress delay time">ဍဵုလအ်အ်သွက် မသရေတ််ဖအိၚ်အခိၚ်</string>
   <!-- Context: Keyman Web Browser -->
   <string name="hint_text" comment="Prompt to type in the browser search bar">ဂၠာဲ ဟွံသေၚ် တက် URL</string>
   <!-- Context: Keyman Web Browser -->
diff --git a/android/KMAPro/kMAPro/src/main/res/values/strings.xml b/android/KMAPro/kMAPro/src/main/res/values/strings.xml
index 01546f91ba..a0447d0f89 100644
--- a/android/KMAPro/kMAPro/src/main/res/values/strings.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values/strings.xml
@@ -27,7 +27,6 @@
   <!-- Context: Menu Action -->
   <string name="action_install_updates" comment="Menu notification that keyboard or dictionary updates available">Install Updates</string>
 
-
   <!-- Context: Title -->
   <string name="title_version" comment="Title of Keyman for Android version">Version: %1$s</string>
 
diff --git a/android/KMEA/app/src/main/AndroidManifest.xml b/android/KMEA/app/src/main/AndroidManifest.xml
index 304d715ee7..38b1069277 100644
--- a/android/KMEA/app/src/main/AndroidManifest.xml
+++ b/android/KMEA/app/src/main/AndroidManifest.xml
@@ -7,6 +7,11 @@
       </intent>
     </queries>
 
+    <queries>
+        <package android:name="com.android.webkit" />
+        <package android:name="com.google.android.ims" />
+    </queries>
+
     <!-- https://developer.android.com/develop/ui/views/notifications/notification-permission#declare -->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.VIBRATE" />
diff --git a/android/KMEA/app/src/main/assets/android-host.js b/android/KMEA/app/src/main/assets/android-host.js
index 0bd199b4d6..ad440d493a 100644
--- a/android/KMEA/app/src/main/assets/android-host.js
+++ b/android/KMEA/app/src/main/assets/android-host.js
@@ -13,6 +13,7 @@ var bannerImagePath = '';
 var bannerHTMLContents = '';
 var fragmentToggle = 0;
 var deferredBannerCall;
+var longpressDelay = null;
 
 var sentryManager = new KeymanSentryManager({
   hostPlatform: "android"
@@ -71,6 +72,10 @@ function init() {
 
       keyman.refreshOskLayout();
     }
+    // Initialize the longpress delay
+    if(longpressDelay !== null) {
+      setLongpressDelay(longpressDelay);
+    }
   });
 
   keyman.addEventListener('keyboardloaded', setIsChiral);
@@ -128,11 +133,10 @@ function notifyHost(event, params) {
 // Update the KeymanWeb longpress delay
 // delay is in milliseconds
 function setLongpressDelay(delay) {
-  if (keyman.osk) {
+  longpressDelay = delay;
+  if (keyman && keyman.osk) {
     keyman.osk.gestureParams.longpress.waitLength = delay;
     console_debug('setLongpressDelay('+delay+')');
-  } else {
-    window.console.log('setLongpressDelay error: keyman.osk undefined');
   }
 }
 
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboard.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboard.java
index de01e0bcc5..4061100002 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboard.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboard.java
@@ -32,6 +32,7 @@ import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
+import android.util.AndroidRuntimeException;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.GestureDetector;
@@ -110,14 +111,29 @@ final class KMKeyboard extends WebView {
 
   public String specialOskFont = "";
 
-  public KMKeyboard(Context context) {
+  /**
+   * Constructor for KMKeyboard.
+   * If System WebView not installed/enabled, will throw AndroidRuntimeException.
+   * Can't catch the exception here because super(context) must be the first line.
+   * @param context
+   * @throws AndroidRuntimeException
+   */
+  public KMKeyboard(Context context) throws AndroidRuntimeException {
     super(context);
     this.context = context;
     this.keyboardType = KeyboardType.KEYBOARD_TYPE_INAPP;
     initKMKeyboard(context);
   }
 
-  public KMKeyboard(Context context, KeyboardType keyboardType) {
+  /**
+   * Constructor for KMKeyboard.
+   * If System WebView not installed/enabled, will throw AndroidRuntimeException.
+   * Can't catch the exception here because super(context) must be the first line.
+   * @param context {Context}
+   * @param keyboardType {KeyboardType}
+   * @throws AndroidRuntimeException
+   */
+  public KMKeyboard(Context context, KeyboardType keyboardType) throws AndroidRuntimeException {
     super(context);
     this.context = context;
     this.keyboardType = keyboardType;
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
index e4f3055763..3f96c18289 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardDownloaderActivity.java
@@ -72,7 +72,7 @@ public class KMKeyboardDownloaderActivity extends BaseActivity {
 
   //TODO: move to keyboard manager class
   private static ArrayList<KeyboardEventHandler.OnKeyboardDownloadEventListener> kbDownloadEventListeners = null;
-  
+
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
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 0e4c261232..0806406533 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
@@ -33,6 +33,7 @@ import android.net.NetworkInfo;
 import android.os.Build;
 import android.os.IBinder;
 import android.text.InputType;
+import android.util.AndroidRuntimeException;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.View;
@@ -73,6 +74,7 @@ import com.keyman.engine.util.KMLog;
 import com.keyman.engine.util.KMString;
 import com.keyman.engine.util.MapCompat;
 import com.keyman.engine.util.WebViewUtils;
+import com.keyman.engine.util.WebViewUtils.SystemWebViewStatus;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -687,12 +689,33 @@ public final class KMManager {
     KMKeyboardWebViewClient webViewClient = null;
 
     if (keyboardType == KeyboardType.KEYBOARD_TYPE_INAPP && InAppKeyboard == null) {
-      InAppKeyboard = new KMKeyboard(appContext, KeyboardType.KEYBOARD_TYPE_INAPP);
+      try {
+        InAppKeyboard = new KMKeyboard(appContext, KeyboardType.KEYBOARD_TYPE_INAPP);
+      } catch (AndroidRuntimeException e) {
+        // Catch fatal error when WebView not installed/enabled
+        // Only log exceptions unrelated to WebView
+        if (e != null && !e.getMessage().contains("MissingWebViewPackageException")) {
+          KMLog.LogException(TAG, "initKeyboard for INAPP" , e);
+        }
+        return;
+      }
       InAppKeyboardWebViewClient = new KMKeyboardWebViewClient(appContext, keyboardType);
       keyboard = InAppKeyboard;
       webViewClient = InAppKeyboardWebViewClient;
     } else if (keyboardType == KeyboardType.KEYBOARD_TYPE_SYSTEM && SystemKeyboard == null) {
-      SystemKeyboard = new KMKeyboard(appContext, KeyboardType.KEYBOARD_TYPE_SYSTEM);
+      try {
+        SystemKeyboard = new KMKeyboard(appContext, KeyboardType.KEYBOARD_TYPE_SYSTEM);
+      } catch (AndroidRuntimeException e) {
+        // Catch fatal error when WebView not installed/enabled
+        // Only log exceptions unrelated to WebView
+        if (e != null && !e.getMessage().contains("MissingWebViewPackageException")) {
+          KMLog.LogException(TAG, "initKeyboard for SYSTEM", e);
+        }
+        // Direct user to pick another system keyboard
+        InputMethodManager imManager = (InputMethodManager) appContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+        imManager.showInputMethodPicker();
+        return;
+      }
       SystemKeyboardWebViewClient = new KMKeyboardWebViewClient(appContext, keyboardType);
       keyboard = SystemKeyboard;
       webViewClient = SystemKeyboardWebViewClient;
@@ -722,6 +745,7 @@ public final class KMManager {
       }
       keyboard.setBanner(KMManager.BannerType.HTML);
       keyboard.showBanner(true);
+      sendLongpressDelay();
     }
     setEngineWebViewVersionStatus(appContext, keyboard);
   }
@@ -776,6 +800,10 @@ public final class KMManager {
     final FrameLayout mainLayout = new FrameLayout(appContext);
     mainLayout.setLayoutParams(new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
 
+    if (SystemKeyboard == null) {
+      return mainLayout;
+    }
+
     RelativeLayout keyboardLayout = new RelativeLayout(appContext);
     keyboardLayout.setLayoutParams(new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
     ViewGroup parent = (ViewGroup) SystemKeyboard.getParent();
@@ -921,7 +949,7 @@ public final class KMManager {
       copyAsset(context, KMFilename_KmwCss, "", true);
       copyAsset(context, KMFilename_KmwGlobeHintCss, "", true);
       copyAsset(context, KMFilename_Osk_Ttf_Font, "", true);
-      
+
       // Needed until our minimum version of Chrome is 61.0+.
       copyAsset(context, KMFilename_JSPolyfill2, "", true);
 
@@ -2124,7 +2152,7 @@ public final class KMManager {
   }
 
   /**
-   * Set the longpress delay (in milliseconds) as a stored preference.
+   * Set the longpress delay (in milliseconds) as a stored preference and sends to KeymanWeb.
    * Valid range is 300 ms to 1500 ms. Returns true if the preference is successfully stored.
    * @param longpressDelay - int longpress delay in milliseconds
    * @return boolean
@@ -2140,17 +2168,19 @@ public final class KMManager {
     editor.putInt(KMKey_LongpressDelay, longpressDelay);
     editor.commit();
 
+    // Send longpress delay to KeymanWeb
+    sendLongpressDelay();
+
     return true;
   }
 
   /**
-   * Sends options to the KeymanWeb keyboard.
+   * Sends longpress delay to the KeymanWeb keyboard.
    * 1. number of milliseconds to trigger a longpress gesture.
-   * This method requires a keyboard to be loaded for the value to take effect.
    */
-  public static void sendOptionsToKeyboard() {
+  private static void sendLongpressDelay() {
     int longpressDelay = getLongpressDelay();
-    if (isKeyboardLoaded(KeyboardType.KEYBOARD_TYPE_INAPP)) {
+    if (InAppKeyboard != null) {
       InAppKeyboard.loadJavascript(KMString.format("setLongpressDelay(%d)", longpressDelay));
     }
 
@@ -2301,9 +2331,9 @@ public final class KMManager {
   public static boolean updateText(KeyboardType kbType, String text) {
     boolean result = false;
 
-    if (kbType == KeyboardType.KEYBOARD_TYPE_INAPP) {
+    if (kbType == KeyboardType.KEYBOARD_TYPE_INAPP && InAppKeyboard != null) {
       return InAppKeyboard.updateText(text);
-    } else if (kbType == KeyboardType.KEYBOARD_TYPE_SYSTEM) {
+    } else if (kbType == KeyboardType.KEYBOARD_TYPE_SYSTEM && SystemKeyboard != null) {
       return SystemKeyboard.updateText(text);
     }
 
@@ -2335,13 +2365,13 @@ public final class KMManager {
   public static boolean updateSelectionRange(KeyboardType kbType) {
     boolean result = false;
 
-    if (kbType == KeyboardType.KEYBOARD_TYPE_INAPP) {
+    if (kbType == KeyboardType.KEYBOARD_TYPE_INAPP && InAppKeyboard != null) {
       if (isKeyboardLoaded(KeyboardType.KEYBOARD_TYPE_INAPP) && !InAppKeyboard.shouldIgnoreSelectionChange()) {
         result = InAppKeyboard.updateSelectionRange();
       }
 
       InAppKeyboard.setShouldIgnoreSelectionChange(false);
-    } else if (kbType == KeyboardType.KEYBOARD_TYPE_SYSTEM) {
+    } else if (kbType == KeyboardType.KEYBOARD_TYPE_SYSTEM && SystemKeyboard != null) {
       if (isKeyboardLoaded(KeyboardType.KEYBOARD_TYPE_SYSTEM) && !SystemKeyboard.shouldIgnoreSelectionChange()) {
         result = SystemKeyboard.updateSelectionRange();
       }
@@ -2354,11 +2384,11 @@ public final class KMManager {
 
   public static void resetContext(KeyboardType kbType) {
     if (kbType == KeyboardType.KEYBOARD_TYPE_INAPP) {
-      if (isKeyboardLoaded(KeyboardType.KEYBOARD_TYPE_INAPP)) {
+      if (isKeyboardLoaded(KeyboardType.KEYBOARD_TYPE_INAPP) && InAppKeyboard != null) {
         InAppKeyboard.loadJavascript("resetContext()");
       }
     } else if (kbType == KeyboardType.KEYBOARD_TYPE_SYSTEM) {
-      if (isKeyboardLoaded(KeyboardType.KEYBOARD_TYPE_SYSTEM)) {
+      if (isKeyboardLoaded(KeyboardType.KEYBOARD_TYPE_SYSTEM) && SystemKeyboard != null) {
         SystemKeyboard.loadJavascript("resetContext()");
       }
     }
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/KMTextView.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMTextView.java
index 3c5959fc9d..e9c3ce4e11 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMTextView.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMTextView.java
@@ -119,7 +119,7 @@ public final class KMTextView extends AppCompatEditText {
       public void onFocusChange(View v, boolean hasFocus) {
         if (hasFocus) {
           activeView = v;
-          if (KMManager.InAppKeyboardWebViewClient.getKeyboardLoaded()) {
+          if (KMManager.InAppKeyboard != null && KMManager.InAppKeyboardWebViewClient.getKeyboardLoaded()) {
             updateTextContext();
           }
           showKeyboard();
@@ -165,7 +165,7 @@ public final class KMTextView extends AppCompatEditText {
   protected void onSelectionChanged(int selStart, int selEnd) {
     super.onSelectionChanged(selStart, selEnd);
     if (activeView != null && activeView.equals(this)) {
-      if (KMManager.updateSelectionRange(KMManager.KeyboardType.KEYBOARD_TYPE_INAPP)) {
+      if (KMManager.InAppKeyboard != null && KMManager.updateSelectionRange(KMManager.KeyboardType.KEYBOARD_TYPE_INAPP)) {
         KMManager.resetContext(KeyboardType.KEYBOARD_TYPE_INAPP);
       }
     }
@@ -176,7 +176,7 @@ public final class KMTextView extends AppCompatEditText {
     AppCompatActivity activity = (AppCompatActivity)context;
 
     Window mainWindow = activity.getWindow();
-    if (hasWindowFocus) {
+    if (hasWindowFocus && KMManager.InAppKeyboard != null) {
       KMManager.InAppKeyboardWebViewClient.setContext(context);
       activeView = mainWindow.getCurrentFocus();
 
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
index 8a25ab09ba..bb8ee190b6 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/CloudDownloadMgr.java
@@ -5,11 +5,15 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.util.Log;
+import android.widget.Toast;
 
+import com.keyman.engine.R;
 import com.keyman.engine.util.KMLog;
+import com.keyman.engine.util.DownloadFileUtils;
 
 import java.io.File;
 import java.util.HashMap;
@@ -206,12 +210,34 @@ public class CloudDownloadMgr{
    * @param params the cloud api params for download
    * @param <ModelType> the target models type
    * @param <ResultType> the cloud requests result type
+   * @return `false` if the download request cannot be executed; `true` otherwise.
    */
-  public <ModelType,ResultType> void executeAsDownload(Context aContext, String aDownloadIdentifier,
+  public <ModelType,ResultType> boolean executeAsDownload(Context aContext, String aDownloadIdentifier,
                                 ModelType aTargetModel,
                                 ICloudDownloadCallback<ModelType,ResultType> aCallback,
-                                CloudApiTypes.CloudApiParam... params)
-  {
+                                CloudApiTypes.CloudApiParam... params) {
+    try {
+      executeAsDownloadInternal(aContext, aDownloadIdentifier, aTargetModel, aCallback, params);
+    } catch (DownloadManagerDisabledException e) {
+      Toast.makeText(aContext,
+        aContext.getString(R.string.update_check_download_manager_disabled),
+        Toast.LENGTH_SHORT).show();
+      return false;
+    } catch (Exception e) {
+      Toast.makeText(aContext,
+        aContext.getString(R.string.update_check_unavailable),
+        Toast.LENGTH_SHORT).show();
+      KMLog.LogException(TAG, "Unexpected exception occurred during download/query attempt", e);
+      return false;
+    }
+
+    return true;
+  }
+
+  private <ModelType,ResultType> void executeAsDownloadInternal(Context aContext, String aDownloadIdentifier,
+                                ModelType aTargetModel,
+                                ICloudDownloadCallback<ModelType,ResultType> aCallback,
+                                CloudApiTypes.CloudApiParam... params) throws DownloadManagerDisabledException {
     if(!isInitialized) {
       Log.w(TAG, "DownloadManager not initialized. Initializing CloudDownloadMgr.");
       initialize(aContext);
@@ -219,16 +245,22 @@ public class CloudDownloadMgr{
       KMLog.LogBreadcrumb("CloudDownloadMgr", "CloudDownloadMgr.executeAsDownload() called; already initialized", true);
     }
 
+    DownloadManager downloadManager = DownloadFileUtils.getDownloadManager(aContext);
+    if(downloadManager == null) {
+      // The callback object provided to us provides no way to directly signal a
+      // failure.  That said, we can also immediately detect that we WILL fail and
+      // corresponding error _now_, rather than later.
+      //
+      // Unique custom error so it's easy to explicitly filter.
+      throw new DownloadManagerDisabledException();
+    }
+
     synchronized (downloadSetByDownloadIdentifier) {
 
       if (alreadyDownloadingData(aDownloadIdentifier) || params == null) {
         return;
       }
 
-      DownloadManager downloadManager = (DownloadManager) aContext.getSystemService(Context.DOWNLOAD_SERVICE);
-      if(downloadManager==null)
-        throw new IllegalStateException("DownloadManager is not available");
-
       aCallback.initializeContext(aContext);
 
       CloudApiTypes.CloudDownloadSet<ModelType,ResultType> _downloadSet =
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/DownloadManagerDisabledException.java b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/DownloadManagerDisabledException.java
new file mode 100644
index 0000000000..2011ad0eb0
--- /dev/null
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/DownloadManagerDisabledException.java
@@ -0,0 +1,7 @@
+package com.keyman.engine.cloud;
+
+public class DownloadManagerDisabledException extends RuntimeException {
+  DownloadManagerDisabledException() {
+    super("System service DownloadManager is not available and cannot facilitate downloads or queries.");
+  }
+}
\ No newline at end of file
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java
index 2063d2d10f..62f65a96ed 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/cloud/impl/CloudLexicalModelMetaDataDownloadCallback.java
@@ -111,8 +111,8 @@ public class CloudLexicalModelMetaDataDownloadCallback implements ICloudDownload
 
           BaseActivity.makeToast(aContext, R.string.dictionary_download_start_in_background, Toast.LENGTH_SHORT);
 
-          CloudDownloadMgr.getInstance().executeAsDownload(aContext,
-            _r.additionalDownloadid, null, _callback,
+          CloudDownloadMgr.getInstance().executeAsDownload(
+            aContext, _r.additionalDownloadid, null, _callback,
             _r.additionalDownloads.toArray(new CloudApiTypes.CloudApiParam[0]));
         }
       }
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java b/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java
index 4aad0a4e9f..4676d59c77 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/data/CloudRepository.java
@@ -13,12 +13,14 @@ import com.keyman.engine.KMManager;
 import com.keyman.engine.KeyboardPickerActivity;
 import com.keyman.engine.R;
 import com.keyman.engine.cloud.CloudApiTypes;
+import com.keyman.engine.cloud.DownloadManagerDisabledException;
 import com.keyman.engine.cloud.impl.CloudCatalogDownloadCallback;
 import com.keyman.engine.cloud.impl.CloudCatalogDownloadReturns;
 import com.keyman.engine.cloud.CloudDataJsonUtil;
 import com.keyman.engine.cloud.CloudDownloadMgr;
 import com.keyman.engine.packages.JSONUtils;
 import com.keyman.engine.util.BCP47;
+import com.keyman.engine.util.DownloadFileUtils;
 import com.keyman.engine.util.KMLog;
 import com.keyman.engine.util.VersionUtils;
 
@@ -366,6 +368,10 @@ public class CloudRepository {
    * @param onFailure  A callback to be triggered upon failure of a query.
    */
   private void downloadMetaDataFromServer(@NonNull Context context, UpdateHandler updateHandler, Runnable onSuccess, Runnable onFailure) {
+    if(DownloadFileUtils.getDownloadManager(context) == null) {
+      onFailure.run();
+      return;
+    }
     boolean cacheValid = getCacheValidity(context);
 
     // For local and PR test builds, force download of metadata
@@ -405,8 +411,13 @@ public class CloudRepository {
         BaseActivity.makeToast(context, R.string.catalog_download_is_running_in_background, Toast.LENGTH_SHORT);
       } else {
         updateIsRunning = true;
-        CloudDownloadMgr.getInstance().executeAsDownload(
+        boolean executionStarted = CloudDownloadMgr.getInstance().executeAsDownload(
           context, DOWNLOAD_IDENTIFIER_CATALOGUE, memCachedDataset, _download_callback, params);
+        if(!executionStarted) {
+          // Since we couldn't initiate the execution's async components,
+          // we need to immediately clear the update-running flag.
+          updateIsRunning = false;
+        }
       }
     }
   }
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/logic/ResourcesUpdateTool.java b/android/KMEA/app/src/main/java/com/keyman/engine/logic/ResourcesUpdateTool.java
index 9f02480bf2..8ff46bb0b7 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/logic/ResourcesUpdateTool.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/logic/ResourcesUpdateTool.java
@@ -122,6 +122,8 @@ public class ResourcesUpdateTool implements KeyboardEventHandler.OnKeyboardDownl
           return;
         }
 
+        // Warning:  can be run by our system keyboard, which will attempt to
+        // display the toast if it or the app is visible!
         BaseActivity.makeToast(currentContext, R.string.update_check_unavailable, Toast.LENGTH_SHORT);
         lastUpdateCheck = Calendar.getInstance();
         updateCheckFailed = true;
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/util/Connection.java b/android/KMEA/app/src/main/java/com/keyman/engine/util/Connection.java
index 1a02ccf66f..591a03e4dd 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/util/Connection.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/util/Connection.java
@@ -3,6 +3,7 @@ package com.keyman.engine.util;
 import java.io.InputStream;
 import java.io.IOException;
 import java.net.HttpURLConnection;
+import java.net.SocketTimeoutException;
 import java.net.URL;
 
 public final class Connection {
@@ -99,6 +100,9 @@ public final class Connection {
           attempt++;
         }
       }
+    } catch (SocketTimeoutException e) {
+      KMLog.LogBreadcrumb(TAG, "Connection.initialize timeout for: " + originalUrl, true);
+      KMLog.LogInfo(TAG, "SocketTimeoutException");
     } catch (Exception e) {
       KMLog.LogException(TAG, "Initialization failed:", e);
     }
diff --git a/android/KMEA/app/src/main/java/com/keyman/engine/util/DownloadFileUtils.java b/android/KMEA/app/src/main/java/com/keyman/engine/util/DownloadFileUtils.java
index c16d3d381d..d9315f3f4d 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/util/DownloadFileUtils.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/util/DownloadFileUtils.java
@@ -3,7 +3,9 @@
  */
 package com.keyman.engine.util;
 
+import android.app.DownloadManager;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.OpenableColumns;
@@ -21,6 +23,37 @@ import java.io.InputStream;
 public final class DownloadFileUtils {
   private static final String TAG = "DownloadFileUtils";
 
+  private static final String DOWNLOAD_MANAGER_PACKAGE_NAME = "com.android.providers.downloads";
+
+  /**
+   * Determines whether or not Android's `DownloadManager` service is active, only
+   * returning an instance of DownloadManager when it is currently accessible and enabled.
+   * Downloads and cloud queries are impossible when it's disabled.
+   *
+   * This solution is based heavily on
+   * https://gist.github.com/Folyd/b9412bb6e2b06eb511f7.
+   * @return A valid and enabled reference to the system's DownloadManager service.  May be null
+   * if it is not accessible or is disabled.
+   */
+  public static DownloadManager getDownloadManager(Context context) {
+    DownloadManager downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
+    if(downloadManager==null) {
+      return null;
+    }
+
+    int state = context.getPackageManager().getApplicationEnabledSetting(DOWNLOAD_MANAGER_PACKAGE_NAME);
+
+    if(
+      state == PackageManager.COMPONENT_ENABLED_STATE_DISABLED ||
+        state == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER ||
+        state == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
+    ) {
+      return null;
+    };
+
+    return downloadManager;
+  }
+
   /**
    * Small class for returning information about a file downloaded via DownloadManager.
    */
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 1c60193dc7..de8b37f73e 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
@@ -4,9 +4,11 @@
 package com.keyman.engine.util;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
+import android.util.AndroidRuntimeException;
 import android.view.ViewGroup;
+import android.webkit.CookieManager;
 import android.webkit.WebView;
-import com.keyman.engine.util.KMLog;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -22,6 +24,14 @@ public final class WebViewUtils {
     FULL;         // WebView supports touch keyboards and LDML keyboards
   }
 
+  // System WebView status
+  public enum SystemWebViewStatus {
+    UNDETERMINED,  // Functionality not determined yet
+    NOT_INSTALLED, // WebView not installed
+    DISABLED,      // WebView installed, but disabled
+    FULL;          // WebView installed and enabled
+  }
+
   private static final String CHROME_INSTALL_PATTERN_FORMATSTR = "^.*Chrome/([\\d.]+).*$";
   private static final Pattern installPattern = Pattern.compile(CHROME_INSTALL_PATTERN_FORMATSTR);
 
@@ -51,6 +61,34 @@ public final class WebViewUtils {
     return EngineWebViewVersionStatus.FULL;
   }
 
+  /**
+   * Determine the state of the system WebView (required for Keyman)
+   * @param context
+   * @return {SystemWebViewStatus}
+   */
+  public static SystemWebViewStatus getSystemWebViewStatus(
+      Context context) {
+    // Check whether WebView is installed
+    // If the package is installed but disabled, hasSystemFeature() still returns true
+    PackageManager packageManager = context.getPackageManager();
+    if (!packageManager.hasSystemFeature("android.software.webview")) {
+      return SystemWebViewStatus.NOT_INSTALLED;
+    }
+
+    // Use CookieManager to check if WebView is really enabled
+    // https://stackoverflow.com/a/70354583
+    try {
+      CookieManager.getInstance();
+    } catch (AndroidRuntimeException e) {
+      // WebView installed but not enabled
+      return SystemWebViewStatus.DISABLED;
+    } catch (Exception e) {
+      return SystemWebViewStatus.DISABLED;
+    }
+
+    return SystemWebViewStatus.FULL;
+  }
+
   // Inject a meta viewport tag into the head of the file if it doesn't exist
   public static void injectViewport(WebView webView) {
     if (webView != null) {
diff --git a/android/KMEA/app/src/main/res/values-b+el/strings.xml b/android/KMEA/app/src/main/res/values-b+el/strings.xml
index 75c774ebd1..967386eb36 100644
--- a/android/KMEA/app/src/main/res/values-b+el/strings.xml
+++ b/android/KMEA/app/src/main/res/values-b+el/strings.xml
@@ -133,10 +133,15 @@
     <string name="keyboard_install_toast" comment="Notification when a keyboard is installed">Τὸ πληκτρολόγιο %1$s ἐγκατεστάθη</string>
     <!-- Context: Language Settings Keyboard uninstall strings -->
     <string name="keyboard_deleted_toast" comment="Notification when a keyboard is deleted">Τὸ πληκτρολόγιο διεγράφη</string>
-    <!-- Context: Language Settings menu strings -->
+    <!-- Context: Language Settings menu strings. Removed in Keyman 18 -->
     <string name="enable_corrections" comment="Enable corrections from the suggestion banner">Ἐνεργοποιῆστε τὶς διορθώσεις</string>
-    <!-- Context: Language Settings menu strings -->
+    <!-- Context: Language Settings menu strings. Removed in Keyman 18 -->
     <string name="enable_predictions" comment="Enable predictions from the suggestion banner">Ἐνεργοποιῆστε προβλέψεις κειμένου</string>
+    <!-- Context: Language Settings menu strings - radio buttons -->
+    <string name="suggestions_radio_0" comment="Predictions and corrections disabled">Ἀπενεργοποίηση προτάσεων</string>
+    <string name="suggestions_radio_1" comment="Suggestions Enabled: Predictions with no corrections">Μόνο προβλέψεις</string>
+    <string name="suggestions_radio_2" comment="Suggestions Enabled: Predictions with corrections">Προβλέψεις καὶ διορθώσεις</string>
+    <string name="suggestions_radio_3" comment="Suggestions Enabled: Predictions with auto-corrections">Προβλέψεις μὲ αὐτόματες διορθώσεις</string>
     <!-- Context: Language Settings menu strings -->
     <string name="model_label">Λεξικό</string>
     <plurals name="model_count">
diff --git a/android/KMEA/app/src/main/res/values-mnw-rMM/strings.xml b/android/KMEA/app/src/main/res/values-mnw-rMM/strings.xml
index 8a7742cd81..1ba2e20cbe 100644
--- a/android/KMEA/app/src/main/res/values-mnw-rMM/strings.xml
+++ b/android/KMEA/app/src/main/res/values-mnw-rMM/strings.xml
@@ -131,10 +131,15 @@
     <string name="keyboard_install_toast" comment="Notification when a keyboard is installed">ကဳဗုဒ် %1$s စုတ်လဝ်တုဲ</string>
     <!-- Context: Language Settings Keyboard uninstall strings -->
     <string name="keyboard_deleted_toast" comment="Notification when a keyboard is deleted">ဇိုတ် ကဳဗုဒ်တုဲ</string>
-    <!-- Context: Language Settings menu strings -->
+    <!-- Context: Language Settings menu strings. Removed in Keyman 18 -->
     <string name="enable_corrections" comment="Enable corrections from the suggestion banner">ပံက် ပလေဝ်ဒါန်</string>
-    <!-- Context: Language Settings menu strings -->
+    <!-- Context: Language Settings menu strings. Removed in Keyman 18 -->
     <string name="enable_predictions" comment="Enable predictions from the suggestion banner">ပံက် တၚ်ချိၚ်ခယျဂမၠိုၚ်</string>
+    <!-- Context: Language Settings menu strings - radio buttons -->
+    <string name="suggestions_radio_0" comment="Predictions and corrections disabled">Disable suggestions</string>
+    <string name="suggestions_radio_1" comment="Suggestions Enabled: Predictions with no corrections">တၚ်ချိၚ်ခယျဂမၠိုၚ်ဟေၚ်</string>
+    <string name="suggestions_radio_2" comment="Suggestions Enabled: Predictions with corrections">တၚ်ချၚ်ခယျ ကေုာံ တၚ်ပလေဝ်ဂမၠိုၚ်</string>
+    <string name="suggestions_radio_3" comment="Suggestions Enabled: Predictions with auto-corrections">တၚ်ချိၚ်ခယျနကဵု တၚ်ပလေဝ်အဝ်တဵု</string>
     <!-- Context: Language Settings menu strings -->
     <string name="model_label">အဘိဓာန်</string>
     <plurals name="model_count">
diff --git a/android/KMEA/app/src/main/res/values/strings.xml b/android/KMEA/app/src/main/res/values/strings.xml
index 5c5d6f3173..86f2076586 100644
--- a/android/KMEA/app/src/main/res/values/strings.xml
+++ b/android/KMEA/app/src/main/res/values/strings.xml
@@ -9,14 +9,14 @@
 
     <!-- Context: Title for list -->
     <plurals name="title_keyboards">
-      <item quantity="one">Keyboard</item>
-      <item quantity="other">Keyboards</item>
+        <item quantity="one">Keyboard</item>
+        <item quantity="other">Keyboards</item>
     </plurals>
 
     <!-- Context: Title for list -->
     <plurals name="title_other_input_methods">
-      <item quantity="one">Other Input Method</item>
-      <item quantity="other">Other Input Methods</item>
+        <item quantity="one">Other Input Method</item>
+        <item quantity="other">Other Input Methods</item>
     </plurals>
 
     <!-- Context: Title for list -->
@@ -127,10 +127,24 @@
     <string name="fatal_keyboard_error" comment="Fatal keyboard error (keyboard ID::packageID for language). Will load default keyboard">
       Fatal keyboard error with %1$s:%2$s for %3$s language. Loading default keyboard.</string>
 
-  <!-- Context: Fatal keyboard error.  -->
-  <string name="fatal_keyboard_error_short" comment="Error in keyboard (keyboard ID::packageID for language).">
+    <!-- Context: Fatal keyboard error.  -->
+    <string name="fatal_keyboard_error_short" comment="Error in keyboard (keyboard ID::packageID for language).">
       Error in keyboard %1$s:%2$s for %3$s language.</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>
+
+    <!-- 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>
+
+    <!-- Context Button label: Install WebView -->
+    <string name="label_install_webview" comment="Button label to install webview">Install WebView</string>
+
+    <!-- Context Button label: Enable WebView -->
+    <string name="label_enable_webview" comment="Button label to enable webview">Enable WebView</string>
+
     <!-- Context: Query for associated dictionary -->
     <string name="query_associated_model" comment="Check if there's an available dictionary to download">Checking for associated dictionary to download</string>
 
@@ -184,6 +198,9 @@
     <!-- Context: General Updates -->
     <string name="update_check_unavailable" comment="Error message when a Keyman server can't be reached">Failed to access server!</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>
+
     <!-- Context: General Updates -->
     <string name="update_check_current" comment="Notification that all resources are up to date">"All resources are up to date!"</string>
 
@@ -229,8 +246,8 @@
     <!-- Context: Language Settings menu strings -->
     <string name="model_label">Dictionary</string>
     <plurals name="model_count">
-      <item quantity="one">Dictionary</item>
-      <item quantity="other">Dictionaries</item>
+        <item quantity="one">Dictionary</item>
+        <item quantity="other">Dictionaries</item>
     </plurals>
 
     <!-- Context: Language Settings menu substring - Check for available dictionary -->
@@ -251,8 +268,8 @@
 
     <!-- Context: Language Settings menu strings -->
     <plurals name="keyboard_count">
-      <item quantity="one">(%1$d keyboard)</item>
-      <item quantity="other">(%1$d keyboards)</item>
+        <item quantity="one">(%1$d keyboard)</item>
+        <item quantity="other">(%1$d keyboards)</item>
     </plurals>
 
 
@@ -278,4 +295,5 @@
 
     <!-- Context: anywhere -->
     <string name="unable_to_open_browser" comment="Notification when a browser activity cannot be launched">Unable to launch web browser</string>
+
 </resources>
diff --git a/android/KMEA/app/src/main/res/values/styles.xml b/android/KMEA/app/src/main/res/values/styles.xml
index e21242fea9..ef8daf5ca9 100644
--- a/android/KMEA/app/src/main/res/values/styles.xml
+++ b/android/KMEA/app/src/main/res/values/styles.xml
@@ -22,6 +22,9 @@
         <item name="android:textColorPrimary">@android:color/black</item>
         <item name="android:windowBackground">@android:color/transparent</item>
     </style>
+    <style name="AppTheme.NoTitleDialog" parent="AppTheme.Light.Dialog">
+        <item name="windowNoTitle">true</item>
+    </style>
 
     <style name="AppTheme.Dialog.Alert" parent="Theme.AppCompat.Light.Dialog.Alert">
         <item name="android:textColor">@android:color/black</item>
diff --git a/android/docs/engine/KMManager/getLongpressDelay.md b/android/docs/engine/KMManager/getLongpressDelay.md
index 6fb0e872dc..1bc4d3b8cd 100644
--- a/android/docs/engine/KMManager/getLongpressDelay.md
+++ b/android/docs/engine/KMManager/getLongpressDelay.md
@@ -34,5 +34,4 @@ The following code illustrates the use of `getLongpressDelay()`:
 Keyman Engine for Android 18.0: New function.
 
 ## See also
-* [sendOptionsToKeyboard](sendOptionsToKeyboard)
 * [setLongpressDelay](setLongpressDelay)
diff --git a/android/docs/engine/KMManager/index.md b/android/docs/engine/KMManager/index.md
index 9a8cc4a796..519bd8ab55 100644
--- a/android/docs/engine/KMManager/index.md
+++ b/android/docs/engine/KMManager/index.md
@@ -212,9 +212,6 @@ The KMManager is the core class which provides most of the methods and constants
 [`removeKeyboardEventListener()`](removeKeyboardEventListener)
 : removes the specified listener from the list of keyboard event listeners
 
-[`sendOptionsToKeyboard()`](sendOptionsToKeyboard)
-: sends options like longpress delay to the KeymanWeb keyboard
-
 [`setCanAddNewKeyboard()`](setCanAddNewKeyboard)
 : sets whether adding a new keyboard is allowed
 
diff --git a/android/docs/engine/KMManager/sendOptionsToKeyboard.md b/android/docs/engine/KMManager/sendOptionsToKeyboard.md
deleted file mode 100644
index 399dfc7912..0000000000
--- a/android/docs/engine/KMManager/sendOptionsToKeyboard.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-title: KMManager.sendOptionsToKeyboard()
----
-
-## Summary
-
-The `sendOptionsToKeyboard()` method sends options like longpress delay to the KeymanWeb keyboard.
-
-## Syntax
-
-```java
-KMManager.sendOptionsToKeyboard()
-```
-
-## Description
-Use this method to update options in the KeymanWeb keyboard.
-* Number of milliseconds to trigger a longpress gesture
-
-This method requires a keyboard to be loaded for the values to take effect.
-
-## Examples
-
-### Example: Using `sendOptionsToKeyboard()`
-
-The following code illustrates the use of `sendOptionsToKeyboard()`:
-```java
-    int currentDelayTimeMS = 250;
-
-    // Store currentDelayTimeMS
-    KMManager.setLongpressDelay(currentDelayTimeMS);
-
-    // Apply the keyboard options
-    KMManager.sendOptionsToKeyboard();
-```
-
-## History
-Keyman Engine for Android 18.0: New function.
-
-## See also
-* [getLongpressDelay](getLongpressDelay)
-* [setLongpressDelay](setLongpressDelay)
diff --git a/android/docs/engine/KMManager/setLongpressDelay.md b/android/docs/engine/KMManager/setLongpressDelay.md
index e4666c867b..118343b432 100644
--- a/android/docs/engine/KMManager/setLongpressDelay.md
+++ b/android/docs/engine/KMManager/setLongpressDelay.md
@@ -4,7 +4,7 @@ title: KMManager.setLongpressDelay()
 
 ## Summary
 
-The `setLongpressDelay()` method sets the number of milliseconds to trigger a longpress gesture as a stored preference.
+The `setLongpressDelay()` method sets the number of milliseconds to trigger a longpress gesture, applies to the keyboard, and stores preference.
 
 ## Syntax
 
@@ -27,11 +27,8 @@ The following code illustrates the use of `setLongpressDelay()`:
 ```java
     int currentDelayTimeMS = 300;
 
-    // Store currentDelayTimeMS
+    // Store currentDelayTimeMS and applies
     KMManager.setLongpressDelay(currentDelayTimeMS);
-
-    // Apply the keyboard options
-    KMManager.sendOptionsToKeyboard();
 ```
 
 ## History
@@ -39,4 +36,3 @@ Keyman Engine for Android 18.0: New function.
 
 ## See also
 * [getLongpressDelay](getLongpressDelay)
-* [sendOptionsToKeyboard](sendOptionsToKeyboard)
diff --git a/common/resources/bitmaps/windows/kmshell/FullSizeCtrlK.png b/common/resources/bitmaps/windows/kmshell/FullSizeCtrlK.png
new file mode 100644
index 0000000000..1d8c734184
Binary files /dev/null and b/common/resources/bitmaps/windows/kmshell/FullSizeCtrlK.png differ
diff --git a/common/resources/bitmaps/windows/kmshell/FullSizeKeyboard.png b/common/resources/bitmaps/windows/kmshell/FullSizeKeyboard.png
new file mode 100644
index 0000000000..01659f4893
Binary files /dev/null and b/common/resources/bitmaps/windows/kmshell/FullSizeKeyboard.png differ
diff --git a/common/resources/bitmaps/windows/kmshell/FullSizeQuestionMark.png b/common/resources/bitmaps/windows/kmshell/FullSizeQuestionMark.png
new file mode 100644
index 0000000000..fb137e9689
Binary files /dev/null and b/common/resources/bitmaps/windows/kmshell/FullSizeQuestionMark.png differ
diff --git a/common/resources/bitmaps/windows/kmshell/FullSizeSpeechBubble.png b/common/resources/bitmaps/windows/kmshell/FullSizeSpeechBubble.png
new file mode 100644
index 0000000000..c8010bcf84
Binary files /dev/null and b/common/resources/bitmaps/windows/kmshell/FullSizeSpeechBubble.png differ
diff --git a/common/resources/bitmaps/windows/kmshell/FullSizeUpdate.png b/common/resources/bitmaps/windows/kmshell/FullSizeUpdate.png
new file mode 100644
index 0000000000..97697298c8
Binary files /dev/null and b/common/resources/bitmaps/windows/kmshell/FullSizeUpdate.png differ
diff --git a/common/resources/bitmaps/windows/kmshell/FullSizeWrench.png b/common/resources/bitmaps/windows/kmshell/FullSizeWrench.png
new file mode 100644
index 0000000000..07b61039b0
Binary files /dev/null and b/common/resources/bitmaps/windows/kmshell/FullSizeWrench.png differ
diff --git a/common/resources/bitmaps/windows/kmshell/Keyman Commission Configuration Icon .clip b/common/resources/bitmaps/windows/kmshell/Keyman Commission Configuration Icon .clip
new file mode 100644
index 0000000000..cd9ef3a08c
Binary files /dev/null and b/common/resources/bitmaps/windows/kmshell/Keyman Commission Configuration Icon .clip differ
diff --git a/common/test/keyboards/baseline/.gitignore b/common/test/keyboards/baseline/.gitignore
new file mode 100644
index 0000000000..ad64e3abca
--- /dev/null
+++ b/common/test/keyboards/baseline/.gitignore
@@ -0,0 +1 @@
+kmcomp/
\ No newline at end of file
diff --git a/common/test/keyboards/baseline/build.sh b/common/test/keyboards/baseline/build.sh
new file mode 100755
index 0000000000..065e2593c5
--- /dev/null
+++ b/common/test/keyboards/baseline/build.sh
@@ -0,0 +1,36 @@
+#!/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.inc.sh"
+## END STANDARD BUILD SCRIPT INCLUDE
+
+builder_describe "Baseline keyboards tests -- built with 16.0 compiler" \
+  clean \
+  configure \
+  build
+
+builder_describe_platform \
+  :project  win
+
+builder_parse "$@"
+
+builder_describe_outputs \
+  configure   kmcomp/kmcomp.exe \
+  build       k_000___null_keyboard.kmx
+
+do_configure() {
+  mkdir -p kmcomp
+  unzip kmcomp-16.0.138.zip -d kmcomp/
+}
+
+do_build() {
+  local name
+  for name in *.kmn; do
+    ./kmcomp/kmcomp.exe -no-compiler-version -d "$name"
+  done
+}
+
+builder_run_action clean      rm -rf *.kmx ./kmcomp/
+builder_run_action configure  do_configure
+builder_run_action build      do_build
diff --git a/common/test/keyboards/baseline/k_050___nul_and_context.kmn b/common/test/keyboards/baseline/k_050___nul_and_context.kmn
new file mode 100644
index 0000000000..206777b7f0
--- /dev/null
+++ b/common/test/keyboards/baseline/k_050___nul_and_context.kmn
@@ -0,0 +1,15 @@
+store(&NAME) '050 - nul_and_context'
+c Description: Tests that context has the right offset when used with nul
+c keys: [K_T][K_B]
+c expected: 2t3
+c context:
+
+store(&version) '10.0'
+
+begin Unicode > use(Main)
+
+store(cons) 'mnpqrstv'
+
+group(Main) using keys
+
+nul any(cons) + 'b' > '2' context(2) '3'
diff --git a/common/test/keyboards/baseline/k_050___nul_and_context.kmx b/common/test/keyboards/baseline/k_050___nul_and_context.kmx
new file mode 100644
index 0000000000..a777f48e2c
Binary files /dev/null and b/common/test/keyboards/baseline/k_050___nul_and_context.kmx differ
diff --git a/common/test/keyboards/baseline/k_051___if_and_context.kmn b/common/test/keyboards/baseline/k_051___if_and_context.kmn
new file mode 100644
index 0000000000..7a6a3e3f63
--- /dev/null
+++ b/common/test/keyboards/baseline/k_051___if_and_context.kmn
@@ -0,0 +1,16 @@
+store(&NAME) '051 - if_and_context'
+c Description: Tests that context has the right offset when used with if
+c keys: [K_T][K_D]
+c expected: 4t5
+c context:
+
+store(&version) '10.0'
+
+begin Unicode > use(Main)
+
+store(cons) 'mnpqrstv'
+store(ifx) '1'
+
+group(Main) using keys
+
+if(ifx = '1') any(cons) + 'd' > '4' context(2) '5'
diff --git a/common/test/keyboards/baseline/k_051___if_and_context.kmx b/common/test/keyboards/baseline/k_051___if_and_context.kmx
new file mode 100644
index 0000000000..facfe91859
Binary files /dev/null and b/common/test/keyboards/baseline/k_051___if_and_context.kmx differ
diff --git a/common/test/keyboards/baseline/k_052___nul_and_index.kmn b/common/test/keyboards/baseline/k_052___nul_and_index.kmn
new file mode 100644
index 0000000000..c56c411c07
--- /dev/null
+++ b/common/test/keyboards/baseline/k_052___nul_and_index.kmn
@@ -0,0 +1,16 @@
+store(&NAME) '052 - nul_and_index'
+c Description: Tests that context has the right offset when used with nul
+c keys: [K_T][K_B]
+c expected: 2T3
+c context:
+
+store(&version) '10.0'
+
+begin Unicode > use(Main)
+
+store(cons) 'mnpqrstv'
+store(outs) 'MNPQRSTV'
+
+group(Main) using keys
+
+nul any(cons) + 'b' > '2' index(outs, 2) '3'
diff --git a/common/test/keyboards/baseline/k_052___nul_and_index.kmx b/common/test/keyboards/baseline/k_052___nul_and_index.kmx
new file mode 100644
index 0000000000..7e533db791
Binary files /dev/null and b/common/test/keyboards/baseline/k_052___nul_and_index.kmx differ
diff --git a/common/test/keyboards/baseline/k_053___if_and_index.kmn b/common/test/keyboards/baseline/k_053___if_and_index.kmn
new file mode 100644
index 0000000000..86479a8e88
--- /dev/null
+++ b/common/test/keyboards/baseline/k_053___if_and_index.kmn
@@ -0,0 +1,18 @@
+store(&NAME) '053 - if_and_index'
+c Description: Tests that index() has the right offset when used with if
+c keys: [K_T][K_D]
+c expected: 4T5
+c context:
+
+store(&version) '10.0'
+
+begin Unicode > use(Main)
+
+store(cons) 'mnpqrstv'
+store(outs) 'MNPQRSTV'
+store(ifx) '1'
+
+group(Main) using keys
+
+if(ifx = '1') any(cons) + 'd' > '4' index(outs, 2) '5'
+
diff --git a/common/test/keyboards/baseline/k_053___if_and_index.kmx b/common/test/keyboards/baseline/k_053___if_and_index.kmx
new file mode 100644
index 0000000000..ee42613034
Binary files /dev/null and b/common/test/keyboards/baseline/k_053___if_and_index.kmx differ
diff --git a/common/test/keyboards/baseline/kmcomp-16.0.138.zip b/common/test/keyboards/baseline/kmcomp-16.0.138.zip
new file mode 100644
index 0000000000..22da4a171d
Binary files /dev/null and b/common/test/keyboards/baseline/kmcomp-16.0.138.zip differ
diff --git a/common/windows/delphi/components/build.sh b/common/windows/delphi/components/build.sh
index e854888993..86bad135e0 100755
--- a/common/windows/delphi/components/build.sh
+++ b/common/windows/delphi/components/build.sh
@@ -5,7 +5,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "${THIS_SCRIPT%/*}/../../../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-builder_describe "Common Delphi components" clean configure build test
+builder_describe "Common Delphi components" clean configure build test edit
 builder_parse "$@"
 
 #-------------------------------------------------------------------------------------------------------------------
@@ -28,3 +28,4 @@ builder_run_action clean:project        clean_windows_project_files
 builder_run_action configure:project    configure_windows_build_environment
 builder_run_action build:project        do_build
 # builder_run_action test:project         do_test
+builder_run_action edit:project         start common_components.dproj
diff --git a/common/windows/delphi/general/KeymanPaths.pas b/common/windows/delphi/general/KeymanPaths.pas
index 08554852cc..4086be32ce 100644
--- a/common/windows/delphi/general/KeymanPaths.pas
+++ b/common/windows/delphi/general/KeymanPaths.pas
@@ -19,6 +19,9 @@ type
     const S_CustomisationFilename = 'desktop_pro.pxx';
 
     const S_KeymanAppData_UpdateCache = 'Keyman\UpdateCache\';
+
+    class var FHaveCachedKeymanRoot: Boolean;
+    class var FCachedKeymanRoot: string;
   public
     const S_KMShell = 'kmshell.exe';
     const S_TSysInfoExe = 'tsysinfo.exe';
@@ -434,12 +437,21 @@ end;
 
 class function TKeymanPaths.RunningFromSource(var keyman_root: string): Boolean;
 begin
+  if FHaveCachedKeymanRoot then
+  begin
+    keyman_root := FCachedKeymanRoot;
+    Exit(keyman_root <> '');
+  end;
   // On developer machines, if we are running within the source repo, then use
   // those paths
-  keyman_root := GetEnvironmentVariable('KEYMAN_ROOT');
+  keyman_root := GetEnvironmentVariable('KEYMAN_ROOT').Replace('/', '\', [rfReplaceAll]);
   if keyman_root <> '' then
     keyman_root := IncludeTrailingPathDelimiter(keyman_root);
   Result := (keyman_root <> '') and SameText(keyman_root, ParamStr(0).Substring(0, keyman_root.Length));
+
+  FHaveCachedKeymanRoot := True;
+  if Result then
+    FCachedKeymanRoot := keyman_root;
 end;
 
 class function TKeymanPaths.KeymanCoreLibraryPath(const Filename: string): string;
diff --git a/common/windows/delphi/tools/build_standards_data/build.sh b/common/windows/delphi/tools/build_standards_data/build.sh
index 679ff0d8af..3d39aefe9d 100755
--- a/common/windows/delphi/tools/build_standards_data/build.sh
+++ b/common/windows/delphi/tools/build_standards_data/build.sh
@@ -5,7 +5,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-builder_describe "Build build_standards_data tool" clean configure build test
+builder_describe "Build build_standards_data tool" clean configure build test edit
 builder_parse "$@"
 
 #-------------------------------------------------------------------------------------------------------------------
@@ -49,3 +49,4 @@ builder_run_action clean:project        clean_windows_project_files
 builder_run_action configure:project    configure_windows_build_environment
 builder_run_action build:project        do_build
 # builder_run_action test:project         do_test
+builder_run_action edit:project         start build_standards_data.dproj
diff --git a/common/windows/delphi/tools/buildunidata/build.sh b/common/windows/delphi/tools/buildunidata/build.sh
index 0e0ef9ea47..b4e13c264d 100755
--- a/common/windows/delphi/tools/buildunidata/build.sh
+++ b/common/windows/delphi/tools/buildunidata/build.sh
@@ -7,7 +7,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 builder_describe "Unicode character database build tool" \
   @/common/windows/delphi:keymanversion \
-  clean configure build test
+  clean configure build test edit
 builder_parse "$@"
 
 #-------------------------------------------------------------------------------------------------------------------
@@ -30,3 +30,4 @@ builder_run_action clean:project        clean_windows_project_files
 builder_run_action configure:project    configure_windows_build_environment
 builder_run_action build:project        do_build
 # builder_run_action test:project         do_test
+builder_run_action edit:project         start buildunidata.dproj
diff --git a/common/windows/delphi/tools/devtools/build.sh b/common/windows/delphi/tools/devtools/build.sh
index 67086a91fd..f514ea7578 100755
--- a/common/windows/delphi/tools/devtools/build.sh
+++ b/common/windows/delphi/tools/devtools/build.sh
@@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 builder_describe \
   "Development and build utilities for Delphi" \
   @/common/windows/delphi:keymanversion \
-  clean configure build test prepublish
+  clean configure build test prepublish edit
 
 builder_parse "$@"
 
@@ -30,3 +30,4 @@ builder_run_action configure:project    configure_windows_build_environment
 builder_run_action build:project        delphi_msbuild devtools.dproj "//p:Platform=Win32"
 # builder_run_action test:project         do_test
 builder_run_action prepublish:project   "$DEVTOOLS" -rt
+builder_run_action edit:project         start devtools.dproj
diff --git a/common/windows/delphi/tools/sentrytool/build.sh b/common/windows/delphi/tools/sentrytool/build.sh
index d496cdfce3..ca4e427c39 100755
--- a/common/windows/delphi/tools/sentrytool/build.sh
+++ b/common/windows/delphi/tools/sentrytool/build.sh
@@ -5,7 +5,8 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-builder_describe "Sentrytool for converting Delphi symbols into sentry-readable format" clean configure build test
+builder_describe "Sentrytool for converting Delphi symbols into sentry-readable format" \
+  clean configure build test edit
 builder_parse "$@"
 
 #-------------------------------------------------------------------------------------------------------------------
@@ -30,3 +31,4 @@ builder_run_action clean:project        clean_windows_project_files
 builder_run_action configure:project    configure_windows_build_environment
 builder_run_action build:project        delphi_msbuild sentrytool.dproj "//p:Platform=Win32"
 # builder_run_action test:project         do_test
+builder_run_action edit:project         start sentrytool.dproj
diff --git a/common/windows/delphi/tools/test-klog/build.sh b/common/windows/delphi/tools/test-klog/build.sh
index 275d3c9cf0..b271565cae 100755
--- a/common/windows/delphi/tools/test-klog/build.sh
+++ b/common/windows/delphi/tools/test-klog/build.sh
@@ -5,7 +5,8 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-builder_describe "Tool for validating klog is disabled for release builds" clean configure build test prepublish
+builder_describe "Tool for validating klog is disabled for release builds" \
+  clean configure build test prepublish edit
 builder_parse "$@"
 
 #-------------------------------------------------------------------------------------------------------------------
@@ -33,3 +34,4 @@ builder_run_action configure:project    configure_windows_build_environment
 builder_run_action build:project        do_build
 # builder_run_action test:project         do_test
 builder_run_action prepublish:project  "$WIN32_TARGET_PATH/test_klog.exe"
+builder_run_action edit:project         start test_klog.dproj
diff --git a/common/windows/delphi/tools/verify_signatures/build.sh b/common/windows/delphi/tools/verify_signatures/build.sh
index 69afa9c0c6..f53883c70e 100755
--- a/common/windows/delphi/tools/verify_signatures/build.sh
+++ b/common/windows/delphi/tools/verify_signatures/build.sh
@@ -5,7 +5,8 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 . "${THIS_SCRIPT%/*}/../../../../../resources/build/builder.inc.sh"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
-builder_describe "Tool to verify all Windows executable signatures and manifests" clean configure build test verify
+builder_describe "Tool to verify all Windows executable signatures and manifests" \
+  clean configure build test verify edit
 builder_parse "$@"
 
 #-------------------------------------------------------------------------------------------------------------------
@@ -27,3 +28,4 @@ builder_run_action clean:project        clean_windows_project_files
 builder_run_action configure:project    configure_windows_build_environment
 builder_run_action build:project        do_build
 # builder_run_action test:project         do_test
+builder_run_action edit:project         start verify_signatures.dproj
diff --git a/core/build.sh b/core/build.sh
index 168cc1cbcf..18a1515515 100755
--- a/core/build.sh
+++ b/core/build.sh
@@ -29,6 +29,7 @@ archtargets=(":wasm   WASM build")
 case $BUILDER_OS in
   win)
     archtargets+=(
+      ":win    Both x86 and x64"
       ":x86    32-bit Windows (x86) build"
       ":x64    64-bit Windows (x64) build"
     )
@@ -92,9 +93,12 @@ fi
 # generates a 'fat' library from them.
 builder_describe_internal_dependency \
   build:mac build:mac-x86_64 \
-  build:mac build:mac-arm64
+  build:mac build:mac-arm64 \
+  build:win build:x86 \
+  build:win build:x64
 
 builder_describe_outputs \
+  configure:win             /core/build/win/$BUILDER_CONFIGURATION/ \
   configure:x86             /core/build/x86/$BUILDER_CONFIGURATION/build.ninja \
   configure:x64             /core/build/x64/$BUILDER_CONFIGURATION/build.ninja \
   configure:mac             /core/build/mac/$BUILDER_CONFIGURATION/ \
@@ -102,6 +106,7 @@ builder_describe_outputs \
   configure:mac-arm64       /core/build/mac-arm64/$BUILDER_CONFIGURATION/build.ninja \
   configure:arch            /core/build/arch/$BUILDER_CONFIGURATION/build.ninja \
   configure:wasm            /core/build/wasm/$BUILDER_CONFIGURATION/build.ninja \
+  build:win                 /core/build/win/$BUILDER_CONFIGURATION/BUILT \
   build:x86                 /core/build/x86/$BUILDER_CONFIGURATION/src/libkeymancore.a \
   build:x64                 /core/build/x64/$BUILDER_CONFIGURATION/src/libkeymancore.a \
   build:mac                 /core/build/mac/$BUILDER_CONFIGURATION/libkeymancore.a \
@@ -139,24 +144,21 @@ do_action clean
 
 do_action configure
 
-# After we have built the necessary internal dependencies, then we can go
-# ahead and build a fat library for external consumption
-if builder_start_action configure:mac; then
-  mkdir -p "$KEYMAN_ROOT/core/build/mac/$BUILDER_CONFIGURATION"
-  builder_finish_action success configure:mac
-fi
+# After we have built the necessary internal dependencies, then we can go ahead
+# and build a fat library for external consumption for mac, and no-op for win
+builder_run_action configure:mac   mkdir -p "$KEYMAN_ROOT/core/build/mac/$BUILDER_CONFIGURATION"
+builder_run_action configure:win   mkdir -p "$KEYMAN_ROOT/core/build/win/$BUILDER_CONFIGURATION"
 
 # -------------------------------------------------------------------------------
 
 do_action build
 
-if builder_start_action build:mac; then
-  lipo -create \
-    "$KEYMAN_ROOT/core/build/mac-x86_64/$BUILDER_CONFIGURATION/src/libkeymancore.a" \
-    "$KEYMAN_ROOT/core/build/mac-arm64/$BUILDER_CONFIGURATION/src/libkeymancore.a" \
-    -output "$KEYMAN_ROOT/core/build/mac/$BUILDER_CONFIGURATION/libkeymancore.a"
-  builder_finish_action success build:mac
-fi
+builder_run_action build:mac lipo -create \
+  "$KEYMAN_ROOT/core/build/mac-x86_64/$BUILDER_CONFIGURATION/src/libkeymancore.a" \
+  "$KEYMAN_ROOT/core/build/mac-arm64/$BUILDER_CONFIGURATION/src/libkeymancore.a" \
+  -output "$KEYMAN_ROOT/core/build/mac/$BUILDER_CONFIGURATION/libkeymancore.a"
+
+builder_run_action build:win touch "$KEYMAN_ROOT/core/build/win/$BUILDER_CONFIGURATION/BUILT"
 
 # -------------------------------------------------------------------------------
 
@@ -177,6 +179,15 @@ if builder_start_action test:mac; then
   builder_finish_action success test:mac
 fi
 
+if builder_start_action test:win; then
+  # We can assume that build:win has run so both architectures will be available
+  MESON_PATH="$KEYMAN_ROOT/core/build/x86/$BUILDER_CONFIGURATION"
+  meson test -C "$MESON_PATH" $testparams
+  MESON_PATH="$KEYMAN_ROOT/core/build/x64/$BUILDER_CONFIGURATION"
+  meson test -C "$MESON_PATH" $testparams
+  builder_finish_action success test:win
+fi
+
 # -------------------------------------------------------------------------------
 
 do_action install
diff --git a/core/src/kmx/kmx_processevent.cpp b/core/src/kmx/kmx_processevent.cpp
index 70d20102bc..921e8d9212 100644
--- a/core/src/kmx/kmx_processevent.cpp
+++ b/core/src/kmx/kmx_processevent.cpp
@@ -23,6 +23,7 @@ KMX_ProcessEvent::KMX_ProcessEvent() : m_actions(&m_context), m_options(&m_keybo
   m_indexStack = new KMX_WORD[GLOBAL_ContextStackSize];
   m_miniContext = new KMX_WCHAR[GLOBAL_ContextStackSize];
   m_miniContextIfLen = 0;
+  m_miniContextStartsWithNul = FALSE;
   m_debug_items = nullptr;
 }
 
@@ -338,10 +339,14 @@ KMX_BOOL KMX_ProcessEvent::ProcessGroup(LPGROUP gp, KMX_BOOL *pOutputKeystroke)
   m_miniContextIfLen = xstrlen(kkp->dpContext) - xstrlen_ignoreifopt(kkp->dpContext);
 
   // 11 Aug 2003 - I25(v6) - mcdurdin - CODE_NUL context support
-  if(*kkp->dpContext == UC_SENTINEL && *(kkp->dpContext+1) == CODE_NUL)
+  if(*kkp->dpContext == UC_SENTINEL && *(kkp->dpContext+1) == CODE_NUL) {
+    m_miniContextStartsWithNul = TRUE;
     u16cpy(m_miniContext, /*GLOBAL_ContextStackSize,*/ m_context.Buf(xstrlen_ignoreifopt(kkp->dpContext)-1) /*, GLOBAL_ContextStackSize*/);  // I3162   // I3536
-  else
+  }
+  else {
+    m_miniContextStartsWithNul = FALSE;
     u16cpy(m_miniContext, /*GLOBAL_ContextStackSize,*/ m_context.Buf(xstrlen_ignoreifopt(kkp->dpContext)) /*, GLOBAL_ContextStackSize*/);  // I3162   // I3536
+  }
 
   m_miniContext[GLOBAL_ContextStackSize-1] = 0;
 
@@ -458,7 +463,12 @@ int KMX_ProcessEvent::PostString(PKMX_WCHAR str, LPKEYBOARD lpkb, PKMX_WCHAR end
       }
       case CODE_CONTEXTEX:
         p++;
-        for (q = m_miniContext, i = m_miniContextIfLen; *q && i < *p - 1; i++, q = incxstr(q));
+        // We have to exclude nul and if() statements from our offset calculation
+        i = m_miniContextIfLen;
+        if(m_miniContextStartsWithNul) {
+          i++;
+        }
+        for (q = m_miniContext; *q && i < *p - 1; i++, q = incxstr(q));
         if (*q) {
           KMX_BOOL ignoreOutputKeystroke;
           temp = incxstr(q);
@@ -600,6 +610,7 @@ KMX_BOOL KMX_ProcessEvent::ContextMatch(LPKEY kkp)
   memset(m_indexStack, 0, GLOBAL_ContextStackSize*sizeof(KMX_WORD));
 
   p = kkp->dpContext;
+  indexp = m_indexStack;
 
   if(*p == 0)
   {
@@ -611,6 +622,7 @@ KMX_BOOL KMX_ProcessEvent::ContextMatch(LPKEY kkp)
     // If context buf is longer than the context, then obviously not start of doc.
     if(m_context.Buf(xstrlen_ignoreifopt(p))) return FALSE;
     p = incxstr(p);
+    indexp++;
     if(*p == 0) return TRUE;
   }
 
@@ -660,7 +672,6 @@ KMX_BOOL KMX_ProcessEvent::ContextMatch(LPKEY kkp)
   {
     return FALSE; // context buf is too short!
   }
-  indexp = m_indexStack;
 
   for(; *p && *q; p = incxstr(p))
   {
diff --git a/core/src/kmx/kmx_processevent.h b/core/src/kmx/kmx_processevent.h
index 090488dccb..8082c37833 100644
--- a/core/src/kmx/kmx_processevent.h
+++ b/core/src/kmx/kmx_processevent.h
@@ -38,7 +38,10 @@ class KMX_ProcessEvent {
 private:
   PKMX_WORD m_indexStack;
   PKMX_WCHAR m_miniContext;
-  int m_miniContextIfLen; // number of if() statements excluded from start of m_miniContext
+  /** number of `if()` statements excluded from start of `m_miniContext` for offset calculations */
+  int m_miniContextIfLen;
+  /** flag if we need to account for `nul` in offset calculations */
+  bool m_miniContextStartsWithNul;
   KMSTATE m_state;
   km_core_state *m_core_state;
 
diff --git a/core/tests/unit/kmx/meson.build b/core/tests/unit/kmx/meson.build
index 421a133eef..77099a2ed2 100644
--- a/core/tests/unit/kmx/meson.build
+++ b/core/tests/unit/kmx/meson.build
@@ -80,7 +80,11 @@ tests = [
   'k_046___deadkey_and_contextex',
   'k_047___caps_always_off_initially_on',
   'k_048___modifier_keys_keep_context',
-  'k_049___enter_invalidates_context'
+  'k_049___enter_invalidates_context',
+  'k_050___nul_and_context',
+  'k_051___if_and_context',
+  'k_052___nul_and_index',
+  'k_053___if_and_index',
 ]
 
 node = find_program('node', required: true)
diff --git a/developer/src/common/delphi/build.sh b/developer/src/common/delphi/build.sh
index 633c5563e9..63680a5624 100755
--- a/developer/src/common/delphi/build.sh
+++ b/developer/src/common/delphi/build.sh
@@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 builder_describe \
   "Keyman Developer Delphi components" \
   @/common/windows/delphi \
-  clean configure build test
+  clean configure build test edit
 builder_parse "$@"
 
 #-------------------------------------------------------------------------------------------------------------------
@@ -33,3 +33,4 @@ builder_run_action clean:project        clean_windows_project_files
 builder_run_action configure:project    configure_windows_build_environment
 builder_run_action build:project        do_build
 # builder_run_action test:project         do_test
+builder_run_action edit:project         start delphi_components.dproj
diff --git a/developer/src/common/delphi/components/KeymanDeveloperDebuggerMemo.pas b/developer/src/common/delphi/components/KeymanDeveloperDebuggerMemo.pas
index 3cd9397b21..c6a703581b 100644
--- a/developer/src/common/delphi/components/KeymanDeveloperDebuggerMemo.pas
+++ b/developer/src/common/delphi/components/KeymanDeveloperDebuggerMemo.pas
@@ -53,6 +53,8 @@ type
     procedure WndProc(var Message: TMessage); override;
   public
     constructor Create(AOwner: TComponent); override;
+    function GetTextCR: string;
+    function GetSelTextCR: string;
   published
     property AllowUnicode: Boolean read FAllowUnicodeInput write SetAllowUnicode default True;
     property OnMessage: TKeymanDeveloperDebuggerMessageEvent read FOnMessage write FOnMessage;
@@ -65,6 +67,9 @@ procedure Register;
 
 implementation
 
+uses
+  System.SysUtils;
+
 { TKeymanDeveloperDebuggerMemo }
 
 procedure TKeymanDeveloperDebuggerMemo.CNKeyDown(var Message: TWMKeyDown);
@@ -123,6 +128,16 @@ begin
   end;
 end;
 
+function TKeymanDeveloperDebuggerMemo.GetSelTextCR: string;
+begin
+  Result := SelText.Replace(#$0D#$0A, #$0D, [rfReplaceAll]);
+end;
+
+function TKeymanDeveloperDebuggerMemo.GetTextCR: string;
+begin
+  Result := string(Text).Replace(#$0D#$0A, #$0D, [rfReplaceAll]);
+end;
+
 procedure TKeymanDeveloperDebuggerMemo.SetAllowUnicode(const Value: Boolean);
 begin
   if Value <> fAllowUnicodeInput then
diff --git a/developer/src/common/include/kmn_compiler_errors.h b/developer/src/common/include/kmn_compiler_errors.h
index 5ca5c6acfd..c951fab330 100644
--- a/developer/src/common/include/kmn_compiler_errors.h
+++ b/developer/src/common/include/kmn_compiler_errors.h
@@ -272,6 +272,9 @@ namespace KmnCompilerMessages {
 
     HINT_IndexStoreLong =                               SevHint | 0x0B0,
 
+    ERROR_ContextExCannotReferenceIf =                  SevError | 0x0B1,
+    ERROR_ContextExCannotReferenceNul =                 SevError | 0x0B2,
+
     FATAL_BufferOverflow =                                SevFatal | 0x0C0
 //    FATAL_Break =                                         SevFatal | 0x0C1,      unused
   };
diff --git a/developer/src/kmc-copy/src/copier-messages.ts b/developer/src/kmc-copy/src/copier-messages.ts
index d4751474b9..976002a35f 100644
--- a/developer/src/kmc-copy/src/copier-messages.ts
+++ b/developer/src/kmc-copy/src/copier-messages.ts
@@ -25,11 +25,7 @@ export class CopierMessages {
     o.e ?? 'unknown error'
   );
 
-  static INFO_CopyingProject = SevInfo | 0x0002;
-  static Info_CopyingProject = (o:{type: string, id: string}) => m(
-    this.INFO_CopyingProject,
-    `Copying project of type ${def(o.type)} with id ${def(o.id)}`
-  );
+  // unused 0x0002 (was INFO_CopyingProject, now in InfrastructureMessages)
 
   static ERROR_CannotCreateFolder = SevError | 0x0003;
   static Error_CannotCreateFolder = (o:{folderName:string, e: any}) => CompilerMessageSpecWithException(
diff --git a/developer/src/kmc-generate/src/generator-messages.ts b/developer/src/kmc-generate/src/generator-messages.ts
index 185f68cbe6..fc8283763e 100644
--- a/developer/src/kmc-generate/src/generator-messages.ts
+++ b/developer/src/kmc-generate/src/generator-messages.ts
@@ -7,7 +7,7 @@
 import { CompilerErrorNamespace, CompilerErrorSeverity, CompilerMessageSpec as m, CompilerMessageDef as def, CompilerMessageSpecWithException } from "@keymanapp/developer-utils";
 
 const Namespace = CompilerErrorNamespace.Generator;
-const SevInfo = CompilerErrorSeverity.Info | Namespace;
+// const SevInfo = CompilerErrorSeverity.Info | Namespace;
 // const SevHint = CompilerErrorSeverity.Hint | Namespace;
 const SevWarn = CompilerErrorSeverity.Warn | Namespace;
 const SevError = CompilerErrorSeverity.Error | Namespace;
@@ -23,11 +23,7 @@ export class GeneratorMessages {
     o.e ?? 'unknown error',
   );
 
-  static INFO_GeneratingProject = SevInfo | 0x0002;
-  static Info_GeneratingProject = (o:{type: string, id: string}) => m(
-    this.INFO_GeneratingProject,
-    `Generating project of type ${def(o.type)} with id ${def(o.id)}`
-  );
+  // unused 0x0002 (was INFO_GeneratingProject, now in InfrastructureMessages)
 
   static ERROR_CannotCreateFolder = SevError | 0x0003;
   static Error_CannotCreateFolder = (o:{folderName:string, e: any}) => CompilerMessageSpecWithException(
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 2e9ec068f3..9520fe7dcd 100644
--- a/developer/src/kmc-kmn/src/compiler/kmn-compiler-messages.ts
+++ b/developer/src/kmc-kmn/src/compiler/kmn-compiler-messages.ts
@@ -737,7 +737,19 @@ export class KmnCompilerMessages {
   static HINT_IndexStoreLong                                  = SevHint | 0x0B0;
   static Hint_IndexStoreLong                                  = () => m(
     this.HINT_IndexStoreLong,
-    `The store referenced in index() is longer than the store referenced in any()`
+    `The store referenced in index() is longer than the store referenced in any()`,
+  );
+
+  static ERROR_ContextExCannotReferenceIf                     = SevError | 0x0B1;
+  static Error_ContextExCannotReferenceIf                     = () => m(
+    this.ERROR_ContextExCannotReferenceIf,
+    `The offset in context() points to a non-character if() statement in the context`,
+  );
+
+  static ERROR_ContextExCannotReferenceNul                    = SevError | 0x0B2;
+  static Error_ContextExCannotReferenceNul                     = () => m(
+    this.ERROR_ContextExCannotReferenceNul,
+    `The offset in context() points to a non-character nul statement in the context`,
   );
 
   static FATAL_BufferOverflow                                 = SevFatal | 0x0C0;
diff --git a/developer/src/kmc-kmn/src/kmw-compiler/javascript-strings.ts b/developer/src/kmc-kmn/src/kmw-compiler/javascript-strings.ts
index d31ccdb14c..12aa38d265 100644
--- a/developer/src/kmc-kmn/src/kmw-compiler/javascript-strings.ts
+++ b/developer/src/kmc-kmn/src/kmw-compiler/javascript-strings.ts
@@ -643,7 +643,7 @@ export function JavaScript_OutputString(fk: KMX.KEYBOARD, FTabStops: string, fkp
       let recContext = ExpandSentinel(fk, pwszContext, x);
 
       if(isKeyboardVersion10OrLater()) {
-        if(recContext.IsSentinel && [KMX.KMXFile.CODE_NUL, KMX.KMXFile.CODE_IFOPT, KMX.KMXFile.CODE_IFSYSTEMSTORE].includes(recContext.Code)) {
+        if(recContext.IsSentinel && [KMX.KMXFile.CODE_IFOPT, KMX.KMXFile.CODE_IFSYSTEMSTORE].includes(recContext.Code)) {
           Result--;
         }
       }
diff --git a/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_cannot_reference_if.kmn b/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_cannot_reference_if.kmn
new file mode 100644
index 0000000000..03fbce7ec4
--- /dev/null
+++ b/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_cannot_reference_if.kmn
@@ -0,0 +1,11 @@
+store(&TARGETS) 'any'
+
+begin Unicode > use(main)
+
+store(cons) 'bcd'
+store(ifx) '1'
+
+group(main) using keys
+
+c ERROR_ContextExCannotReferenceIf:
+if(ifx = '1') any(cons) + 'd' > context(1)
diff --git a/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_cannot_reference_nul.kmn b/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_cannot_reference_nul.kmn
new file mode 100644
index 0000000000..ebce7ea4af
--- /dev/null
+++ b/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_cannot_reference_nul.kmn
@@ -0,0 +1,10 @@
+store(&TARGETS) 'any'
+
+begin Unicode > use(main)
+
+store(cons) 'bcd'
+
+group(main) using keys
+
+c ERROR_ContextExCannotReferenceNul:
+nul any(cons) + 'a' > 'x' context(1)
diff --git a/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_has_invalid_offset_if.kmn b/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_has_invalid_offset_if.kmn
new file mode 100644
index 0000000000..13d78babeb
--- /dev/null
+++ b/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_has_invalid_offset_if.kmn
@@ -0,0 +1,12 @@
+store(&TARGETS) 'any'
+
+begin Unicode > use(main)
+
+store(cons) 'bcd'
+store(ifx) '1'
+
+group(main) using keys
+
+c ERROR_ContextExHasInvalidOffset: `context(3)` should be `context(2)`
+if(ifx='1') any(cons) + 'a' > 'x' context(3) 'z'
+
diff --git a/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_has_invalid_offset_long.kmn b/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_has_invalid_offset_long.kmn
new file mode 100644
index 0000000000..ef875a4086
--- /dev/null
+++ b/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_has_invalid_offset_long.kmn
@@ -0,0 +1,11 @@
+store(&TARGETS) 'any'
+
+begin Unicode > use(main)
+
+store(cons) 'bcd'
+
+group(main) using keys
+
+c ERROR_ContextExHasInvalidOffset: `context(2)` is longer than range
+any(cons) + 'a' > 'x' context(2) 'z'
+
diff --git a/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_has_invalid_offset_nul.kmn b/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_has_invalid_offset_nul.kmn
new file mode 100644
index 0000000000..efd3df0c82
--- /dev/null
+++ b/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_has_invalid_offset_nul.kmn
@@ -0,0 +1,12 @@
+store(&TARGETS) 'any'
+
+begin Unicode > use(main)
+
+store(cons) 'bcd'
+store(ifx) '1'
+
+group(main) using keys
+
+c ERROR_ContextExHasInvalidOffset: `context(3)` should be `context(2)`
+nul any(cons) + 'a' > 'x' context(3) 'z'
+
diff --git a/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_has_invalid_offset_zero.kmn b/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_has_invalid_offset_zero.kmn
new file mode 100644
index 0000000000..4af49a4619
--- /dev/null
+++ b/developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_contextex_has_invalid_offset_zero.kmn
@@ -0,0 +1,11 @@
+store(&TARGETS) 'any'
+
+begin Unicode > use(main)
+
+store(cons) 'bcd'
+
+group(main) using keys
+
+c ERROR_ContextExHasInvalidOffset: `context(0)` is lower than 1
+any(cons) + 'a' > 'x' context(0) 'z'
+
diff --git a/developer/src/kmc-kmn/test/fixtures/kmw/test_index_12980.kmn b/developer/src/kmc-kmn/test/fixtures/kmw/test_index_12980_v10.kmn
similarity index 91%
rename from developer/src/kmc-kmn/test/fixtures/kmw/test_index_12980.kmn
rename to developer/src/kmc-kmn/test/fixtures/kmw/test_index_12980_v10.kmn
index 26d2164928..4f8920abf4 100644
--- a/developer/src/kmc-kmn/test/fixtures/kmw/test_index_12980.kmn
+++ b/developer/src/kmc-kmn/test/fixtures/kmw/test_index_12980_v10.kmn
@@ -1,8 +1,9 @@
 c test_index_12980 generated from template at 2025-01-22 13:25:35
 c Validates index() offsets when used with if() - see #12980
+c Test with v10+ kmw compiler
 
 store(&VERSION) '14.0'
-store(&NAME) 'test_index_12980'
+store(&NAME) 'test_index_12980_v10'
 store(&TARGETS) 'web'
 
 
diff --git a/developer/src/kmc-kmn/test/fixtures/kmw/test_index_12980_v9.kmn b/developer/src/kmc-kmn/test/fixtures/kmw/test_index_12980_v9.kmn
new file mode 100644
index 0000000000..cad7092e12
--- /dev/null
+++ b/developer/src/kmc-kmn/test/fixtures/kmw/test_index_12980_v9.kmn
@@ -0,0 +1,22 @@
+c test_index_12980 generated from template at 2025-01-22 13:25:35
+c Validates index() offsets when used with if() - see #12980
+c Test with v9 KMW compiler (does not support notany)
+
+store(&VERSION) '9.0'
+store(&NAME) 'test_index_12980_v9'
+store(&TARGETS) 'web'
+
+
+begin Unicode > use(main)
+
+group(main) using keys
+
+store(a) '1'
+store(b) '2'
+store(e) '5'
+store(f) '6'
+
+if(&platform = 'web') any(a) + 'a' > context 'A'
+if(&platform = 'web') any(b) + 'b' > context(2) 'B'
+nul any(e) + 'e' > context 'E'
+nul any(f) + 'f' > context(2) 'F'
diff --git a/developer/src/kmc-kmn/test/kmw/kmw-compiler.tests.ts b/developer/src/kmc-kmn/test/kmw/kmw-compiler.tests.ts
index 5060dc8757..5e132e412c 100644
--- a/developer/src/kmc-kmn/test/kmw/kmw-compiler.tests.ts
+++ b/developer/src/kmc-kmn/test/kmw/kmw-compiler.tests.ts
@@ -218,29 +218,56 @@ describe('KeymanWeb Compiler', function() {
     assert.lengthOf(callbacks.messages, 2);
   });
 
-  it('should generate correct index offsets (#12980) for context and context(n) when building a KMW keyboard', async function() {
-    const filenames = generateTestFilenames('test_index_12980');
+
+  function doMatchKIO(data: string, s: string, offset: number) {
+    const regex = new RegExp('k\\.KIO\\(-1,this\\.'+s+',(.+?),t\\);');
+    const m = regex.exec(data);
+    assert.isNotNull(m, `Could not find match for ${s}`);
+    assert.equal(m[1], offset.toString(), `Expected '${s}' usage to have an index parameter == 1`);
+  }
+
+  it('should generate correct index offsets (#12980) for context and context(n) when building a KMW keyboard with v9 target', async function() {
+    const filenames = generateTestFilenames('test_index_12980_v9');
 
     let result = await kmnCompiler.run(filenames.source, null);
     assert.isNotNull(result);
     const data = new TextDecoder('utf-8').decode(result.artifacts.js.data);
 
-    function doMatchKIO(s: string) {
-      const regex = new RegExp('k\\.KIO\\(-1,this\\.'+s+',(.+?),t\\);');
-      const m = regex.exec(data);
-      assert.isNotNull(m, `Could not find match for ${s}`);
-      assert.equal(m[1], '1', `Expected '${s}' usage to have an index parameter == 1`);
+    if(debug) {
+      console.log(result.artifacts.js.filename);
+      await kmnCompiler.write(result.artifacts);
     }
 
-    doMatchKIO('s_a_6');
-    doMatchKIO('s_b_7');
+    // v9 targets should match
+    assert.match(data, /k\.KO\(-1,t,"A"\);/);
+    assert.match(data, /k\.KIO\(1,this.s_b_7,1,t\);/);
+    assert.match(data, /k\.KO\(-1,t,"E"\);/);
+    assert.match(data, /k\.KIO\(1,this.s_f_9,1,t\);/);
+  });
 
-    // matches the 4 notany() rules
-    const matches = [...data.matchAll(/k\.KCXO\(-1,t,1,1\);/g)];
-    assert.lengthOf(matches, 4);
+  it('should generate correct index offsets (#12980) for context and context(n) when building a KMW keyboard with v10+ target', async function() {
+    const filenames = generateTestFilenames('test_index_12980_v10');
 
-    doMatchKIO('s_e_10');
-    doMatchKIO('s_f_11');
+    let result = await kmnCompiler.run(filenames.source, null);
+    assert.isNotNull(result);
+    const data = new TextDecoder('utf-8').decode(result.artifacts.js.data);
+
+    if(debug) {
+      console.log(result.artifacts.js.filename);
+      await kmnCompiler.write(result.artifacts);
+    }
+
+    doMatchKIO(data, 's_a_6', 1); //if() has index 1
+    doMatchKIO(data, 's_b_7', 1); //if() has index 1
+
+    // matches the 2 notany() rules for if() and 2 for nul
+    const matches_if = [...data.matchAll(/k\.KCXO\(-1,t,1,1\);/g)];
+    assert.lengthOf(matches_if, 2);
+    const matches_nul = [...data.matchAll(/k\.KCXO\(-1,t,2,2\);/g)];
+    assert.lengthOf(matches_nul, 2);
+
+    doMatchKIO(data, 's_e_10', 2);
+    doMatchKIO(data, 's_f_11', 2);
   });
 });
 
diff --git a/developer/src/kmc-kmn/test/messages.tests.ts b/developer/src/kmc-kmn/test/messages.tests.ts
index 2ca3c747ca..16c9ab6150 100644
--- a/developer/src/kmc-kmn/test/messages.tests.ts
+++ b/developer/src/kmc-kmn/test/messages.tests.ts
@@ -185,7 +185,6 @@ describe('KmnCompilerMessages', function () {
 
   it('should generate WARN_IndexStoreShort if a store referenced in index() is shorter than the corresponding any() store', async function() {
     await testForMessage(this, ['keyboards', 'warn_index_store_short.kmn'], KmnCompilerMessages.WARN_IndexStoreShort);
-    callbacks.clear();
     await testForMessage(this, ['keyboards', 'warn_index_store_short_key.kmn'], KmnCompilerMessages.WARN_IndexStoreShort);
   });
 
@@ -193,8 +192,28 @@ describe('KmnCompilerMessages', function () {
 
   it('should generate HINT_IndexStoreLong if a store referenced in index() is longer than the corresponding any() store', async function() {
     await testForMessage(this, ['keyboards', 'hint_index_store_long.kmn'], KmnCompilerMessages.HINT_IndexStoreLong);
-    callbacks.clear();
     await testForMessage(this, ['keyboards', 'hint_index_store_long_key.kmn'], KmnCompilerMessages.HINT_IndexStoreLong);
   });
 
+  // ERROR_ContextExHasInvalidOffset
+
+  it('should generate ERROR_ContextExHasInvalidOffset if the offset is lower than 1 or greater than the context length', async function() {
+    await testForMessage(this, ['invalid-keyboards', 'error_contextex_has_invalid_offset_if.kmn'], KmnCompilerMessages.ERROR_ContextExHasInvalidOffset);
+    await testForMessage(this, ['invalid-keyboards', 'error_contextex_has_invalid_offset_long.kmn'], KmnCompilerMessages.ERROR_ContextExHasInvalidOffset);
+    await testForMessage(this, ['invalid-keyboards', 'error_contextex_has_invalid_offset_nul.kmn'], KmnCompilerMessages.ERROR_ContextExHasInvalidOffset);
+    await testForMessage(this, ['invalid-keyboards', 'error_contextex_has_invalid_offset_zero.kmn'], KmnCompilerMessages.ERROR_ContextExHasInvalidOffset);
+  });
+
+  // ERROR_ContextExCannotReferenceIf
+
+  it('should generate ERROR_ContextExCannotReferenceIf if the offset points to an if() statement', async function() {
+    await testForMessage(this, ['invalid-keyboards', 'error_contextex_cannot_reference_if.kmn'], KmnCompilerMessages.ERROR_ContextExCannotReferenceIf);
+  });
+
+  // ERROR_ContextExCannotReferenceNul
+
+  it('should generate ERROR_ContextExCannotReferenceNul if the offset points to a nul statement', async function() {
+    await testForMessage(this, ['invalid-keyboards', 'error_contextex_cannot_reference_nul.kmn'], KmnCompilerMessages.ERROR_ContextExCannotReferenceNul);
+  });
+
 });
diff --git a/developer/src/kmc/src/commands/copy.ts b/developer/src/kmc/src/commands/copy.ts
index b7d0aef12f..9cfef2b957 100644
--- a/developer/src/kmc/src/commands/copy.ts
+++ b/developer/src/kmc/src/commands/copy.ts
@@ -79,6 +79,18 @@ async function doCopy(callbacks: NodeCompilerCallbacks, sources: string | string
     return false;
   }
 
+  const dest = options.outPath;
+  callbacks.reportMessage(InfrastructureMessages.Info_CopyingProject({source, dest}));
+  const result = runCopier(callbacks, source, options);
+  if(result) {
+    callbacks.reportMessage(InfrastructureMessages.Info_ProjectCopiedSuccessfully({source, dest}));
+  } else {
+    callbacks.reportMessage(InfrastructureMessages.Info_ProjectNotCopiedSuccessfully({source, dest}));
+  }
+  return result;
+}
+
+async function runCopier(callbacks: NodeCompilerCallbacks, source: string, options: CopierOptions) {
   const copier = new KeymanProjectCopier();
   try {
     if(!await copier.init(callbacks, options)) {
diff --git a/developer/src/kmc/src/commands/generate.ts b/developer/src/kmc/src/commands/generate.ts
index b362d01125..695ced9d3c 100644
--- a/developer/src/kmc/src/commands/generate.ts
+++ b/developer/src/kmc/src/commands/generate.ts
@@ -113,9 +113,16 @@ async function generate(generator: KeymanCompiler, ids: string | string[], comma
   }
 
   const options = commanderOptionsToGeneratorOptions(id, commanderOptions);
-
+  const outPath = options.outPath;
   const callbacks = new NodeCompilerCallbacks(options);
-  if(!await doGenerate(callbacks, generator, options)) {
+  callbacks.reportMessage(InfrastructureMessages.Info_GeneratingProject({id, outPath}));
+
+  const result = await doGenerate(callbacks, generator, options);
+
+  if(result) {
+    callbacks.reportMessage(InfrastructureMessages.Info_ProjectGeneratedSuccessfully({id}));
+  } else {
+    callbacks.reportMessage(InfrastructureMessages.Info_ProjectNotGeneratedSuccessfully({id}));
     return await exitProcess(1);
   }
 }
diff --git a/developer/src/kmc/src/messages/infrastructureMessages.ts b/developer/src/kmc/src/messages/infrastructureMessages.ts
index bacadca545..ee6e3a086d 100644
--- a/developer/src/kmc/src/messages/infrastructureMessages.ts
+++ b/developer/src/kmc/src/messages/infrastructureMessages.ts
@@ -158,5 +158,48 @@ export class InfrastructureMessages {
     this.ERROR_CopyRequiresOutPath,
     `The copy command requires the --out-path, -o parameter`
   );
- }
+
+  // For this message, we override the filename with the passed-in file. A bit of a hack but does the job
+  static INFO_CopyingProject = SevInfo | 0x0023;
+  static Info_CopyingProject = (o:{source:string,dest:string}) => ({filename:o.source, ...m(
+    this.INFO_CopyingProject,
+    `Copying project '${def(o.source)}' to '${def(o.dest)}'`,
+  )});
+
+  // For this message, we override the filename with the passed-in file. A bit of a hack but does the job
+  static INFO_ProjectCopiedSuccessfully = SevInfo | 0x0024;
+  static Info_ProjectCopiedSuccessfully = (o:{source:string, dest:string}) => ({filename:o.source, ...m(
+    this.INFO_ProjectCopiedSuccessfully,
+    `'${def(o.source)}' copied to '${def(o.dest)}' successfully.`,
+  )});
+
+  // For this message, we override the filename with the passed-in file. A bit of a hack but does the job
+  static INFO_ProjectNotCopiedSuccessfully = SevInfo | 0x0025;
+  static Info_ProjectNotCopiedSuccessfully = (o:{source:string, dest:string}) => ({filename:o.source, ...m(
+    this.INFO_ProjectNotCopiedSuccessfully,
+    `Failed to copy '${def(o.source)}' to '${def(o.dest)}'.`,
+  )});
+
+  // For this message, we override the filename with the passed-in file. A bit of a hack but does the job
+  static INFO_GeneratingProject = SevInfo | 0x0026;
+  static Info_GeneratingProject = (o:{id:string, outPath: string}) => ({filename:o.id, ...m(
+    this.INFO_GeneratingProject,
+    `Generating new project '${def(o.id)}' in '${def(o.outPath)}'.`,
+  )});
+
+  // For this message, we override the filename with the passed-in file. A bit of a hack but does the job
+  static INFO_ProjectGeneratedSuccessfully = SevInfo | 0x0027;
+  static Info_ProjectGeneratedSuccessfully = (o:{id:string}) => ({filename:o.id, ...m(
+    this.INFO_ProjectGeneratedSuccessfully,
+    `New project '${def(o.id)}' generated successfully.`,
+  )});
+
+  // For this message, we override the filename with the passed-in file. A bit of a hack but does the job
+  static INFO_ProjectNotGeneratedSuccessfully = SevInfo | 0x0028;
+  static Info_ProjectNotGeneratedSuccessfully = (o:{id:string}) => ({filename:o.id, ...m(
+    this.INFO_ProjectNotGeneratedSuccessfully,
+    `Failed to generate new project '${def(o.id)}'.`,
+  )});
+
+}
 
diff --git a/developer/src/kmc/src/util/NodeCompilerCallbacks.ts b/developer/src/kmc/src/util/NodeCompilerCallbacks.ts
index f3cdf1e7b2..94465d4413 100644
--- a/developer/src/kmc/src/util/NodeCompilerCallbacks.ts
+++ b/developer/src/kmc/src/util/NodeCompilerCallbacks.ts
@@ -242,12 +242,18 @@ export class NodeCompilerCallbacks implements CompilerCallbacks {
   messageSpecialColor(event: CompilerEvent) {
     switch(event.code) {
       case InfrastructureMessages.INFO_BuildingFile:
+      case InfrastructureMessages.INFO_CopyingProject:
+      case InfrastructureMessages.INFO_GeneratingProject:
         return color.whiteBright;
       case InfrastructureMessages.INFO_FileNotBuiltSuccessfully:
       case InfrastructureMessages.INFO_ProjectNotBuiltSuccessfully:
+      case InfrastructureMessages.INFO_ProjectNotCopiedSuccessfully:
+      case InfrastructureMessages.INFO_ProjectNotGeneratedSuccessfully:
         return color.red;
       case InfrastructureMessages.INFO_FileBuiltSuccessfully:
       case InfrastructureMessages.INFO_ProjectBuiltSuccessfully:
+      case InfrastructureMessages.INFO_ProjectCopiedSuccessfully:
+      case InfrastructureMessages.INFO_ProjectGeneratedSuccessfully:
         return color.green;
     }
     return null;
diff --git a/developer/src/kmcmplib/src/Compiler.cpp b/developer/src/kmcmplib/src/Compiler.cpp
index ff4ab560a5..4774f78380 100644
--- a/developer/src/kmcmplib/src/Compiler.cpp
+++ b/developer/src/kmcmplib/src/Compiler.cpp
@@ -1458,13 +1458,23 @@ KMX_DWORD CheckStatementOffsets(PFILE_KEYBOARD fk, PFILE_GROUP gp, PKMX_WCHAR co
         }
       } else if (*(p + 1) == CODE_CONTEXTEX) {
         int contextOffset = *(p + 2);
-        if (contextOffset > xstrlen(context))
+        if (contextOffset > xstrlen(context)) {
           return KmnCompilerMessages::ERROR_ContextExHasInvalidOffset;
+        }
+
+        // contextOffset <= 0 is tested in parse stage
+
+        for (q = context, i = 1; *q && i < contextOffset; q = incxstr(q), i++);
+        if(*q == UC_SENTINEL && (*(q + 1) == CODE_IFOPT || *(q + 1) == CODE_IFSYSTEMSTORE)) {
+          return KmnCompilerMessages::ERROR_ContextExCannotReferenceIf;
+        }
+        if(*q == UC_SENTINEL && *(q + 1) == CODE_NUL) {
+          return KmnCompilerMessages::ERROR_ContextExCannotReferenceNul;
+        }
 
         // Due to a limitation in earlier versions of KeymanWeb, the minimum version
         // for context() referring to notany() is 14.0. See #917 for details.
         if (kmcmp::CompileTarget == CKF_KEYMANWEB) {
-          for (q = context, i = 1; *q && i < contextOffset; q = incxstr(q), i++);
           if (*q == UC_SENTINEL && *(q + 1) == CODE_NOTANY) {
             if(!VerifyKeyboardVersion(fk, VERSION_140)) {
               return KmnCompilerMessages::ERROR_140FeatureOnlyContextAndNotAnyWeb;
@@ -2267,7 +2277,9 @@ KMX_DWORD GetXStringImpl(PKMX_WCHAR tstr, PFILE_KEYBOARD fk, PKMX_WCHAR str, KMX
           }
           int n1b;
           n1b = atoiW(q);
-          if (n1b < 1 || n1b >= 0xF000) return KmnCompilerMessages::ERROR_InvalidToken;
+          if (n1b < 1 || n1b >= 0xF000) {
+            return KmnCompilerMessages::ERROR_ContextExHasInvalidOffset;
+          }
           tstr[mx++] = UC_SENTINEL;
           tstr[mx++] = CODE_CONTEXTEX;
           tstr[mx++] = n1b;
diff --git a/developer/src/kmcmplib/tests/gtest-compiler.tests.cpp b/developer/src/kmcmplib/tests/gtest-compiler.tests.cpp
index ca8f40f6d8..268d1d1f70 100644
--- a/developer/src/kmcmplib/tests/gtest-compiler.tests.cpp
+++ b/developer/src/kmcmplib/tests/gtest-compiler.tests.cpp
@@ -1281,10 +1281,10 @@ TEST_F(CompilerTest, GetXStringImpl_type_c_test) {
     const KMX_WCHAR tstr_context_offset_valid[] = { UC_SENTINEL, CODE_CONTEXTEX, 1, 0 };
     EXPECT_EQ(0, u16cmp(tstr_context_offset_valid, tstr));
 
-    // context, CERR_InvalidToke, offset < 1
+    // context, ERROR_ContextExHasInvalidOffset, offset < 1
     fileKeyboard.version = VERSION_60;
     u16cpy(str, u"context(0)");
-    EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidToken, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE));
+    EXPECT_EQ(KmnCompilerMessages::ERROR_ContextExHasInvalidOffset, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE));
 
     // context, large offset < 0xF000, valid
     fileKeyboard.version = VERSION_60;
@@ -1293,10 +1293,10 @@ TEST_F(CompilerTest, GetXStringImpl_type_c_test) {
     const KMX_WCHAR tstr_context_large_offset_valid[] = { UC_SENTINEL, CODE_CONTEXTEX, 61439, 0 };
     EXPECT_EQ(0, u16cmp(tstr_context_large_offset_valid, tstr));
 
-    // context, KmnCompilerMessages::ERROR_InvalidToken, too large offset == 0xF000
+    // context, KmnCompilerMessages::ERROR_ContextExHasInvalidOffset, too large offset == 0xF000
     fileKeyboard.version = VERSION_60;
     u16cpy(str, u"context(61440)"); //0xF000
-    EXPECT_EQ(KmnCompilerMessages::ERROR_InvalidToken, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE));
+    EXPECT_EQ(KmnCompilerMessages::ERROR_ContextExHasInvalidOffset, GetXStringImpl(tstr, &fileKeyboard, str, u"", output, 80, 0, &newp, FALSE));
 
     // context, KmnCompilerMessages::ERROR_60FeatureOnly_Contextn
     fileKeyboard.version = VERSION_50;
diff --git a/developer/src/kmcmplib/tests/meson.build b/developer/src/kmcmplib/tests/meson.build
index 33536e936b..15d3631a91 100644
--- a/developer/src/kmcmplib/tests/meson.build
+++ b/developer/src/kmcmplib/tests/meson.build
@@ -73,7 +73,12 @@ tests = [
   'k_045___deadkey_and_context',
   'k_046___deadkey_and_contextex',
   'k_047___caps_always_off_initially_on',
-  'k_048___modifier_keys_keep_context'
+  'k_048___modifier_keys_keep_context',
+  'k_049___enter_invalidates_context',
+  'k_050___nul_and_context',
+  'k_051___if_and_context',
+  'k_052___nul_and_index',
+  'k_053___if_and_index',
 ]
 
 foreach kbd : tests
diff --git a/developer/src/kmconvert/build.sh b/developer/src/kmconvert/build.sh
index e91cb0ba3a..599379565f 100755
--- a/developer/src/kmconvert/build.sh
+++ b/developer/src/kmconvert/build.sh
@@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 builder_describe "Keyboard project generation and conversion tool" \
   @/common/include \
   @/common/windows/delphi \
-  clean configure build test publish install
+  clean configure build test publish install edit
 
 builder_parse "$@"
 
@@ -62,3 +62,4 @@ builder_run_action build:project        do_build
 builder_run_action test:project         do_test
 builder_run_action publish:project      do_publish
 builder_run_action install:project      cp "$DEVELOPER_PROGRAM/kmconvert.exe" "$INSTALLPATH_KEYMANDEVELOPER/kmconvert.exe"
+builder_run_action edit:project         start kmconvert.dproj
diff --git a/developer/src/kmdbrowserhost/build.sh b/developer/src/kmdbrowserhost/build.sh
index a97e961ff4..b00a60735a 100755
--- a/developer/src/kmdbrowserhost/build.sh
+++ b/developer/src/kmdbrowserhost/build.sh
@@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 builder_describe "Chromium browser host process for Keyman Developer" \
   @/common/include \
   @/common/windows/delphi \
-  clean configure build test publish install
+  clean configure build test publish install edit
 
 builder_parse "$@"
 
@@ -52,3 +52,5 @@ builder_run_action build:project        do_build
 # builder_run_action test:project         do_test
 builder_run_action publish:project      do_publish
 builder_run_action install:project      cp "$DEVELOPER_PROGRAM/kmdbrowserhost.exe" "$INSTALLPATH_KEYMANDEVELOPER/kmdbrowserhost.exe"
+builder_run_action edit:project         start kmdbrowserhost.dproj
+
diff --git a/developer/src/setup/build.sh b/developer/src/setup/build.sh
index 3034f8b01d..5dfe102363 100755
--- a/developer/src/setup/build.sh
+++ b/developer/src/setup/build.sh
@@ -9,7 +9,7 @@ builder_describe \
   "Keyman Developer Setup bootstrap executable" \
   @/common/include \
   @/common/windows/delphi \
-  clean configure build test publish
+  clean configure build test publish edit
 
 builder_parse "$@"
 
@@ -55,3 +55,4 @@ builder_run_action configure:project    configure_windows_build_environment
 builder_run_action build:project        do_build
 builder_run_action publish:project      do_publish
 # builder_run_action test:project         do_test
+builder_run_action edit:project         start setup.dproj
diff --git a/developer/src/tike/build.sh b/developer/src/tike/build.sh
index fd81ca692d..d0e5800fc3 100755
--- a/developer/src/tike/build.sh
+++ b/developer/src/tike/build.sh
@@ -9,7 +9,7 @@ builder_describe "Build Keyman Developer IDE" \
   @/common/include \
   @/core:x86 \
   @/common/windows/delphi \
-  clean configure build test publish install
+  clean configure build test publish install edit
 
 builder_parse "$@"
 
@@ -113,6 +113,7 @@ builder_run_action build:project        do_build
 # builder_run_action test:project         do_test
 builder_run_action publish:project      do_publish
 builder_run_action install:project      do_install
+builder_run_action edit:project         start tike.dproj
 
 # Note: generating monaco installer:
 # @echo *******************************************************************************************
diff --git a/developer/src/tike/child/Keyman.Developer.UI.Debug.UfrmLdmlKeyboardDebug.dfm b/developer/src/tike/child/Keyman.Developer.UI.Debug.UfrmLdmlKeyboardDebug.dfm
index bf8bba4cbd..cf5e4b735a 100644
--- a/developer/src/tike/child/Keyman.Developer.UI.Debug.UfrmLdmlKeyboardDebug.dfm
+++ b/developer/src/tike/child/Keyman.Developer.UI.Debug.UfrmLdmlKeyboardDebug.dfm
@@ -31,6 +31,7 @@ inherited frmLdmlKeyboardDebug: TfrmLdmlKeyboardDebug
     Font.Name = 'Arial'
     Font.Style = []
     ParentFont = False
+    PlainText = True
     PopupMenu = mnuPopup
     ScrollBars = ssVertical
     TabOrder = 0
diff --git a/developer/src/tike/child/Keyman.Developer.UI.Debug.UfrmLdmlKeyboardDebug.pas b/developer/src/tike/child/Keyman.Developer.UI.Debug.UfrmLdmlKeyboardDebug.pas
index 1e22070ad7..4a7aaf6066 100644
--- a/developer/src/tike/child/Keyman.Developer.UI.Debug.UfrmLdmlKeyboardDebug.pas
+++ b/developer/src/tike/child/Keyman.Developer.UI.Debug.UfrmLdmlKeyboardDebug.pas
@@ -412,7 +412,7 @@ procedure TfrmLdmlKeyboardDebug.Run(vkey: Word);
       if dk.SavedPosition < 0 then
       begin
         dk.Position := L + dk.SavedPosition;
-        if (dk.Position < 0) or (dk.Position >= L) or (s[dk.Position + 1] <> #$FFFC) then
+        if (dk.Position < 0) or (dk.Position >= L) or (s[dk.Position + 1] <> DeadKey_Marker) then
           // This can happen if the deadkey was in a replaced selection
           dk.Delete;
       end;
@@ -481,7 +481,7 @@ procedure TfrmLdmlKeyboardDebug.Run(vkey: Word);
 
 
   // Returns the length of the context items in UTF16, treating markers as a
-  // single UTF16 code unit (U+FFFC)
+  // single UTF16 code unit (DeadKey_Marker)
   function ContextItemsLengthUTF16(pc: pkm_core_context_item): Integer;
   begin
     Result := 0;
@@ -519,7 +519,7 @@ procedure TfrmLdmlKeyboardDebug.Run(vkey: Word);
         dk.Position := Result.Length + offset;
         dk.SavedPosition := Result.Length + offset;
         FDeadkeys.Add(dk);
-        Result := Result + #$FFFC;
+        Result := Result + DeadKey_Marker;
       end;
       Inc(pc);
     end;
diff --git a/developer/src/tike/child/UfrmDebug.dfm b/developer/src/tike/child/UfrmDebug.dfm
index 362488d5f3..7642552667 100644
--- a/developer/src/tike/child/UfrmDebug.dfm
+++ b/developer/src/tike/child/UfrmDebug.dfm
@@ -31,6 +31,7 @@ inherited frmDebug: TfrmDebug
     Font.Name = 'Arial'
     Font.Style = []
     ParentFont = False
+    PlainText = True
     PopupMenu = mnuPopup
     ScrollBars = ssVertical
     TabOrder = 0
diff --git a/developer/src/tike/child/UfrmDebug.pas b/developer/src/tike/child/UfrmDebug.pas
index 36ef51d291..15a5b858b7 100644
--- a/developer/src/tike/child/UfrmDebug.pas
+++ b/developer/src/tike/child/UfrmDebug.pas
@@ -679,7 +679,7 @@ procedure TfrmDebug.ExecuteEventAction(n: Integer);
     dk: TDeadKeyInfo;
   begin
     Result.Selection := memo.Selection;
-    Result.Length := Length(memo.Text);
+    Result.Length := Length(memo.GetTextCR);
     for dk in FDeadkeys do
     begin
       if dk.Position >= Result.Selection.Start
@@ -694,13 +694,13 @@ procedure TfrmDebug.ExecuteEventAction(n: Integer);
     L: Integer;
     s: string;
   begin
-    s := memo.Text;
+    s := memo.GetTextCR;
     L := Length(s);
     for dk in FDeadkeys do
       if dk.SavedPosition < 0 then
       begin
         dk.Position := L + dk.SavedPosition;
-        if (dk.Position < 0) or (dk.Position >= L) or (s[dk.Position + 1] <> #$FFFC) then
+        if (dk.Position < 0) or (dk.Position >= L) or (s[dk.Position + 1] <> DeadKey_Marker) then
           // This can happen if the deadkey was in a replaced selection
           dk.Delete;
       end;
@@ -710,6 +710,7 @@ procedure TfrmDebug.ExecuteEventAction(n: Integer);
 
   procedure DoBackspace(BackspaceType: km_core_backspace_type; ExpectedValue: NativeUInt);
   var
+    t: string;
     m, n: Integer;
     dk: TDeadKeyInfo;
     state: TMemoSelectionState;
@@ -721,7 +722,7 @@ procedure TfrmDebug.ExecuteEventAction(n: Integer);
       'ExpectedValue=U+'+IntToHex(ExpectedValue, 4)+'; '+
       'memo.SelStart='+IntToStr(memo.SelStart)+'; '+
       'memo.SelLength='+IntToStr(memo.SelLength)+'; '+
-      'memo.Text='+Copy(memo.Text, 1, 256);
+      'memo.Text='+Copy(memo.GetTextCR, 1, 256);
     end;
   begin
     // Offset is zero-based, but string is 1-based. Beware!
@@ -740,11 +741,14 @@ procedure TfrmDebug.ExecuteEventAction(n: Integer);
       Exit;
     end;
 
+    t := memo.GetTextCR;
+
     case BackspaceType of
       KM_CORE_BT_MARKER:
         begin
           Assert(m >= 1, AssertionMessage);
-          Assert(memo.Text[m] = #$FFFC, AssertionMessage);
+          Assert(m <= t.Length, AssertionMessage);
+          Assert(t[m] = DeadKey_Marker, AssertionMessage);
           dk := FDeadkeys.GetFromPosition(m-1);
           Assert(Assigned(dk));
           dk.Delete;
@@ -753,23 +757,19 @@ procedure TfrmDebug.ExecuteEventAction(n: Integer);
       KM_CORE_BT_CHAR:
         begin
           Assert(m >= 1, AssertionMessage);
-          Assert(memo.Text[m] <> #$FFFC, AssertionMessage);
+          Assert(m <= t.Length, AssertionMessage);
+          Assert(t[m] <> DeadKey_Marker, AssertionMessage);
           // Delete surrogate pairs
           if (m > 1) and
-              Uni_IsSurrogate2(memo.Text[m]) and
-              Uni_IsSurrogate1(memo.Text[m-1]) then
-            Dec(m, 2)
-          // Delete \r\n line breaks
-          else if (m > 1) and
-              (memo.Text[m] = #$0A) and
-              (memo.Text[m-1] = #$0D) then
+              Uni_IsSurrogate2(t[m]) and
+              Uni_IsSurrogate1(t[m-1]) then
             Dec(m, 2)
           else
             Dec(m);
         end;
       KM_CORE_BT_UNKNOWN:
         begin
-          while (m >= 1) and (memo.Text[m] = #$FFFC) do
+          while (m >= 1) and (t[m] = DeadKey_Marker) do
           begin
             dk := FDeadkeys.GetFromPosition(m-1);
             Assert(Assigned(dk), AssertionMessage);
@@ -779,14 +779,14 @@ procedure TfrmDebug.ExecuteEventAction(n: Integer);
 
           // Delete character
           if (m > 1) and
-              Uni_IsSurrogate2(memo.Text[m]) and
-              Uni_IsSurrogate1(memo.Text[m-1]) then
+              Uni_IsSurrogate2(t[m]) and
+              Uni_IsSurrogate1(t[m-1]) then
             Dec(m, 2)
           else
             Dec(m);
 
           // Also delete deadkeys to left of current character
-          while (m >= 1) and (memo.Text[m] = #$FFFC) do
+          while (m >= 1) and (t[m] = DeadKey_Marker) do
           begin
             dk := FDeadkeys.GetFromPosition(m-1);
             Assert(Assigned(dk), AssertionMessage);
@@ -800,7 +800,7 @@ procedure TfrmDebug.ExecuteEventAction(n: Integer);
 
     memo.Lines.BeginUpdate;
     try
-      memo.Text := Copy(memo.Text, 1, m) + Copy(memo.Text, n+1, MaxInt);
+      memo.Text := Copy(t, 1, m) + Copy(t, n+1, MaxInt);
       memo.SelStart := m;
     finally
       memo.Lines.EndUpdate;
@@ -830,7 +830,7 @@ procedure TfrmDebug.ExecuteEventAction(n: Integer);
     begin
       state := SaveMemoSelectionState;
 
-      memo.SelText := WideChar($FFFC);
+      memo.SelText := DeadKey_Marker;
       memo.SelStart := memo.SelStart + memo.SelLength;  // I1603
       memo.SelLength := 0;
       dk.Position := memo.SelStart - 1;
@@ -843,27 +843,6 @@ procedure TfrmDebug.ExecuteEventAction(n: Integer);
     end;
   end;
 
-  procedure DoHandleShortcut(vk: UINT);
-  begin
-    // Because we disable shortcuts in the debug memo, there are a small set of
-    // editor Ctrl+Key shortcuts we need to rehandle here. Note that Ctrl+Ins,
-    // Shift+Ins, Shift+Del appear to be handled natively by the debug memo
-    // control (Windows code?), as are all cursor movement / selection keys,
-    // apart from Ctrl+A
-
-    if GetKeyState(VK_CONTROL) >= 0 then
-      Exit;
-
-    case vk of
-      Ord('A'): memo.SelectAll;
-      Ord('C'): memo.CopyToClipboard;
-      Ord('V'): memo.PasteFromClipboard;
-      Ord('X'): memo.CutToClipboard;
-      Ord('Y'): ; // redo not supported in edit
-      Ord('Z'): memo.Undo;
-    end;
-  end;
-
   procedure DoEmitKeystroke(dwData: DWord);
   var
     flag: Integer;
@@ -889,8 +868,6 @@ procedure TfrmDebug.ExecuteEventAction(n: Integer);
         else msg.Msg := WM_KEYUP;
       memo.Dispatch(msg);
 
-      DoHandleShortcut(LOBYTE(dwData));
-
       RealignMemoSelectionState(state);
     end;
   end;
@@ -898,11 +875,13 @@ procedure TfrmDebug.ExecuteEventAction(n: Integer);
   procedure DoChar(const text: string);
   var
     state: TMemoSelectionState;
+    selStart: Integer;
   begin
     state := SaveMemoSelectionState;
     // Line breaks: replace \r (0x0D) with \r\n (0x0D 0x0A) so line breaks work
-    memo.SelText := ReplaceStr(Text, #$0D, #$0D#$0A);
-    memo.SelStart := memo.SelStart + memo.SelLength;  // I1603
+    selStart := memo.SelStart;
+    memo.SelText := text;
+    memo.SelStart := selStart + text.Length;
     memo.SelLength := 0;
     RealignMemoSelectionState(state);
   end;
@@ -1357,20 +1336,22 @@ end;
 procedure TfrmDebug.UpdateCharacterGrid;   // I4808
 var
   start, len: Integer;
+  t: string;
 begin
   if csDestroying in ComponentState then
     Exit;
 
   start := memo.SelStart;
   len := memo.SelLength;
-  if start + len > Length(memo.Text) then
+  t := memo.GetTextCR;
+  if start + len > t.Length then
   begin
     // RichEdit has a virtual final character, which is selected when
     // pressing Ctrl+A, etc.
-    len := Length(memo.Text) - start;
+    len := t.Length - start;
   end;
 
-  TCharacterGridRenderer.Fill(sgChars, memo.Text, FDeadkeys, start, len, memo.Selection.Anchor);
+  TCharacterGridRenderer.Fill(sgChars, t, FDeadkeys, start, len, memo.Selection.Anchor);
   TCharacterGridRenderer.Size(sgChars, memo.Font);
 end;
 
diff --git a/developer/src/tike/child/UfrmKeymanWizard.pas b/developer/src/tike/child/UfrmKeymanWizard.pas
index afb1e715ed..4f0cbadb19 100644
--- a/developer/src/tike/child/UfrmKeymanWizard.pas
+++ b/developer/src/tike/child/UfrmKeymanWizard.pas
@@ -3000,7 +3000,7 @@ begin
       else kbdparser.KeyboardText := frameSource.EditorText;
 
     kbdparser.AddRequiredLines;
-    kbdparser.SetSystemStoreValue(ssTargets, 'windows native');
+    kbdparser.SetSystemStoreValue(ssTargets, 'desktop');
     kbdparser.SetSystemStoreValue(ssVersion, SKeymanVersion90);
     kbdparser.DeleteSystemStore(ssVisualKeyboard);
     kbdparser.DeleteSystemStore(ssBitmap);
diff --git a/developer/src/tike/child/UfrmPackageEditor.dfm b/developer/src/tike/child/UfrmPackageEditor.dfm
index 911781c298..38ead060eb 100644
--- a/developer/src/tike/child/UfrmPackageEditor.dfm
+++ b/developer/src/tike/child/UfrmPackageEditor.dfm
@@ -236,7 +236,7 @@ inherited frmPackageEditor: TfrmPackageEditor
           Width = 546
           Height = 32
           AutoSize = False
-          Caption = 
+          Caption =
             'A typical package will need keyboards, fonts, and documentation.' +
             ' You shouldn'#39't typically add source files. Also, don'#39't add any s' +
             'tandard Keyman files (such as keyman.exe) here.'
@@ -1342,7 +1342,7 @@ inherited frmPackageEditor: TfrmPackageEditor
           Top = 48
           Width = 551
           Height = 13
-          Caption = 
+          Caption =
             'Compiling the package takes all the files you have selected and ' +
             'compresses them into a single package file.'
         end
@@ -1617,11 +1617,4 @@ inherited frmPackageEditor: TfrmPackageEditor
     Left = 32
     Top = 492
   end
-  object dlgNewCustomisation: TSaveDialog
-    DefaultExt = 'kct'
-    Filter = 'Customisation file (*.kct)|*.kct|All files (*.*)|*.*'
-    Options = [ofOverwritePrompt, ofHideReadOnly, ofPathMustExist, ofEnableSizing]
-    Left = 32
-    Top = 532
-  end
 end
diff --git a/developer/src/tike/child/UfrmPackageEditor.pas b/developer/src/tike/child/UfrmPackageEditor.pas
index 4f3a096bd9..3044f5aa82 100644
--- a/developer/src/tike/child/UfrmPackageEditor.pas
+++ b/developer/src/tike/child/UfrmPackageEditor.pas
@@ -68,7 +68,6 @@ uses
 type
   TfrmPackageEditor = class(TfrmTikeEditor)   // I4689
     dlgFiles: TOpenDialog;
-    dlgNewCustomisation: TSaveDialog;
     pages: TLeftTabbedPageControl;
     pageFiles: TTabSheet;
     pageDetails: TTabSheet;
@@ -628,6 +627,7 @@ begin
     end;
   end;
 
+  dlgFiles.InitialDir := ExtractFileDir(FileName);
   UpdateData;
   Result := True;
 end;
@@ -806,8 +806,10 @@ begin
         if Found then Continue; // Don't add the file again
 
         AddFile(Files[i]);
+        dlgFiles.InitialDir := ExtractFileDir(Files[i]);
       end;
   if lbFiles.CanFocus then lbFiles.SetFocus;  // I3100   // I3506
+  dlgFiles.FileName := '';
 end;
 
 procedure TfrmPackageEditor.cmdRemoveFileClick(Sender: TObject);
diff --git a/developer/src/tike/debug/Keyman.System.Debug.DebugUtils.pas b/developer/src/tike/debug/Keyman.System.Debug.DebugUtils.pas
index d310a35eef..abcb0e1351 100644
--- a/developer/src/tike/debug/Keyman.System.Debug.DebugUtils.pas
+++ b/developer/src/tike/debug/Keyman.System.Debug.DebugUtils.pas
@@ -12,6 +12,8 @@ function GetContextFromMemo(Memo: TKeymanDeveloperDebuggerMemo; DeadKeys: TDebug
 implementation
 
 uses
+  System.SysUtils,
+
   Unicode;
 
 function GetContextFromMemo(Memo: TKeymanDeveloperDebuggerMemo; DeadKeys: TDebugDeadkeyInfoList; IncludeMarkers: Boolean): TArray<km_core_context_item>;
@@ -19,21 +21,23 @@ var
   n, i: Integer;
   ch: Char;
   dk: TDeadKeyInfo;
+  t: string;
 begin
   n := 0;
-  SetLength(Result, Length(Memo.Text)+1);
+  t := Memo.GetTextCR;
+  SetLength(Result, t.Length+1);
   i := 1;
   while i <= Memo.SelStart + Memo.SelLength do
   begin
-    ch := Memo.Text[i];
-    if Uni_IsSurrogate1(ch) and (i < Length(Memo.Text)) and
-      Uni_IsSurrogate2(Memo.Text[i+1]) then
+    ch := t[i];
+    if Uni_IsSurrogate1(ch) and (i < t.Length) and
+      Uni_IsSurrogate2(t[i+1]) then
     begin
       Result[n]._type := KM_CORE_CT_CHAR;
-      Result[n].character := Uni_SurrogateToUTF32(ch, Memo.Text[i+1]);
+      Result[n].character := Uni_SurrogateToUTF32(ch, t[i+1]);
       Inc(i);
     end
-    else if Ord(ch) = $FFFC then
+    else if ch = DeadKey_Marker then
     begin
       if IncludeMarkers then
       begin
diff --git a/developer/src/tike/debug/Keyman.UI.Debug.CharacterGridRenderer.pas b/developer/src/tike/debug/Keyman.UI.Debug.CharacterGridRenderer.pas
index 4f7453c775..c38bf8f358 100644
--- a/developer/src/tike/debug/Keyman.UI.Debug.CharacterGridRenderer.pas
+++ b/developer/src/tike/debug/Keyman.UI.Debug.CharacterGridRenderer.pas
@@ -60,7 +60,7 @@ type
         Result[n].ch := Uni_SurrogateToUTF32(text[x+1], text[x+2]);
         Inc(x);
       end
-      else if text[x+1] = #$FFFC then
+      else if text[x+1] = DeadKey_Marker then
       begin
         Result[n].CellType := ctDeadkey;
         Result[n].dk := deadkeys.GetFromPosition(x);
@@ -177,66 +177,6 @@ begin
   if SelAnchor <> SelStart then
     FillGridCursor(X);
   FillGrid(After, 0, X);
-
-(*
-  J := 0; I := SelStart + SelLength; // I is 1-based Delphi string index
-  while (J < MaxCols) and (I > SelStart) do
-  begin
-    if (I > 1) and Uni_IsSurrogate2(s[I]) and Uni_IsSurrogate1(s[I-1]) then
-      Dec(I);
-    Inc(J); Dec(I);
-  end;
-
-  if J = 0 then
-  begin
-    sgChars.ColCount := 1;
-    sgChars.Objects[0,0] := Pointer(0);
-    sgChars.Cells[0,0] := '';
-    sgChars.Cells[0,1] := '';
-    Exit;
-  end
-  else
-    sgChars.ColCount := J + 1;
-
-  Inc(I);
-  J := 0;
-  while J < sgChars.ColCount do
-  begin
-    if I = memo.SelStart + 1 then
-    begin
-      sgChars.Objects[J, 0] := Pointer(2);
-      sgChars.Cells[J, 0] := '|';
-      sgChars.Cells[J, 1] := 'Cursor';
-      Inc(J);
-    end;
-    if Ord(S[I]) = $FFFC then
-    begin
-      sgChars.Objects[J, 0] := Pointer(1);
-      sgChars.Cells[J, 0] := '???';
-      for K := 0 to FDeadkeys.Count-1 do
-        if FDeadkeys[K].Position = I-1 then
-        begin
-          sgChars.Cells[J, 0] := FDeadkeys[K].Deadkey.Name;
-          break;
-        end;
-      sgChars.Cells[J, 1] := 'Deadkey';
-    end
-    else if Uni_IsSurrogate1(s[I]) and (I < Length(s)) and Uni_IsSurrogate2(s[I+1]) then
-    begin
-      sgChars.Objects[J, 0] := Pointer(0);
-      sgChars.Cells[J, 0] := Copy(s, I ,2);
-      sgChars.Cells[J, 1] := 'U+'+IntToHex(Uni_SurrogateToUTF32(s[I], s[I+1]), 5);
-      Inc(I);
-    end
-    else
-    begin
-      sgChars.Objects[J, 0] := Pointer(0);
-      sgChars.Cells[J, 0] := s[I];
-      sgChars.Cells[J, 1] := 'U+'+IntToHex(Ord(s[i]), 4);
-    end;
-    Inc(J); Inc(I);
-  end;
-*)
 end;
 
 class procedure TCharacterGridRenderer.Render(grid: TStringGrid; ACol,
diff --git a/developer/src/tike/debug/debugdeadkeys.pas b/developer/src/tike/debug/debugdeadkeys.pas
index e50c7828c1..de0b37b1cd 100644
--- a/developer/src/tike/debug/debugdeadkeys.pas
+++ b/developer/src/tike/debug/debugdeadkeys.pas
@@ -1,18 +1,18 @@
 (*
   Name:             debugdeadkeys
   Copyright:        Copyright (C) 2003-2017 SIL International.
-  Documentation:    
-  Description:      
+  Documentation:
+  Description:
   Create Date:      18 May 2012
 
   Modified Date:    18 May 2012
   Authors:          mcdurdin
-  Related Files:    
-  Dependencies:     
+  Related Files:
+  Dependencies:
 
-  Bugs:             
-  Todo:             
-  Notes:            
+  Bugs:
+  Todo:
+  Notes:
   History:          18 May 2012 - mcdurdin - I3323 - V9.0 - Change from Plus-MemoU to Plus-Memo
 *)
 unit debugdeadkeys;
@@ -48,6 +48,11 @@ type
     procedure FillDeadkeys(startpos: Integer; var s: WideString);
   end;
 
+const
+  // This is not an ideal marker -- we were using U+FFFC previously, but
+  // richedit silently converts it to U+0020.
+  DeadKey_Marker = #$0001;
+
 implementation
 
 uses
@@ -80,7 +85,7 @@ begin
   i := 1;
   while i <= Length(s) do
   begin
-    if s[i] = #$FFFC then
+    if s[i] = DeadKey_Marker then
     begin
       for dk in Self do
       begin
diff --git a/developer/src/tike/main/Keyman.Developer.System.KeymanDeveloperPaths.pas b/developer/src/tike/main/Keyman.Developer.System.KeymanDeveloperPaths.pas
index 5010b98d29..6beeafe62e 100644
--- a/developer/src/tike/main/Keyman.Developer.System.KeymanDeveloperPaths.pas
+++ b/developer/src/tike/main/Keyman.Developer.System.KeymanDeveloperPaths.pas
@@ -9,8 +9,9 @@ uses
 
 type
   TKeymanDeveloperPaths = class sealed
-  private
   public
+    class function LockFilePath: string; static;
+
     class function NodePath: string; static;
 
     const S_LexicalModelCompiler = 'kmlmc.cmd';
@@ -56,6 +57,11 @@ begin
   Result := GetFolderPath(CSIDL_APPDATA) + SFolderKeymanDeveloper + '\server\';
 end;
 
+class function TKeymanDeveloperPaths.LockFilePath: string;
+begin
+  Result := GetFolderPath(CSIDL_APPDATA) + SFolderKeymanDeveloper + '\lock\';
+end;
+
 class function TKeymanDeveloperPaths.ServerPath: string;
 var
   KeymanRoot: string;
diff --git a/developer/src/tike/main/UfrmMain.pas b/developer/src/tike/main/UfrmMain.pas
index 8fa7a45c9b..201380d079 100644
--- a/developer/src/tike/main/UfrmMain.pas
+++ b/developer/src/tike/main/UfrmMain.pas
@@ -605,7 +605,10 @@ begin
   if TikeCommandLine.StartupProjectPath <> '' then
   begin
     try
-      LoadGlobalProjectUI(ptUnknown, TikeCommandLine.StartupProjectPath);
+      if LoadGlobalProjectUI(ptUnknown, TikeCommandLine.StartupProjectPath) = nil then
+      begin
+        raise EProjectLoader.Create('Project is already open in another process');
+      end;
     except
       on E:EProjectLoader do
       begin
@@ -1291,7 +1294,10 @@ begin
       // We need to create a temporary project to host this file
       // This can happen if we get a file opened via Explorer without a
       // corresonding project file
-      CreateTempGlobalProjectUI(ptUnknown);
+      if CreateTempGlobalProjectUI(ptUnknown) = nil then
+      begin
+        raise Exception.Create('Keyman Developer was unable to create a temporary project');
+      end;
       UpdateCaption;
     end;
 
@@ -1371,7 +1377,10 @@ begin
   end;
 
   try
-    LoadGlobalProjectUI(ptUnknown, FileName);   // I4687
+    if LoadGlobalProjectUI(ptUnknown, FileName) = nil then   // I4687
+    begin
+      raise EProjectLoader.Create('Project is open in another process');
+    end;
   except
     on E:EProjectLoader do
     begin
diff --git a/developer/src/tike/project/Keyman.Developer.UI.Project.ProjectUI.pas b/developer/src/tike/project/Keyman.Developer.UI.Project.ProjectUI.pas
index a4ee83c37e..4bd05c588c 100644
--- a/developer/src/tike/project/Keyman.Developer.UI.Project.ProjectUI.pas
+++ b/developer/src/tike/project/Keyman.Developer.UI.Project.ProjectUI.pas
@@ -33,13 +33,18 @@ function CreateTempGlobalProjectUI(pt: TProjectType): TProjectUI;
 implementation
 
 uses
+  System.Hash,
   System.SysUtils,
   Winapi.Windows,
 
+  Keyman.Developer.System.KeymanDeveloperPaths,
   Keyman.Developer.System.TikeMultiProcess,
   Keyman.Developer.System.Project.Project,
   utildir;
 
+function LockProject(const AFilename: string): Boolean; forward;
+procedure UnlockProject; forward;
+
 function GetGlobalProjectUI: TProjectUI;
 begin
   Result := FGlobalProject as TProjectUI;
@@ -52,8 +57,12 @@ end;
 
 procedure FreeGlobalProjectUI;
 begin
-  FreeAndNil(FGlobalProject);
-  TikeMultiProcess.CloseProject;
+  try
+    FreeAndNil(FGlobalProject);
+    TikeMultiProcess.CloseProject;
+  finally
+    UnlockProject;
+  end;
 end;
 
 function CreateTempGlobalProjectUI(pt: TProjectType): TProjectUI;
@@ -66,6 +75,11 @@ begin
   AFileName := KGetTempFileName('.kpj');
   System.SysUtils.DeleteFile(AFileName);
 
+  if not LockProject(AFilename) then
+  begin
+    Exit(nil);
+  end;
+
   kpj := TProject.Create(pt, AFilename, False);
   try
     kpj.Options.Version := pv10;
@@ -93,6 +107,12 @@ end;
 function LoadGlobalProjectUI(pt: TProjectType; AFilename: string): TProjectUI;
 begin
   Assert(not Assigned(FGlobalProject));
+
+  if not LockProject(AFilename) then
+  begin
+    Exit(nil);
+  end;
+
   Result := TProjectUI.Create(pt, AFilename, True);   // I4687
   FGlobalProject := Result;
   TikeMultiProcess.OpenProject(
@@ -102,4 +122,35 @@ begin
   );
 end;
 
+var
+  hLockFile: THandle = INVALID_HANDLE_VALUE;
+
+function LockProject(const AFilename: string): Boolean;
+var
+  LockFilename: string;
+begin
+  Assert(hLockFile = INVALID_HANDLE_VALUE);
+
+  if not ForceDirectories(TKeymanDeveloperPaths.LockFilePath) then
+  begin
+    Exit(False);
+  end;
+
+  LockFilename := TKeymanDeveloperPaths.LockFilePath + THashSHA1.GetHashString(AFilename.ToLower) + '.lock';
+
+  hLockFile := CreateFile(PChar(LockFilename), GENERIC_READ or GENERIC_WRITE, 0, nil, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0);
+  Result := hLockFile <> INVALID_HANDLE_VALUE;
+end;
+
+procedure UnlockProject;
+begin
+  if not hLockFile = INVALID_HANDLE_VALUE then
+  begin
+    Exit;
+  end;
+
+  CloseHandle(hLockFile);
+  hLockFile := INVALID_HANDLE_VALUE;
+end;
+
 end.
diff --git a/docs/settings/linux/launch.json b/docs/settings/linux/launch.json
index fec5afe0ad..d61153c2c6 100644
--- a/docs/settings/linux/launch.json
+++ b/docs/settings/linux/launch.json
@@ -40,7 +40,7 @@
       "valuesFormatting": "parseText"
     },
     {
-      // start: gdbserver 10.3.0.58:2345 /media/sf_Develop/keyman/keyman/linux/build/x86_64/debug/tests/ibus-keyman-tests
+      // start: linux/ibus-keyman/tests/scripts/run-tests.sh --remote-debug --no-surrounding-text --no-wayland -- k_001___basic_input_unicodei
       // then attach debugger in vscode
       "type": "gdb",
       "request": "attach",
diff --git a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
index 045506b9af..d4ad629fe5 100644
--- a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
+++ b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
@@ -1711,7 +1711,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = SystemKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1757,7 +1757,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = SystemKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1805,7 +1805,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngineTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1849,7 +1849,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngineTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1900,7 +1900,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngine/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1955,7 +1955,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngine/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1979,7 +1979,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F27FCAF6157FD95E00FBBA20 /* Keyman-lib.xcconfig */;
 			buildSettings = {
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_STYLE = all;
@@ -1992,7 +1992,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F27FCAF6157FD95E00FBBA20 /* Keyman-lib.xcconfig */;
 			buildSettings = {
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = NO;
 			};
@@ -2021,7 +2021,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "KeymanEngine/resources/Keyman.bundle/Contents/Resources/KeymanEngine-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2058,7 +2058,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "KeymanEngine/resources/Keyman.bundle/Contents/Resources/KeymanEngine-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2110,7 +2110,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -2151,7 +2151,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngine/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2175,7 +2175,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = F27FCAF6157FD95E00FBBA20 /* Keyman-lib.xcconfig */;
 			buildSettings = {
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTS_MACCATALYST = NO;
 			};
@@ -2194,7 +2194,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3YE4W86L3G;
 				ENABLE_BITCODE = NO;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2244,7 +2244,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = SystemKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2292,7 +2292,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = KeymanEngineTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2333,7 +2333,7 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "KeymanEngine/resources/Keyman.bundle/Contents/Resources/KeymanEngine-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2385,7 +2385,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG NO_SENTRY";
@@ -2428,7 +2428,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				SKIP_INSTALL = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -2449,7 +2449,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3YE4W86L3G;
 				ENABLE_BITCODE = NO;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2482,7 +2482,7 @@
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3YE4W86L3G;
 				ENABLE_BITCODE = NO;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Colors+Extension.swift b/ios/engine/KMEI/KeymanEngine/Classes/Colors+Extension.swift
index d719e55dd7..4ad4201b6f 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Colors+Extension.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Colors+Extension.swift
@@ -13,11 +13,7 @@ import UIKit
 extension Colors {
   public static var systemBackground: UIColor {
     get {
-      if #available(iOS 13.0, *) {
-        return UIColor.systemBackground
-      } else {
-        return UIColor.white
-      }
+      return UIColor.systemBackground
     }
   }
 
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Installation/PackageInstallViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Installation/PackageInstallViewController.swift
index 988a3feea8..390583510d 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Installation/PackageInstallViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Installation/PackageInstallViewController.swift
@@ -208,13 +208,6 @@ public class PackageInstallViewController<Resource: LanguageResource>: UIViewCon
       edgesForExtendedLayout = []
 
       rightNavigationMode = .next
-
-      if #available(*, iOS 13.4) {
-        // No icon issues here.
-      } else {
-        tabVC.tabBar.items![0].titlePositionAdjustment = UIOffset(horizontal: 0, vertical: -16)
-        tabVC.tabBar.items![1].titlePositionAdjustment = UIOffset(horizontal: 0, vertical: -16)
-      }
     }
 
     // If there's only one language in the package, hide the language picker.
@@ -357,9 +350,7 @@ public class PackageInstallViewController<Resource: LanguageResource>: UIViewCon
     self.pickingCompletionHandler(selectedResources.map { $0.typedFullID })
 
     // Prevent swipe dismissal.
-    if #available(iOS 13.0, *) {
-      self.isModalInPresentation = true
-    }
+    self.isModalInPresentation = true
 
     // No more selection-manipulation allowed.
     // This matters when there's no welcome page available.
@@ -376,9 +367,7 @@ public class PackageInstallViewController<Resource: LanguageResource>: UIViewCon
     // First, show the package's welcome - if it exists.
     if let welcomeVC = PackageWebViewController(for: package, page: .welcome) {
       // Prevent swipe dismissal.
-      if #available(iOS 13.0, *) {
-        welcomeVC.isModalInPresentation = true
-      }
+      welcomeVC.isModalInPresentation = true
 
       let subNavVC = UINavigationController(rootViewController: welcomeVC)
       _ = subNavVC.view
@@ -502,11 +491,7 @@ public class PackageInstallViewController<Resource: LanguageResource>: UIViewCon
 
   private func setCellStyle(_ cell: UITableViewCell, style: CellStyle) {
     var textColor: UIColor
-    if #available(*, iOS 13.0) {
-      textColor = .label
-    } else {
-      textColor = .black
-    }
+    textColor = .label
 
     switch style {
       case .none:
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift
index 16acd10f9e..a51db67141 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/InputViewController.swift
@@ -41,6 +41,16 @@ private class CustomInputView: UIInputView, UIInputViewAudioFeedback {
     super.init(coder: coder)
   }
 
+  public func destroy() {
+    // In app-extension mode, there are scenarios in which this class does not properly
+    // deallocate!  We need to help that process along.  In particular, doing this allows
+    // us to guarantee that the WebView is allowed to be GC'd, even when Apple fails to GC
+    // this (`CustomInputView`) instance - which actually happens.  (Refer to #12216.)
+    keymanWeb.removeFromParent()
+    keymanWeb.destroy()
+    keymanWeb = nil
+  }
+
   public var enableInputClicksWhenVisible: Bool {
     get {
       // Implemented as noted by https://developer.apple.com/documentation/uikit/uidevice/1620050-playinputclick.
@@ -98,37 +108,37 @@ private class CustomInputView: UIInputView, UIInputViewAudioFeedback {
    */
   func keyboardHeightChanged() {
     os_log("CustomInputView keyboardHeightChanged", log: KeymanEngineLogger.ui, type: .info)
-    
+
     // deactivate constraints for both orientations (though one should already be inactive)
     landscapeConstraint?.isActive = false
     portraitConstraint?.isActive = false
- 
+
     // rebuild both portrait and landscape constraints
     self.buildKeyboardHeightConstraints(bannerHeight: InputViewController.topBarHeight)
-    
+
     // activate constraints for the current orientation
     if InputViewController.isPortrait {
       portraitConstraint?.isActive = true
     } else {
       landscapeConstraint?.isActive = true
     }
-    
+
     self.setNeedsLayout()
   }
-  
+
   private func buildKeyboardHeightConstraints(bannerHeight: CGFloat) {
     os_log("CustomInputView buildKeyboardHeightConstraints", log: KeymanEngineLogger.ui, type: .info)
     let innerView = keymanWeb.view!
-    
+
     // Cannot be met by the in-app keyboard, but helps to 'force' height for the system keyboard.
     let portraitHeightConstraint = innerView.heightAnchor.constraint(equalToConstant: bannerHeight +  keymanWeb.readKeyboardHeight(isPortrait: true)!)
     portraitHeightConstraint.identifier = "Height constraint for portrait mode"
     portraitHeightConstraint.priority = .defaultHigh
-    
+
     let landscapeHeightConstraint = innerView.heightAnchor.constraint(equalToConstant: bannerHeight + keymanWeb.readKeyboardHeight(isPortrait: false)!)
     landscapeHeightConstraint.identifier = "Height constraint for landscape mode"
     landscapeHeightConstraint.priority = .defaultHigh
-    
+
     portraitConstraint = portraitHeightConstraint
     landscapeConstraint = landscapeHeightConstraint
     // .isActive will be set according to the current portrait/landscape perspective.
@@ -166,6 +176,8 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
   var portraitConstraint: NSLayoutConstraint?
   var landscapeConstraint: NSLayoutConstraint?
 
+  var outerWidthConstraint: NSLayoutConstraint?
+
   private var keymanWeb: KeymanWebViewController
   private var swallowBackspaceTextChange: Bool = false
 
@@ -206,7 +218,7 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
     keymanWeb = KeymanWebViewController(storage: Storage.active)
     super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
 
-    var message = self.hasFullAccess ? "hasFullAccess: true" : "hasFullAccess: false"
+    let message = self.hasFullAccess ? "hasFullAccess: true" : "hasFullAccess: false"
     os_log("%{public}s", log: KeymanEngineLogger.settings, type: .default, message)
     SentryManager.breadcrumb(message)
 
@@ -217,6 +229,12 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
     fatalError("init(coder:) has not been implemented")
   }
 
+  deinit {
+    inputView?.removeFromSuperview()
+    (inputView as? CustomInputView)?.destroy()
+    inputView = nil
+  }
+
   open override func updateViewConstraints() {
     resetKeyboardState()
 
@@ -301,6 +319,16 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
     }
   }
 
+  open override func viewDidDisappear(_ animated: Bool) {
+    super.viewDidDisappear(animated)
+
+    if outerWidthConstraint != nil {
+      outerWidthConstraint?.isActive = false
+      self.inputView?.removeConstraint(self.outerWidthConstraint!)
+      outerWidthConstraint = nil
+    }
+  }
+
   open override func textDidChange(_ textInput: UITextInput?) {
     // Swallows self-triggered calls from emptying the context due to keyboard rules
     if self.swallowBackspaceTextChange && textDocumentProxy.documentContextBeforeInput == nil {
@@ -368,7 +396,7 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
       }
     }
   }
-  
+
   func deleteSelection() -> Bool {
     if let selected = textDocumentProxy.selectedText, selected.count > 0 {
       /*
@@ -381,23 +409,23 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
       /*
         We have a problem to resolve here: we cannot simply delete the selection
         with either .deleteBackward() or .insertText(""):
-       
+
         - If there is selected text immediately following a space (U+0020),
           .deleteBackward() will delete that space IN ADDITION to the selected text.
         - Unlike .insertText("-any-string-here"), .insertText("") does nothing;
           it does not replace the selection with the new string.
-       
+
         Our policy (#9073) on handling the backspace key when there is a
         text selection is to just delete the selection. We have to override
         the special case of space being deleted by .deleteBackward() ourselves.
         Additionally, the internal Web engine cannot anticipate the special
         case and requires precise and consistent backspace handling in line
         with our policy in order to keep the context on both sides synchronized.
-       
+
         As .insertText() does not delete the selection if the string to
         be inserted is empty, we insert something that won't combine,
         like a ZWNJ, and then delete it.
-       
+
         iOS does not allow users to select text in a way that splits
         character clusters.  This implies that it's impossible for an
         inserted ZWNJ to combine with existing context, making this
@@ -405,14 +433,14 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
       */
       textDocumentProxy.insertText("\u{200c}")
       textDocumentProxy.deleteBackward()
-      
+
       let afterManipulation = textDocumentProxy.documentContextBeforeInput ?? ""
-      
+
       // And now to finish our 'canary' check.
       if beforeManipulation != afterManipulation {
         os_log(.error, log: KeymanEngineLogger.engine, "Could not cleanly execute backspace for selected text")
       }
-      
+
       return true
     }
     return false
@@ -527,11 +555,15 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
   }
 
   // These require the view to appear - parent and our relationship with it must exist!
+  // ... wait, is THIS possibly a leak source?
   private func setOuterConstraints() {
-    var baseWidthConstraint: NSLayoutConstraint
-    baseWidthConstraint = self.inputView!.widthAnchor.constraint(equalTo: parent!.view.safeAreaLayoutGuide.widthAnchor)
-    baseWidthConstraint.priority = UILayoutPriority(rawValue: 999)
-    baseWidthConstraint.isActive = true
+    guard outerWidthConstraint == nil else {
+      outerWidthConstraint!.isActive = true
+      return
+    }
+    outerWidthConstraint = self.inputView!.widthAnchor.constraint(equalTo: parent!.view.safeAreaLayoutGuide.widthAnchor)
+    outerWidthConstraint!.priority = UILayoutPriority(rawValue: 999)
+    outerWidthConstraint!.isActive = true
   }
 
   public var kmwHeight: CGFloat {
@@ -560,7 +592,7 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
       customInputView.keyboardHeightChanged()
     }
   }
-  
+
   func fixLayout() {
     view.setNeedsLayout()
     view.layoutIfNeeded()
@@ -589,7 +621,7 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
   }
 
   // KeymanWebViewController maintenance methods
-  func reload() {
+  public func reload() {
     keymanWeb.reloadKeyboard()
   }
 
@@ -624,10 +656,18 @@ open class InputViewController: UIInputViewController, KeymanWebDelegate {
     keymanWeb.showHelpBubble()
   }
 
+  func dismissHelpBubble() {
+    keymanWeb.dismissHelpBubble()
+  }
+
   func showHelpBubble(afterDelay delay: TimeInterval) {
     keymanWeb.showHelpBubble(afterDelay: delay)
   }
 
+  internal func enforceKeyboardSize() {
+    keymanWeb.resizeKeyboard()
+  }
+
   func clearText() {
     setContextState(text: nil, range: NSRange(location: 0, length: 0))
     keymanWeb.resetContext()
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeyboardMenuView.swift b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeyboardMenuView.swift
index 397697222c..1823b143b3 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeyboardMenuView.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeyboardMenuView.swift
@@ -26,7 +26,9 @@ class KeyboardMenuView: UIView, UITableViewDelegate, UITableViewDataSource, UIGe
   private var tableView: UITableView?
   private let closeButtonTitle: String?
 
-  private var _inputViewController: InputViewController?
+  // Is populated during init from a weak ref by KeymanWebViewController,
+  // and instances of this class are owned by the same.
+  private weak var _inputViewController: InputViewController?
   override var inputViewController: InputViewController? {
     return _inputViewController
   }
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
index a0c8c6d5e4..4bd5375bc9 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Keyboard/KeymanWebViewController.swift
@@ -72,14 +72,6 @@ class KeymanWebViewController: UIViewController {
     super.init(nibName: nil, bundle: nil)
 
     _ = view
-
-    NotificationCenter.default.addObserver(
-      forName: UIApplication.willEnterForegroundNotification,
-      object: nil,
-      queue: OperationQueue.main
-    ) { _ in
-      self.reloadKeyboard()
-    }
   }
 
   required init?(coder aDecoder: NSCoder) {
@@ -154,19 +146,12 @@ class KeymanWebViewController: UIViewController {
 
     view = webView
 
-    NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardWillShow),
-                                           name: UIResponder.keyboardWillShowNotification, object: nil)
-    NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardWillHide),
-                                           name: UIResponder.keyboardWillHideNotification, object: nil)
-
     reloadKeyboard()
   }
 
   override func viewWillAppear(_ animated: Bool) {
     super.viewWillAppear(animated)
-    if #available(iOSApplicationExtension 14.0, *) {
-      self.userContentController.removeAllScriptMessageHandlers()
-    }
+    self.userContentController.removeAllScriptMessageHandlers()
     self.userContentController.add(self, name: keymanWebViewName)
   }
 
@@ -186,6 +171,18 @@ class KeymanWebViewController: UIViewController {
 
 // MARK: - JavaScript functions
 extension KeymanWebViewController {
+  // In app-extension mode, there are scenarios in which this class does not properly
+  // deallocate!  We need to help that process along.
+  func destroy() {
+    // Message handlers can maintain references.
+    if #available(iOSApplicationExtension 14.0, *) {
+      self.userContentController.removeAllScriptMessageHandlers()
+    } else {
+      self.userContentController.removeScriptMessageHandler(forName: keymanWebViewName)
+    }
+    view = nil
+  }
+  
   func languageMenuPosition(_ completion: @escaping (CGRect) -> Void) {
     webView!.evaluateJavaScript("langMenuPos();") { result, _ in
       guard let result = result as? String, !result.isEmpty else {
@@ -990,18 +987,3 @@ extension KeymanWebViewController {
     return keyboardMenuView != nil
   }
 }
-
-// MARK: - Keyboard Notifications
-extension KeymanWebViewController {
-  @objc func keyboardWillShow(_ notification: Notification) {
-    resizeKeyboard()
-
-    if Manager.shared.isKeymanHelpOn {
-      showHelpBubble(afterDelay: 1.5)
-    }
-  }
-
-  @objc func keyboardWillHide(_ notification: Notification) {
-    dismissHelpBubble()
-  }
-}
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/KeyboardHeightViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/KeyboardHeightViewController.swift
index 4326dc52d4..8a79983eaa 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/KeyboardHeightViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/KeyboardHeightViewController.swift
@@ -355,14 +355,8 @@ class KeyboardHeightViewController: UIViewController {
     var arrowSymbolImage: UIImage? = nil
     keyboardResizer.isUserInteractionEnabled = true
     
-    // if using iOS earlier than 13.0, use bitmap image of arrow and non-dynamic gray
-    if #available(iOSApplicationExtension 13.0, *) {
-      arrowSymbolImage = UIImage(systemName: "arrow.up.and.down.square.fill")
-      keyboardResizer.backgroundColor = UIColor.systemGray3 // adapts for light/dark mode
-    } else {
-      arrowSymbolImage = UIImage(named:"arrow.up.and.down", in:engineBundle, compatibleWith:nil)
-      keyboardResizer.backgroundColor = UIColor.systemGray
-    }
+    arrowSymbolImage = UIImage(systemName: "arrow.up.and.down.square.fill")
+    keyboardResizer.backgroundColor = UIColor.systemGray3 // adapts for light/dark mode
     keyboardResizer.image = arrowSymbolImage
     keyboardResizer.layer.cornerRadius = 5
     contentView.addSubview(keyboardResizer)
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift b/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift
index 4ab0da660b..adfdad596c 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Manager.swift
@@ -165,6 +165,7 @@ public class Manager: NSObject, UIGestureRecognizerDelegate {
     }
 
     set(value) {
+      // The system keyboard will set itself here when its `viewDidAppear` triggers.
       _inputViewController = value
     }
   }
@@ -239,10 +240,35 @@ public class Manager: NSObject, UIGestureRecognizerDelegate {
         SentryManager.capture(error, message:message)
       }
     }
+    
+    // Keep these within our singleton Manager instance.  As we never remove these,
+    // setting them within something prone to replacement (like the keyboard when in
+    // app-extension mode) can lead to memory leaks.  See #12216.
+    NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardWillShow), //
+                                           name: UIResponder.keyboardWillShowNotification, object: nil)
+    NotificationCenter.default.addObserver(self, selector: #selector(self.keyboardWillHide), //
+                                           name: UIResponder.keyboardWillHideNotification, object: nil)
 
     // We used to preload the old KeymanWebViewController, but now that it's embedded within the
     // InputViewController, that's not exactly viable.
   }
+  
+  // MARK: - Keyboard Notifications
+  // Do NOT place these anywhere within InputViewController or its children.
+  // So far as we can tell, the OS causes the app extension to sometimes throw
+  // instances away, and maintaining references via notification to them can
+  // cause memory leaks.  Refer to #12216.
+  @objc func keyboardWillShow(_ notification: Notification) {
+    inputViewController?.enforceKeyboardSize()
+
+    if Manager.shared.isKeymanHelpOn {
+      inputViewController?.showHelpBubble(afterDelay: 1.5)
+    }
+  }
+
+  @objc func keyboardWillHide(_ notification: Notification) {
+    inputViewController?.dismissHelpBubble()
+  }
 
   // MARK: - Keyboard management
   
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/PackageWebViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/PackageWebViewController.swift
index f6ec682ac8..0277065a7e 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/PackageWebViewController.swift
+++ b/ios/engine/KMEI/KeymanEngine/Classes/PackageWebViewController.swift
@@ -43,15 +43,13 @@ class PackageWebViewController: UIViewController, WKNavigationDelegate {
     let prefs = WKPreferences()
     prefs.javaScriptEnabled = true
 
-    if #available(iOS 13.0, *) {
-      /**
-        In iPadOS 16 and above WKWebView defaults to lying about its user-agent,
-        telling the web server that it is a mac. We can avoid this with .mobile:
-        */
-      let pref = WKWebpagePreferences.init()
-      pref.preferredContentMode = .mobile
-      config.defaultWebpagePreferences = pref
-    }
+    /**
+      In iPadOS 16 and above WKWebView defaults to lying about its user-agent,
+      telling the web server that it is a mac. We can avoid this with .mobile:
+      */
+    let pref = WKWebpagePreferences.init()
+    pref.preferredContentMode = .mobile
+    config.defaultWebpagePreferences = pref
 
     // Inject a meta viewport tag into the head of the file if it doesn't exist
     let metaViewportInjection = """
diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/KeyboardSearchViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/KeyboardSearchViewController.swift
index 208e5d3ada..713261ff37 100644
--- a/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/KeyboardSearchViewController.swift	
+++ b/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/KeyboardSearchViewController.swift	
@@ -104,15 +104,13 @@ public class KeyboardSearchViewController: UIViewController, WKNavigationDelegat
 
     let config = WKWebViewConfiguration()
 
-    if #available(iOS 13.0, *) {
-      /**
-       In iPadOS 16 and above WKWebView defaults to lying about its user-agent,
-       telling the web server that it is a mac. We can avoid this with .mobile:
-       */
-      let pref = WKWebpagePreferences.init()
-      pref.preferredContentMode = .mobile
-      config.defaultWebpagePreferences = pref
-    }
+    /**
+     In iPadOS 16 and above WKWebView defaults to lying about its user-agent,
+     telling the web server that it is a mac. We can avoid this with .mobile:
+     */
+    let pref = WKWebpagePreferences.init()
+    pref.preferredContentMode = .mobile
+    config.defaultWebpagePreferences = pref
 
     let webView = WKWebView.init(frame: CGRect.zero, configuration: config)
     webView.navigationDelegate = self
diff --git a/ios/engine/KMEI/KeymanEngine/Config/Keyman-iphoneos.xcconfig b/ios/engine/KMEI/KeymanEngine/Config/Keyman-iphoneos.xcconfig
index 39eb001ec7..5289cd2857 100644
--- a/ios/engine/KMEI/KeymanEngine/Config/Keyman-iphoneos.xcconfig
+++ b/ios/engine/KMEI/KeymanEngine/Config/Keyman-iphoneos.xcconfig
@@ -11,4 +11,4 @@ PRODUCT_NAME = $(TARGET_NAME)
 GCC_PRECOMPILE_PREFIX_HEADER = YES
 GCC_PREFIX_HEADER = KME-iphoneos/KME-iphoneos-Prefix.pch
 
-IPHONEOS_DEPLOYMENT_TARGET = 4.0
+IPHONEOS_DEPLOYMENT_TARGET = 15.6
diff --git a/ios/engine/KMEI/KeymanEngine/Config/Keyman-iphonesimulator.xcconfig b/ios/engine/KMEI/KeymanEngine/Config/Keyman-iphonesimulator.xcconfig
index 67651865fc..b86982c0d2 100644
--- a/ios/engine/KMEI/KeymanEngine/Config/Keyman-iphonesimulator.xcconfig
+++ b/ios/engine/KMEI/KeymanEngine/Config/Keyman-iphonesimulator.xcconfig
@@ -14,4 +14,4 @@ GCC_PREFIX_HEADER = KME-iphonesimulator/KME-iphonesimulator-Prefix.pch
 ARCHS = i386
 VALID_ARCHS = i386
 
-IPHONEOS_DEPLOYMENT_TARGET = 4.0
+IPHONEOS_DEPLOYMENT_TARGET = 15.6
diff --git a/ios/engine/KMEI/KeymanEngine/Config/Keyman-lib.xcconfig b/ios/engine/KMEI/KeymanEngine/Config/Keyman-lib.xcconfig
index 3ea6c6f0f5..06b88f8ae6 100644
--- a/ios/engine/KMEI/KeymanEngine/Config/Keyman-lib.xcconfig
+++ b/ios/engine/KMEI/KeymanEngine/Config/Keyman-lib.xcconfig
@@ -11,4 +11,4 @@ PRODUCT_NAME = $(TARGET_NAME)
 GCC_PRECOMPILE_PREFIX_HEADER = YES
 GCC_PREFIX_HEADER = KeymanEngine/KeymanEngine-Prefix.pch
 
-IPHONEOS_DEPLOYMENT_TARGET = 4.0
+IPHONEOS_DEPLOYMENT_TARGET = 15.6
diff --git a/ios/engine/KMEI/KeymanEngine/Images.xcassets/arrow.up.and.down.imageset/Contents.json b/ios/engine/KMEI/KeymanEngine/Images.xcassets/arrow.up.and.down.imageset/Contents.json
deleted file mode 100644
index 1dc6b4c767..0000000000
--- a/ios/engine/KMEI/KeymanEngine/Images.xcassets/arrow.up.and.down.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "arrow.up.and.down.png",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/ios/engine/KMEI/KeymanEngine/Images.xcassets/arrow.up.and.down.imageset/arrow.up.and.down.png b/ios/engine/KMEI/KeymanEngine/Images.xcassets/arrow.up.and.down.imageset/arrow.up.and.down.png
deleted file mode 100644
index 3b903f6fac..0000000000
Binary files a/ios/engine/KMEI/KeymanEngine/Images.xcassets/arrow.up.and.down.imageset/arrow.up.and.down.png and /dev/null differ
diff --git a/ios/engine/KMEI/KeymanEngine/cs.lproj/Localizable.strings b/ios/engine/KMEI/KeymanEngine/cs.lproj/Localizable.strings
index 0653ed3aeb..7cb2bf6809 100644
--- a/ios/engine/KMEI/KeymanEngine/cs.lproj/Localizable.strings
+++ b/ios/engine/KMEI/KeymanEngine/cs.lproj/Localizable.strings
@@ -226,6 +226,24 @@
 /* Text showing name of spacebar caption - language + keyboard */
 "menu-settings-spacebar-item-languageKeyboard" = "Jazyk a klávesnice";
 
+/* Label for the "Adjust Keyboard Height" item on the main settings screen */
+"menu-settings-adjust-keyboard-height" = "Upravit výšku klávesnice";
+
+/* Title for the "Adjust Keyboard Height" settings child screen */
+"adjust-keyboard-height-title" = "Upravit klávesnici";
+
+/* Label for "Reset to Default Keyboard Height" button on the adjust height screen */
+"button-label-reset-default-keyboard-height" = "Obnovit výchozí výšku klávesnice";
+
+/* Instruction text to drag keyboard to resize */
+"keyboard-drag-instructions" = "Tažením šipky nastavíte výšku klávesnice.";
+
+/* Instruction to rotate to adjust landscape keyboard height (displayed when device is portrait) */
+"portrait-keyboard-rotate-instructions" = "Otočte zařízení pro nastavení na šířku.";
+
+/* Instruction to rotate to adjust portrait keyboard height (displayed when device is landscape) */
+"landscape-keyboard-rotate-instructions" = "Otočte zařízení pro nastavení na výšku.";
+
 /* Short text for notification:  download failure for keyboard */
 "notification-download-failure-keyboard" = "Stahování klávesnice se nezdařilo";
 
diff --git a/ios/engine/KMEI/KeymanEngine/el.lproj/Localizable.strings b/ios/engine/KMEI/KeymanEngine/el.lproj/Localizable.strings
index 1bd8c7713f..b8cf1a7910 100644
--- a/ios/engine/KMEI/KeymanEngine/el.lproj/Localizable.strings
+++ b/ios/engine/KMEI/KeymanEngine/el.lproj/Localizable.strings
@@ -226,6 +226,24 @@
 /* Text showing name of spacebar caption - language + keyboard */
 "menu-settings-spacebar-item-languageKeyboard" = "Γλῶσσα καὶ πληκτρολόγιο";
 
+/* Label for the "Adjust Keyboard Height" item on the main settings screen */
+"menu-settings-adjust-keyboard-height" = "Προσαρμογὴ ὕψους πληκτρολογίου";
+
+/* Title for the "Adjust Keyboard Height" settings child screen */
+"adjust-keyboard-height-title" = "Προσαρμογὴ πληκτρολογίου";
+
+/* Label for "Reset to Default Keyboard Height" button on the adjust height screen */
+"button-label-reset-default-keyboard-height" = "Ἐπαναφορὰ προεπιλεγμένων ρυθμίσεων";
+
+/* Instruction text to drag keyboard to resize */
+"keyboard-drag-instructions" = "Σύρετε τὰ βέλη γιὰ νὰ προσαρμόσετε τὸ πληκτρολόγιο.";
+
+/* Instruction to rotate to adjust landscape keyboard height (displayed when device is portrait) */
+"portrait-keyboard-rotate-instructions" = "Περιστρέψτε τὴν συσκευὴ γιὰ νὰ ἔλθει σὲ ὁριζόντια θέση.";
+
+/* Instruction to rotate to adjust portrait keyboard height (displayed when device is landscape) */
+"landscape-keyboard-rotate-instructions" = "Περιστρέψτε τὴν συσκευὴ γιὰ νὰ ἔλθει σὲ κάθετη θέση.";
+
 /* Short text for notification:  download failure for keyboard */
 "notification-download-failure-keyboard" = "Ἡ μεταφόρτωση τοῦ πληκτρολογίου ἀπέτυχε";
 
diff --git a/ios/engine/KMEI/KeymanEngine/mnw.lproj/Localizable.strings b/ios/engine/KMEI/KeymanEngine/mnw.lproj/Localizable.strings
index 4a6595036b..a3af4bb5b7 100644
--- a/ios/engine/KMEI/KeymanEngine/mnw.lproj/Localizable.strings
+++ b/ios/engine/KMEI/KeymanEngine/mnw.lproj/Localizable.strings
@@ -226,6 +226,24 @@
 /* Text showing name of spacebar caption - language + keyboard */
 "menu-settings-spacebar-item-languageKeyboard" = "ဘာသာ ကေုာံ ကဳဗုဒ်";
 
+/* Label for the "Adjust Keyboard Height" item on the main settings screen */
+"menu-settings-adjust-keyboard-height" = "ချိၚ်ဆသမၠုၚ်ကဳဗုဒ်ညိ";
+
+/* Title for the "Adjust Keyboard Height" settings child screen */
+"adjust-keyboard-height-title" = "ချိၚ်ကဳဗုဒ်";
+
+/* Label for "Reset to Default Keyboard Height" button on the adjust height screen */
+"button-label-reset-default-keyboard-height" = "ကလေၚ်ကေတ် သမၠုၚ်ကဳဗုဒ် ပကတိ";
+
+/* Instruction text to drag keyboard to resize */
+"keyboard-drag-instructions" = "သ္ဂောံချိၚ်သမၠုၚ်ကဳဗုဒ်ဂှ် ဓဇက်မလဴဂှ်ညိ";
+
+/* Instruction to rotate to adjust landscape keyboard height (displayed when device is portrait) */
+"portrait-keyboard-rotate-instructions" = "ကလေၚ်ကေတ်ဗီုပြၚ်ပကတိ";
+
+/* Instruction to rotate to adjust portrait keyboard height (displayed when device is landscape) */
+"landscape-keyboard-rotate-instructions" = "သ္ဂောံစွံလ္ပါ်ပဇူဂှ် ဗဂေတ်ကဵုစက်ညိ";
+
 /* Short text for notification:  download failure for keyboard */
 "notification-download-failure-keyboard" = "ဂြဲဖျေံကဳဗုဒ်ဟွံအံၚ်ဇၞး";
 
diff --git a/ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keyboard.html b/ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keyboard.html
index 7d27738560..7c538ae64a 100644
--- a/ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keyboard.html
+++ b/ios/engine/KMEI/KeymanEngine/resources/Keyman.bundle/Contents/Resources/keyboard.html
@@ -4,9 +4,9 @@
         <meta http-equiv="content-type" content="text/html; charset=UTF-8">
         <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
         <title>Keyman</title>
-        <script src="keymanweb-webview.js"></script>
         <script src="sentry.min.js"></script>
         <script src="keyman-sentry.js"></script>
+        <script src="keymanweb-webview.js"></script>
         <script src="ios-host.js"></script>
         <style type="text/css">
             body {background-color: rgb(210,214,220);}
diff --git a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
index a8b4f8624b..9b2737f12e 100644
--- a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
+++ b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
@@ -1131,7 +1131,7 @@
 				GCC_PREFIX_HEADER = "Keyman/Keyman-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				INFOPLIST_FILE = Keyman/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1166,7 +1166,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Keyman/Keyman-Prefix.pch";
 				INFOPLIST_FILE = Keyman/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1232,7 +1232,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "";
@@ -1284,7 +1284,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
@@ -1319,7 +1319,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				INFOPLIST_FILE = SWKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1362,7 +1362,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				INFOPLIST_FILE = SWKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1431,7 +1431,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "";
@@ -1456,7 +1456,7 @@
 				GCC_PREFIX_HEADER = "Keyman/Keyman-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				INFOPLIST_FILE = Keyman/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1500,7 +1500,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				INFOPLIST_FILE = SWKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/ios/keyman/Keyman/Keyman/AppDelegate.swift b/ios/keyman/Keyman/Keyman/AppDelegate.swift
index be6667ac4a..4586c0209e 100644
--- a/ios/keyman/Keyman/Keyman/AppDelegate.swift
+++ b/ios/keyman/Keyman/Keyman/AppDelegate.swift
@@ -67,9 +67,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     // In iOS 15, navigation bars become transparent by default when the edge
     // of the scrollable content aligns with the edge of the navigation bar.
     // Force the appearance back to the pre-iOS 15 default behavior.
-    if #available(iOS 15, *) {
-        UINavigationBar.appearance().scrollEdgeAppearance = UINavigationBarAppearance()
-    }
+    UINavigationBar.appearance().scrollEdgeAppearance = UINavigationBarAppearance()
+    
     UniversalLinks.externalLinkLauncher = { url in
       UIApplication.shared.open(url)
     }
diff --git a/ios/keyman/Keyman/Keyman/Classes/KMWebBrowser/WebBrowserViewController.swift b/ios/keyman/Keyman/Keyman/Classes/KMWebBrowser/WebBrowserViewController.swift
index e571a90f81..6e17ceb4b3 100644
--- a/ios/keyman/Keyman/Keyman/Classes/KMWebBrowser/WebBrowserViewController.swift
+++ b/ios/keyman/Keyman/Keyman/Classes/KMWebBrowser/WebBrowserViewController.swift
@@ -54,13 +54,9 @@ class WebBrowserViewController: UIViewController, WKNavigationDelegate, UIAlertV
 
     webView.navigationDelegate = self
 
-    if #available(iOS 13.0, *) {
-      // Dark mode settings must be applied through this new property,
-      // its class, and others like it.
-      navBar.standardAppearance.configureWithOpaqueBackground()
-    } else {
-      // Fallback on earlier versions
-    }
+    // Dark mode settings must be applied through this new property,
+    // its class, and others like it.
+    navBar.standardAppearance.configureWithOpaqueBackground()
 
     // Setup NavigationBar
     navbarBackground = KMNavigationBarBackgroundView()
@@ -119,12 +115,6 @@ class WebBrowserViewController: UIViewController, WKNavigationDelegate, UIAlertV
 
   override func viewWillAppear(_ animated: Bool) {
     super.viewWillAppear(animated)
-
-    if #available(iOS 13.0, *) {
-      // 13.0 auto-adjusts the top to avoid the status bar.
-    } else {
-      navBarTopConstraint.constant = AppDelegate.statusBarHeight()
-    }
   }
 
   override func willRotate(to toInterfaceOrientation: UIInterfaceOrientation, duration: TimeInterval) {
diff --git a/ios/keyman/Keyman/Keyman/Classes/MainViewController/MainViewController.swift b/ios/keyman/Keyman/Keyman/Classes/MainViewController/MainViewController.swift
index 35ee78c5db..bf6abc1585 100644
--- a/ios/keyman/Keyman/Keyman/Classes/MainViewController/MainViewController.swift
+++ b/ios/keyman/Keyman/Keyman/Classes/MainViewController/MainViewController.swift
@@ -112,6 +112,14 @@ class MainViewController: UIViewController, TextViewDelegate, UIActionSheetDeleg
       forName: Notifications.keyboardRemoved,
       observer: self,
       function: MainViewController.keyboardRemoved)
+    
+    NotificationCenter.default.addObserver(
+      forName: UIApplication.willEnterForegroundNotification,
+      object: nil,
+      queue: OperationQueue.main
+    ) { _ in
+      Manager.shared.inputViewController.reload()
+    }
 
     // Unfortunately, it's the main app with the file definitions.
     // We have to gerry-rig this so that the framework-based SettingsViewController
@@ -278,13 +286,7 @@ class MainViewController: UIViewController, TextViewDelegate, UIActionSheetDeleg
 
     // Setup NavigationBar
     if let navbar = navigationController?.navigationBar {
-      if #available(iOS 13.0, *) {
-        // Dark mode settings must be applied through this new property,
-        // its class, and others like it.
-        navbar.standardAppearance.configureWithOpaqueBackground()
-      } else {
-        // Fallback on earlier versions
-      }
+      navbar.standardAppearance.configureWithOpaqueBackground()
       navbarBackground = KMNavigationBarBackgroundView()
       navbarBackground.addToNavbar(navbar)
       navbarBackground.setOrientation(UIApplication.shared.statusBarOrientation)
@@ -695,12 +697,7 @@ class MainViewController: UIViewController, TextViewDelegate, UIActionSheetDeleg
 
     let lframe = CGRect(x: 0, y: bframe.origin.y - 1, width: sframe.size.width, height: 1)
     let borderLine = UIView(frame: lframe)
-    if #available(iOS 13.0, *) {
-      borderLine.backgroundColor = UIColor.separator
-    } else {
-      let c: CGFloat = 230.0 / 255.0
-      borderLine.backgroundColor = UIColor(red: c, green: c, blue: c, alpha: 1.0)
-    }
+    borderLine.backgroundColor = UIColor.separator
     containerView.addSubview(borderLine)
 
     let tframe = CGRect(x: 0, y: 0, width: bframe.size.width, height: 40)
@@ -709,11 +706,7 @@ class MainViewController: UIViewController, TextViewDelegate, UIActionSheetDeleg
     textSizeTitle.backgroundColor = UIColor.clear
     textSizeTitle.text = String.init(format: NSLocalizedString("text-size-label", comment: ""), Int(textSize))
     textSizeTitle.textAlignment = .center
-    if #available(iOS 13.0, *) {
-      textSizeTitle.textColor = UIColor.secondaryLabel
-    } else {
-      textSizeTitle.textColor = UIColor.gray
-    }
+    textSizeTitle.textColor = UIColor.secondaryLabel
     textSizeTitle.font = textSizeTitle.font.withSize(14.0)
     containerView.addSubview(textSizeTitle)
 
diff --git a/ios/keyman/Keyman/Keyman/PackageBrowserViewController.swift b/ios/keyman/Keyman/Keyman/PackageBrowserViewController.swift
index c7d3904387..a26922adf5 100644
--- a/ios/keyman/Keyman/Keyman/PackageBrowserViewController.swift
+++ b/ios/keyman/Keyman/Keyman/PackageBrowserViewController.swift
@@ -33,13 +33,6 @@ class PackageBrowserViewController: UIDocumentPickerViewController, UIDocumentPi
                                      bundle: Bundle(for: Manager.self),
                                      comment: "")
 
-      if #available(iOS 13.0, *) {
-        // Easily dismissable without the extra button.
-      } else {
-        self.navigationItem.setLeftBarButton(
-          UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(self.doCancel)),
-          animated: true)
-      }
       self.modalPresentationStyle = .fullScreen
   }
 
diff --git a/ios/keyman/Keyman/SWKeyboard/KeyboardViewController.swift b/ios/keyman/Keyman/SWKeyboard/KeyboardViewController.swift
index be5ffb4e39..7d88af2f0b 100644
--- a/ios/keyman/Keyman/SWKeyboard/KeyboardViewController.swift
+++ b/ios/keyman/Keyman/SWKeyboard/KeyboardViewController.swift
@@ -81,28 +81,26 @@ class KeyboardViewController: InputViewController {
   override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
     super.traitCollectionDidChange(previousTraitCollection)
     guard let previousTraitCollection = previousTraitCollection else {return}
-    if #available(iOS 13.0, *) {
-      if previousTraitCollection.hasDifferentColorAppearance(comparedTo: traitCollection) {
-        /* Ensure that the keyboard banner image transitions!  Noting that the backing view isn't in the view hierarchy,
-         * and that manipulating said hierarchy is key for triggering the appearance change
-         * (see https://developer.apple.com/documentation/uikit/uiappearance)...
-         *
-         * We have to reload the banner's backing view to trigger the change.  Thanks, Apple.
-         * The only other alternative - creating a new instance of the view & its controller.
-         *
-         * With loadView, at least we can reuse the old instance, which would serve far better
-         * for engine API calls if we decide to let the base InputViewController perform UIView
-         * render functionality (as a KMEI offering) instead of having it only in our app.
-         * That said, note https://developer.apple.com/documentation/uikit/uiviewcontroller/1621454-loadview:
-         *
-         * > You should never call this method directly.
-         *
-         * Well... I wouldn't, if it weren't the only way to trigger this without requiring a new instance.
-         * We should be fine since we never place the banner's backing view into the actual hierarchy.
-         */
-        topBarImageSource.loadView()
-        setupTopBarImage(size: view.frame.size)
-      }
+    if previousTraitCollection.hasDifferentColorAppearance(comparedTo: traitCollection) {
+      /* Ensure that the keyboard banner image transitions!  Noting that the backing view isn't in the view hierarchy,
+       * and that manipulating said hierarchy is key for triggering the appearance change
+       * (see https://developer.apple.com/documentation/uikit/uiappearance)...
+       *
+       * We have to reload the banner's backing view to trigger the change.  Thanks, Apple.
+       * The only other alternative - creating a new instance of the view & its controller.
+       *
+       * With loadView, at least we can reuse the old instance, which would serve far better
+       * for engine API calls if we decide to let the base InputViewController perform UIView
+       * render functionality (as a KMEI offering) instead of having it only in our app.
+       * That said, note https://developer.apple.com/documentation/uikit/uiviewcontroller/1621454-loadview:
+       *
+       * > You should never call this method directly.
+       *
+       * Well... I wouldn't, if it weren't the only way to trigger this without requiring a new instance.
+       * We should be fine since we never place the banner's backing view into the actual hierarchy.
+       */
+      topBarImageSource.loadView()
+      setupTopBarImage(size: view.frame.size)
     }
   }
 }
diff --git a/ios/samples/KMSample1/KMSample1.xcodeproj/project.pbxproj b/ios/samples/KMSample1/KMSample1.xcodeproj/project.pbxproj
index e0fee90879..4dc0be980b 100644
--- a/ios/samples/KMSample1/KMSample1.xcodeproj/project.pbxproj
+++ b/ios/samples/KMSample1/KMSample1.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -296,7 +296,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
@@ -342,7 +342,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "";
 				SDKROOT = iphoneos;
@@ -365,7 +365,7 @@
 					"$(SRCROOT)/../../Carthage/Build/",
 				);
 				INFOPLIST_FILE = KMSample1/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -390,7 +390,7 @@
 					"$(SRCROOT)/../../Carthage/Build/",
 				);
 				INFOPLIST_FILE = KMSample1/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/ios/samples/KMSample2/KMSample2.xcodeproj/project.pbxproj b/ios/samples/KMSample2/KMSample2.xcodeproj/project.pbxproj
index 29443db1c7..63ddf79f56 100644
--- a/ios/samples/KMSample2/KMSample2.xcodeproj/project.pbxproj
+++ b/ios/samples/KMSample2/KMSample2.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -467,7 +467,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
@@ -518,7 +518,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_LDFLAGS = "";
 				SDKROOT = iphoneos;
@@ -540,7 +540,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = KMSample2/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -566,7 +566,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = KMSample2/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -593,7 +593,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = SWKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -619,7 +619,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = SWKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/ios/tools/KeyboardCalibrator/KeyboardCalibrator.xcodeproj/project.pbxproj b/ios/tools/KeyboardCalibrator/KeyboardCalibrator.xcodeproj/project.pbxproj
index 69426b2230..b4237a9938 100644
--- a/ios/tools/KeyboardCalibrator/KeyboardCalibrator.xcodeproj/project.pbxproj
+++ b/ios/tools/KeyboardCalibrator/KeyboardCalibrator.xcodeproj/project.pbxproj
@@ -390,7 +390,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WHE552KZN5;
 				INFOPLIST_FILE = CalibrationKbd/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -411,7 +411,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WHE552KZN5;
 				INFOPLIST_FILE = CalibrationKbd/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -546,9 +546,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = KeyboardCalibrator/KeyboardCalibrator.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = WHE552KZN5;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = KeyboardCalibrator/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -567,9 +567,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = KeyboardCalibrator/KeyboardCalibrator.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = WHE552KZN5;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = KeyboardCalibrator/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -589,7 +589,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WHE552KZN5;
 				INFOPLIST_FILE = DefaultKeyboardHostTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -611,7 +611,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WHE552KZN5;
 				INFOPLIST_FILE = DefaultKeyboardHostTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -632,6 +632,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WHE552KZN5;
 				INFOPLIST_FILE = DefaultKeyboardHostUITests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -652,6 +653,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WHE552KZN5;
 				INFOPLIST_FILE = DefaultKeyboardHostUITests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
diff --git a/linux/debian/control b/linux/debian/control
index 7e71df1b7b..aadc3dad09 100644
--- a/linux/debian/control
+++ b/linux/debian/control
@@ -42,7 +42,7 @@ Build-Depends:
  python3-xdg,
  xserver-xephyr,
  xvfb,
-Standards-Version: 4.7.0
+Standards-Version: 4.7.2
 Vcs-Git: https://github.com/keymanapp/keyman.git -b beta [linux/debian]
 Vcs-Browser: https://github.com/keymanapp/keyman/tree/beta/linux/debian
 Homepage: https://www.keyman.com
diff --git a/linux/ibus-keyman/src/KeymanSystemServiceClient.cpp b/linux/ibus-keyman/src/KeymanSystemServiceClient.cpp
index 928d929dd0..1c2867778e 100644
--- a/linux/ibus-keyman/src/KeymanSystemServiceClient.cpp
+++ b/linux/ibus-keyman/src/KeymanSystemServiceClient.cpp
@@ -17,32 +17,42 @@ class KeymanSystemServiceClient {
 private:
   sd_bus_message *msg = NULL;
   sd_bus *bus         = NULL;
+  bool initialized    = false;
 
 public:
   KeymanSystemServiceClient();
   ~KeymanSystemServiceClient();
 
+  void Init();
+  bool IsInitialized() { return initialized; }
+
   void SetCapsLockIndicator(guint32 capsLock);
   gint32 GetCapsLockIndicator();
   void CallOrderedOutputSentinel();
   void Ping();
 };
 
+static KeymanSystemServiceClient _KeymanSystemServiceClient;
+
 KeymanSystemServiceClient::KeymanSystemServiceClient() {
+}
+
+KeymanSystemServiceClient::~KeymanSystemServiceClient() {
+  if (msg)   { sd_bus_message_unref(msg); }
+  if (bus)   { sd_bus_unref(bus); }
+}
+
+void KeymanSystemServiceClient::Init() {
   int result;
   if (testing) {
-    result = sd_bus_open_user(&bus);
+    result = sd_bus_default(&bus);
   } else {
     result = sd_bus_default_system(&bus);
   }
   if (result < 0) {
     g_error("%s: Can't get connection: %s", __FUNCTION__, strerror(-result));
   }
-}
-
-KeymanSystemServiceClient::~KeymanSystemServiceClient() {
-  if (msg)   { sd_bus_message_unref(msg); }
-  if (bus)   { sd_bus_unref(bus); }
+  initialized = true;
 }
 
 void KeymanSystemServiceClient::SetCapsLockIndicator(guint32 capsLock) {
@@ -51,14 +61,9 @@ void KeymanSystemServiceClient::SetCapsLockIndicator(guint32 capsLock) {
     return;
   }
 
-  if (capsLock > 1) {
-    g_error("%s: Invalid value '%d' for parameter capsLock", __FUNCTION__, capsLock);
-    return;
-  }
-
   sd_bus_error *error = NULL;
   int result = sd_bus_call_method(bus, KEYMAN_BUS_NAME, KEYMAN_OBJECT_PATH,
-    KEYMAN_INTERFACE_NAME, "SetCapsLockIndicator", error, &msg, "b", capsLock);
+    KEYMAN_INTERFACE_NAME, "SetCapsLockIndicator", error, &msg, "b", capsLock != 0);
   if (result < 0) {
     g_error("%s: Failed to call method SetCapsLockIndicator: %s. %s. %s.",
       __FUNCTION__, strerror(-result), error ? error->name : "-", error ? error->message : "-");
@@ -129,27 +134,31 @@ void KeymanSystemServiceClient::Ping() {
   }
 }
 
+void initialize_keyman_system_service_client() {
+  if (!_KeymanSystemServiceClient.IsInitialized()) {
+    _KeymanSystemServiceClient.Init();
+  }
+}
+
 void
 set_capslock_indicator(guint32 capsLock) {
-  KeymanSystemServiceClient client;
-  client.SetCapsLockIndicator(capsLock);
+  assert(_KeymanSystemServiceClient.IsInitialized());
+  _KeymanSystemServiceClient.SetCapsLockIndicator(capsLock);
 }
 
 gint32 get_capslock_indicator() {
-  KeymanSystemServiceClient client;
-  return client.GetCapsLockIndicator();
+  assert(_KeymanSystemServiceClient.IsInitialized());
+  return _KeymanSystemServiceClient.GetCapsLockIndicator();
 }
 
 void
 call_ordered_output_sentinel() {
-  g_message("%s: Calling order output sentinel on keyman-system-service", __FUNCTION__);
-  KeymanSystemServiceClient client;
-  client.CallOrderedOutputSentinel();
+  assert(_KeymanSystemServiceClient.IsInitialized());
+  _KeymanSystemServiceClient.CallOrderedOutputSentinel();
 }
 
 void
 ping_keyman_system_service() {
-  g_message("%s: Pinging keyman-system-service", __FUNCTION__);
-  KeymanSystemServiceClient client;
-  client.Ping();
+  assert(_KeymanSystemServiceClient.IsInitialized());
+  _KeymanSystemServiceClient.Ping();
 }
diff --git a/linux/ibus-keyman/src/KeymanSystemServiceClient.h b/linux/ibus-keyman/src/KeymanSystemServiceClient.h
index a10cab4717..d963600fa5 100644
--- a/linux/ibus-keyman/src/KeymanSystemServiceClient.h
+++ b/linux/ibus-keyman/src/KeymanSystemServiceClient.h
@@ -7,6 +7,7 @@
 extern "C" {
 #endif
 
+void initialize_keyman_system_service_client();
 void set_capslock_indicator(guint32 capsLockState);
 gint32 get_capslock_indicator();
 void call_ordered_output_sentinel();
diff --git a/linux/ibus-keyman/src/engine.c b/linux/ibus-keyman/src/engine.c
index c4511ee3b2..5f582659fe 100644
--- a/linux/ibus-keyman/src/engine.c
+++ b/linux/ibus-keyman/src/engine.c
@@ -50,7 +50,10 @@
 #define KEYMAN_LALT   56 // 0x38
 #define KEYMAN_RCTRL  97 // 0x61
 #define KEYMAN_RALT  100 // 0x64
-#define KEYMAN_F24_KEYCODE_OUTPUT_SENTINEL  194 // 0xC2
+
+// 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;
@@ -305,6 +308,7 @@ ibus_keyman_engine_init(IBusKeymanEngine *keyman) {
   ibus_prop_list_append(keyman->prop_list, keyman->status_prop);
 
   keyman->state = NULL;
+  initialize_keyman_system_service_client();
 }
 
 static km_core_cu* get_base_layout()
@@ -641,17 +645,18 @@ process_output_action(IBusEngine *engine, const km_core_usv* output_utf32) {
   IBusKeymanEngine *keyman = (IBusKeymanEngine *)engine;
   gchar *output_utf8 = g_ucs4_to_utf8(output_utf32, -1, NULL, NULL, NULL);
   g_autofree gchar *debug  = NULL;
-  if (!client_supports_surrounding_text(engine)) {
+
+  if (client_supports_surrounding_text(engine)) {
+    // compliant app
+    g_message("%s: compliant app: Outputing %s", __FUNCTION__, debug = debug_utf8_with_codepoints(output_utf8));
+    commit_string(keyman, output_utf8);
+    g_free(output_utf8);
+  } else {
     // non-compliant app
-    g_message("%s: Adding to commit queue: %s", __FUNCTION__, debug = debug_utf8_with_codepoints(output_utf8));
+    g_message("%s: non-compliant app: Adding to commit queue: %s", __FUNCTION__, debug = debug_utf8_with_codepoints(output_utf8));
     g_assert(keyman->commit_item->char_buffer == NULL);
     keyman->commit_item->char_buffer = output_utf8;
     // don't free output_utf8 - assigned to char_buffer!
-  } else {
-    // compliant app
-    g_message("%s: Outputing %s", __FUNCTION__, debug = debug_utf8_with_codepoints(output_utf8));
-    commit_string(keyman, output_utf8);
-    g_free(output_utf8);
   }
 }
 
@@ -843,6 +848,7 @@ ibus_keyman_engine_process_key_event(
   // This keycode is a fake keycode that we send when it's time to commit the text, ensuring the
   // correct output order of backspace and text.
   if (!client_supports_surrounding_text(engine) && keycode == KEYMAN_F24_KEYCODE_OUTPUT_SENTINEL) {
+    // non-compliant app
     if (!isKeyDown) {
       g_message("%s: got F24 Sentinel, ignore keyup", __FUNCTION__);
       return TRUE;
diff --git a/linux/ibus-keyman/src/test/run-tests.sh b/linux/ibus-keyman/src/test/run-tests.sh
index ae005fcbd6..8161797360 100755
--- a/linux/ibus-keyman/src/test/run-tests.sh
+++ b/linux/ibus-keyman/src/test/run-tests.sh
@@ -15,6 +15,7 @@ fi
 
 if ! which Xvfb > /dev/null || ! which Xephyr > /dev/null || ! which metacity > /dev/null; then
   echo "# Please install Xvfb, Xephyr and metacity before running these tests!"
+  echo "# sudo apt install xvfb xserver-xephyr metacity"
   exit 1
 fi
 
diff --git a/linux/ibus-keyman/tests/DbusTestHelper.cpp b/linux/ibus-keyman/tests/DbusTestHelper.cpp
new file mode 100644
index 0000000000..a657055eeb
--- /dev/null
+++ b/linux/ibus-keyman/tests/DbusTestHelper.cpp
@@ -0,0 +1,50 @@
+#include "config.h"
+#include <glib-object.h>
+#include <glib.h>
+#include <kmx/kmx_processevent.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;
+
+static int32_t on_send_sentinel(sd_bus_message* msg, void* user_data, sd_bus_error* ret_error) {
+  auto fixture = (IBusKeymanTestsFixture*)user_data;
+  km::tests::key_event key_event({KEYMAN_F24_KEYCODE_OUTPUT_SENTINEL, 0});
+  press_key(fixture, key_event);
+  return 1;
+}
+
+void dbus_testhelper_init(IBusKeymanTestsFixture* fixture) {
+  int result = sd_bus_open_user(&bus);
+  g_assert_cmpint(result, >=, 0);
+
+  result = sd_bus_match_signal(
+      bus, NULL, KEYMAN_TESTHELPER_BUS_NAME, KEYMAN_TESTHELPER_OBJECT_PATH,
+      KEYMAN_TESTHELPER_INTERFACE_NAME, "SendSentinel",
+      on_send_sentinel, fixture);
+
+  source = EventSource::Create(bus);
+}
+
+void dbus_testhelper_close() {
+  if (source) {
+    EventSource::Destroy(source);
+    source = NULL;
+  }
+
+  if (bus) {
+    sd_bus_release_name(bus, KEYMAN_TESTHELPER_BUS_NAME);
+    sd_bus_unref(bus);
+    bus = NULL;
+  }
+}
diff --git a/linux/ibus-keyman/tests/DbusTestHelper.h b/linux/ibus-keyman/tests/DbusTestHelper.h
new file mode 100644
index 0000000000..8420e2a049
--- /dev/null
+++ b/linux/ibus-keyman/tests/DbusTestHelper.h
@@ -0,0 +1,23 @@
+#ifndef __DBUSTESTHELPER_H__
+#define __DBUSTESTHELPER_H__
+
+#include "config.h"
+#if DBUS_IMPLEMENTATION == SYSTEMD
+#include <systemd/sd-bus.h>
+#else
+#include <basu/sd-bus.h>
+#endif
+#include "testfixture.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void dbus_testhelper_init(IBusKeymanTestsFixture* fixture);
+void dbus_testhelper_close();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __DBUSTESTHELPER_H__
diff --git a/linux/ibus-keyman/tests/EventSource.cpp b/linux/ibus-keyman/tests/EventSource.cpp
new file mode 100644
index 0000000000..ed550bf297
--- /dev/null
+++ b/linux/ibus-keyman/tests/EventSource.cpp
@@ -0,0 +1,55 @@
+#include "EventSource.h"
+
+GSourceFuncs sourceFuncs = {
+    /* prepare */
+    [](GSource*, int* timeout) -> gboolean {
+      *timeout = 10 /*ms*/;
+      return FALSE;
+    },
+    /* check */
+    [](GSource* gsource) -> gboolean {
+      EventSource* source = (EventSource*)gsource;
+      return source->Check();
+    },
+    /* dispatch */
+    [](GSource* gsource, GSourceFunc, gpointer) -> gboolean {
+      EventSource* source = (EventSource*)gsource;
+      return source->Dispatch();
+    },
+    /* finalize */
+    [](GSource*) {},
+    nullptr,
+    nullptr,
+};
+
+EventSource* EventSource::Create(sd_bus* bus) {
+  EventSource* source = (EventSource*)g_source_new(&sourceFuncs, sizeof(EventSource));
+
+  source->bus           = bus;
+  source->pollFd.fd     = sd_bus_get_fd(bus);
+  source->pollFd.events = G_IO_IN | G_IO_HUP | G_IO_ERR;
+
+  g_source_add_poll(&source->base, &source->pollFd);
+  g_source_attach(&source->base, g_main_context_default());
+
+  return source;
+}
+
+void EventSource::Destroy(EventSource* source) {
+  g_source_remove_poll(&source->base, &source->pollFd);
+  g_source_destroy(&source->base);
+  g_source_unref(&source->base);
+}
+
+gboolean EventSource::Check() const {
+  return pollFd.revents & (G_IO_IN | G_IO_HUP | G_IO_ERR);
+}
+
+gboolean EventSource::Dispatch() {
+  int result;
+  do {
+    result = sd_bus_process(bus, nullptr);
+  } while (result > 0);
+
+  return result >= 0;
+}
diff --git a/linux/ibus-keyman/tests/EventSource.h b/linux/ibus-keyman/tests/EventSource.h
new file mode 100644
index 0000000000..877c02880a
--- /dev/null
+++ b/linux/ibus-keyman/tests/EventSource.h
@@ -0,0 +1,27 @@
+#ifndef __EVENTSOURCE_H__
+#define __EVENTSOURCE_H__
+
+#include "config.h"
+#include <glib.h>
+#if DBUS_IMPLEMENTATION == SYSTEMD
+#include <systemd/sd-bus.h>
+#else
+#include <basu/sd-bus.h>
+#endif
+
+// An event source used to poll sd-bus for messages
+class EventSource {
+public:
+  static EventSource* Create(sd_bus* bus);
+  static void Destroy(EventSource* source);
+
+  gboolean Check() const;
+  gboolean Dispatch();
+
+private:
+  GSource base;
+  GPollFD pollFd;
+  sd_bus* bus;
+};
+
+#endif // __EVENTSOURCE_H__
diff --git a/linux/ibus-keyman/tests/KeyHandling.cpp b/linux/ibus-keyman/tests/KeyHandling.cpp
new file mode 100644
index 0000000000..7404692c57
--- /dev/null
+++ b/linux/ibus-keyman/tests/KeyHandling.cpp
@@ -0,0 +1,167 @@
+#include <kmx/kmx_processevent.h>
+#include <linux/input-event-codes.h>
+#include <list>
+#include <stack>
+#include "keycodes.h"
+#include "KeymanSystemServiceClient.h"
+#include "testfixture.h"
+#include "KeyHandling.h"
+
+#define KEYMAN_LCTRL 29  // 0x1D
+#define KEYMAN_LALT 56   // 0x38
+#define KEYMAN_RCTRL 97  // 0x61
+#define KEYMAN_RALT 100  // 0x64
+
+extern GdkWindow* window;
+
+typedef struct {
+  guint modifiers_keydown;
+  guint modifiers_keyup;
+  guint keyval;
+  guint16 keycode;
+  guint is_modifier;
+} gdk_key_event;
+
+static gdk_key_event get_key_event_for_modifier(guint modifier, guint& prev_modifiers, guint keyval, guint keycode) {
+  gdk_key_event event;
+  event.modifiers_keydown = prev_modifiers;
+  event.modifiers_keyup   = prev_modifiers | modifier | IBUS_RELEASE_MASK;
+  prev_modifiers |= modifier;
+  event.keyval      = keyval;
+  event.keycode     = keycode;
+  event.is_modifier = 1;
+  return event;
+}
+
+static unsigned short vk_to_keycode(unsigned short vk) {
+  for (int i = 0; i < (int)sizeof(keycode_to_vk); i++) {
+    if (keycode_to_vk[i] == vk)
+      return i;
+  }
+  return -1;
+}
+
+static bool is_modifier(guint16 keycode) {
+  switch (keycode) {
+  case KEY_LEFTSHIFT:
+  case KEY_RIGHTSHIFT:
+  case KEY_LEFTALT:
+  case KEY_RIGHTALT:
+  case KEY_LEFTCTRL:
+  case KEY_RIGHTCTRL:
+  case KEY_CAPSLOCK:
+    return true;
+  }
+  return false;
+}
+
+static std::list<gdk_key_event> get_involved_keys(km::tests::key_event test_event) {
+  guint modifiers = 0;
+  if (get_capslock_indicator()) {
+    modifiers = IBUS_LOCK_MASK;
+  }
+
+  std::list<gdk_key_event> result;
+  if (test_event.vk == KEYMAN_F24_KEYCODE_OUTPUT_SENTINEL) {
+    gdk_key_event event;
+    event.modifiers_keydown = modifiers;
+    event.modifiers_keyup   = modifiers | IBUS_RELEASE_MASK;
+    event.keyval            = 0;
+    event.keycode           = KEYMAN_F24_KEYCODE_OUTPUT_SENTINEL;
+    event.is_modifier       = is_modifier(event.keycode);
+    result.push_back(event);
+
+    return result;
+  }
+
+  // process all modifiers
+  if (test_event.modifier_state & KM_CORE_MODIFIER_SHIFT) {
+    // we don't distinguish between R and L Shift
+    result.push_back(get_key_event_for_modifier(IBUS_SHIFT_MASK, modifiers, GDK_KEY_Shift_L, KEY_LEFTSHIFT));
+  }
+  if (test_event.modifier_state & KM_CORE_MODIFIER_ALT || test_event.modifier_state & KM_CORE_MODIFIER_LALT) {
+    result.push_back(get_key_event_for_modifier(IBUS_MOD1_MASK, modifiers, GDK_KEY_Alt_L, KEY_LEFTALT));
+  }
+  if (test_event.modifier_state & KM_CORE_MODIFIER_RALT) {
+    if (test_event.vk == KEYMAN_RALT)
+      result.push_back(get_key_event_for_modifier(IBUS_MOD1_MASK, modifiers, GDK_KEY_Alt_R, KEY_RIGHTALT));
+    else
+      result.push_back(get_key_event_for_modifier(IBUS_MOD5_MASK, modifiers, GDK_KEY_Alt_R, KEY_RIGHTALT));
+  }
+  if (test_event.modifier_state & KM_CORE_MODIFIER_CTRL || test_event.modifier_state & KM_CORE_MODIFIER_LCTRL) {
+    result.push_back(get_key_event_for_modifier(IBUS_CONTROL_MASK, modifiers, GDK_KEY_Control_L, KEY_LEFTCTRL));
+  }
+  if (test_event.modifier_state & KM_CORE_MODIFIER_RCTRL) {
+    result.push_back(get_key_event_for_modifier(IBUS_CONTROL_MASK, modifiers, GDK_KEY_Control_R, KEY_RIGHTCTRL));
+  }
+
+  // process key
+  guint keyval = (test_event.modifier_state & KM_CORE_MODIFIER_SHIFT) ? gdk_keyval_to_upper(test_event.vk)
+                                                                      : gdk_keyval_to_lower(test_event.vk);
+
+  // REVIEW: the keyval we use here are not correct for < 0x20 and >= 0x7f
+  // See /usr/include/X11/keysymdef.h and /usr/include/ibus-1.0/ibuskeysyms.h
+  // Currently this is not a problem because we don't use keyval, but if that ever changes we
+  // should be aware that our test behaves different than the real client.
+
+  gdk_key_event event;
+  event.modifiers_keydown = modifiers;
+  event.modifiers_keyup   = modifiers | IBUS_RELEASE_MASK;
+  event.keyval            = keyval;
+  event.keycode           = vk_to_keycode(test_event.vk);
+  event.is_modifier       = is_modifier(event.keycode);
+  result.push_back(event);
+
+  return result;
+}
+
+void press_key(IBusKeymanTestsFixture* fixture, km::tests::key_event key_event) {
+  auto involved_keys = get_involved_keys(key_event);
+
+  // press and hold the individual modifier keys, finally the actual key
+  std::stack<GdkEventKey> keys_to_release;
+  for (auto key = involved_keys.begin(); key != involved_keys.end(); key++) {
+    bool old_caps_lock  = get_capslock_indicator();
+    guint lock_modifier = 0;
+
+    // KEY_CAPSLOCK behaves a bit strange:
+    // If capslock is off:
+    // - on keypress we turn on capslock, but the modifier is still not set.
+    // - The LOCK_MASK modifier gets set on release.
+    // When capslock is already on:
+    // - the LOCK_MASK modifier is set on both keypress and release
+    // - capslock gets turned off on release
+    if (key->keycode == KEY_CAPSLOCK && !old_caps_lock) {
+      set_capslock_indicator((guint32) true);
+      lock_modifier = IBUS_LOCK_MASK;
+    }
+    GdkEventKey keyEvent = {
+        .type             = GDK_KEY_PRESS,
+        .window           = window,
+        .send_event       = 0,
+        .time             = 0,
+        .state            = key->modifiers_keydown,
+        .keyval           = key->keyval,
+        .length           = 0,
+        .string           = NULL,
+        .hardware_keycode = key->keycode,
+        .group            = 0,
+        .is_modifier      = key->is_modifier};
+    gtk_im_context_filter_keypress(fixture->context, &keyEvent);
+
+    keyEvent.type  = GDK_KEY_RELEASE;
+    keyEvent.state = key->modifiers_keyup | lock_modifier;
+    keys_to_release.push(keyEvent);
+
+    if (key->keycode == KEY_CAPSLOCK && old_caps_lock) {
+      set_capslock_indicator((guint32) false);
+    }
+  }
+
+  // then release the keys in reverse order
+  while (!keys_to_release.empty()) {
+    auto keyEvent = keys_to_release.top();
+    gtk_im_context_filter_keypress(fixture->context, &keyEvent);
+    keys_to_release.pop();
+  }
+}
diff --git a/linux/ibus-keyman/tests/KeyHandling.h b/linux/ibus-keyman/tests/KeyHandling.h
new file mode 100644
index 0000000000..c342b4a6ac
--- /dev/null
+++ b/linux/ibus-keyman/tests/KeyHandling.h
@@ -0,0 +1,22 @@
+#ifndef __KEYHANDLING_H__
+#define __KEYHANDLING_H__
+
+#include "kmx_test_source.hpp"
+#include "testfixture.h"
+
+typedef struct {
+  IBusKeymanTestsFixture* fixture;
+  km::tests::key_event key_event;
+} KeyPressData;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void press_key(IBusKeymanTestsFixture* fixture, km::tests::key_event key_event);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // __KEYHANDLING_H__
diff --git a/linux/ibus-keyman/tests/README.md b/linux/ibus-keyman/tests/README.md
index a97f85d443..8882bcae00 100644
--- a/linux/ibus-keyman/tests/README.md
+++ b/linux/ibus-keyman/tests/README.md
@@ -24,3 +24,26 @@ To run a single test you pass the testname (as found in
 ```bash
 scripts/run-tests.sh -- k_000___null_keyboard k_005___nul_with_initial_context
 ```
+
+## Debugging tests
+
+This is most easily done by running the tests in a VM and then remote debugging
+into the VM. The VM should be the same Linux version as the host, and the
+Keyman repo should be shared with the VM through a shared folder.
+
+Then you can start the `run-tests.sh` script on the VM with the
+`--remote-debug` option. This will start the background services and then
+start a GDB session waiting for the debugger to connect.
+
+For example:
+
+```bash
+linux/ibus-keyman/tests/scripts/run-tests.sh --remote-debug \
+  --no-surrounding-text --no-wayland -- k_001___basic_input_unicodei
+```
+
+On the host, you can then attach to the VM. See the
+`Attach to gdbserver (ibus-keyman integration tests)` configuration
+in `docs/settings/linux/launch.json` for a sample configuration in
+vscode. You'll have to adjust the IP address to match the VM which the
+`run-tests.sh` script will output.
diff --git a/linux/ibus-keyman/tests/KmDbusTestServer.cpp b/linux/ibus-keyman/tests/dbus-test-server/KmDbusTestServer.cpp
similarity index 84%
rename from linux/ibus-keyman/tests/KmDbusTestServer.cpp
rename to linux/ibus-keyman/tests/dbus-test-server/KmDbusTestServer.cpp
index fda2a12c00..80ae444185 100644
--- a/linux/ibus-keyman/tests/KmDbusTestServer.cpp
+++ b/linux/ibus-keyman/tests/dbus-test-server/KmDbusTestServer.cpp
@@ -10,23 +10,21 @@
 #include <basu/sd-bus.h>
 #endif
 
+#include "KmDbusTestServer.h"
+
 #ifndef KEYMAN_TEST_SERVICE_PATH
 #warning KEYMAN_TEST_SERVICE_PATH is undefined
 #define KEYMAN_TEST_SERVICE_PATH "."
 #endif
 
-#define KEYMAN_TESTSVC_BUS_NAME "com.keyman.ExitTestService"
-#define KEYMAN_TESTSVC_INTERFACE_NAME "com.keyman.ExitTestService.Exit"
-#define KEYMAN_TESTSVC_OBJECT_PATH "/com/keyman/ExitTestService/Exit"
-
 using namespace std;
 
 class KmDbusTestServer
 {
-private:
+public:
   GTestDBus *dbus;
-  sd_bus_slot *slot = NULL;
   sd_bus *bus       = NULL;
+  gboolean exitFlag = FALSE;
 
 public:
   KmDbusTestServer();
@@ -38,13 +36,16 @@ public:
 static int32_t
 on_exit_method(sd_bus_message *msg, void *user_data, sd_bus_error *ret_error) {
   g_debug("%s called", __FUNCTION__);
-  guint *exitFlag = (guint *)user_data;
-  *exitFlag       = TRUE;
+  KmDbusTestServer* server = (KmDbusTestServer*)user_data;
+
+  *ret_error = SD_BUS_ERROR_NULL;
+
+  server->exitFlag = TRUE;
 
   return sd_bus_reply_method_return(msg, "");
 }
 
-static const sd_bus_vtable exit_test_service_vtable[] = {
+static const sd_bus_vtable test_service_vtable[] = {
   SD_BUS_VTABLE_START(0),
     SD_BUS_METHOD("Exit", "", "", on_exit_method, 0),
   SD_BUS_VTABLE_END
@@ -76,9 +77,8 @@ KmDbusTestServer::KmDbusTestServer()
 
 KmDbusTestServer::~KmDbusTestServer()
 {
-  if (bus)  sd_bus_release_name(bus, KEYMAN_TESTSVC_BUS_NAME);
-  if (slot) sd_bus_slot_unref(slot);
   if (bus) {
+    sd_bus_release_name(bus, KEYMAN_TESTSVC_BUS_NAME);
     sd_bus_close(bus);
     sd_bus_unref(bus);
   }
@@ -101,8 +101,8 @@ void KmDbusTestServer::Loop()
   guint exitFlag = FALSE;
 
   // Install the object
-  ret = sd_bus_add_object_vtable(bus, &slot, KEYMAN_TESTSVC_OBJECT_PATH,
-    KEYMAN_TESTSVC_INTERFACE_NAME, exit_test_service_vtable, &exitFlag);
+  ret = sd_bus_add_object_vtable(bus, NULL, KEYMAN_TESTSVC_OBJECT_PATH,
+    KEYMAN_TESTSVC_INTERFACE_NAME, test_service_vtable, &exitFlag);
   if (ret < 0) {
     g_error("Failed to issue method call: %s", strerror(-ret));
     return;
diff --git a/linux/ibus-keyman/tests/dbus-test-server/KmDbusTestServer.h b/linux/ibus-keyman/tests/dbus-test-server/KmDbusTestServer.h
new file mode 100644
index 0000000000..3851a32643
--- /dev/null
+++ b/linux/ibus-keyman/tests/dbus-test-server/KmDbusTestServer.h
@@ -0,0 +1,8 @@
+#ifndef __KMDBUSTESTSERVER_H__
+#define __KMDBUSTESTSERVER_H__
+
+#define KEYMAN_TESTSVC_BUS_NAME "com.keyman.ExitTestService"
+#define KEYMAN_TESTSVC_OBJECT_PATH "/com/keyman/ExitTestService/Exit"
+#define KEYMAN_TESTSVC_INTERFACE_NAME "com.keyman.ExitTestService.Exit"
+
+#endif // __KMDBUSTESTSERVER_H__
diff --git a/linux/ibus-keyman/tests/StopTestServer.cpp b/linux/ibus-keyman/tests/dbus-test-server/StopTestServer.cpp
similarity index 88%
rename from linux/ibus-keyman/tests/StopTestServer.cpp
rename to linux/ibus-keyman/tests/dbus-test-server/StopTestServer.cpp
index 2790e5b30e..422a7afe43 100644
--- a/linux/ibus-keyman/tests/StopTestServer.cpp
+++ b/linux/ibus-keyman/tests/dbus-test-server/StopTestServer.cpp
@@ -8,6 +8,7 @@
 #else
 #include <basu/sd-bus.h>
 #endif
+#include "KmDbusTestServer.h"
 
 using namespace std;
 
@@ -46,8 +47,8 @@ int StopTestServer::Run()
     return 1;
   }
 
-  result = sd_bus_call_method(bus, "com.keyman.ExitTestService",
-    "/com/keyman/ExitTestService/Exit", "com.keyman.ExitTestService.Exit",
+  result = sd_bus_call_method(bus, KEYMAN_TESTSVC_BUS_NAME,
+    KEYMAN_TESTSVC_OBJECT_PATH, KEYMAN_TESTSVC_INTERFACE_NAME,
     "Exit", error, &msg, "");
   if (result < 0) {
     std::cerr << "Failed to issue method call: " << strerror(-result) << std::endl;
diff --git a/linux/ibus-keyman/tests/dbus-test-server/meson.build b/linux/ibus-keyman/tests/dbus-test-server/meson.build
new file mode 100644
index 0000000000..e679d65285
--- /dev/null
+++ b/linux/ibus-keyman/tests/dbus-test-server/meson.build
@@ -0,0 +1,18 @@
+system_service_dir = meson.global_source_root() / '../keyman-system-service/build' / build_machine.cpu_family() / get_option('buildtype') / 'tests/services'
+
+dbus_test_server = executable(
+  'km-dbus-test-server',
+  'KmDbusTestServer.cpp',
+  dependencies: dbus_deps,
+  include_directories: ['../..'],
+  cpp_args: [
+  '-DKEYMAN_TEST_SERVICE_PATH="' + system_service_dir + '"'
+ ]
+)
+
+stop_test_server = executable(
+  'stop-test-server',
+  'StopTestServer.cpp',
+  dependencies: dbus_deps,
+  include_directories: ['../..'],
+)
diff --git a/linux/ibus-keyman/tests/ibusimcontext.c b/linux/ibus-keyman/tests/ibusimcontext.c
index d3181727ce..b4ee9463e5 100644
--- a/linux/ibus-keyman/tests/ibusimcontext.c
+++ b/linux/ibus-keyman/tests/ibusimcontext.c
@@ -434,19 +434,21 @@ ibus_im_context_finalize(GObject *obj) {
 }
 
 static gboolean
-ibus_im_context_filter_keypress(GtkIMContext *context, GdkEventKey *event) {
+ibus_im_context_filter_keypress(GtkIMContext* context, GdkEventKey* event) {
   IDEBUG("%s", __FUNCTION__);
 
   IBusIMContext *ibusimcontext = IBUS_IM_CONTEXT(context);
 
-  if (event->state & IBUS_HANDLED_MASK)
+  if (event->state & IBUS_HANDLED_MASK) {
     return TRUE;
+  }
 
   /* Do not call gtk_im_context_filter_keypress() because
    * gtk_im_context_simple_filter_keypress() binds Ctrl-Shift-u
    */
-  if (event->state & IBUS_IGNORED_MASK)
+  if (event->state & IBUS_IGNORED_MASK) {
     return ibus_im_context_commit_event(ibusimcontext, event);
+  }
 
   /* XXX it is a workaround for some applications do not set client
    * window. */
@@ -1008,7 +1010,7 @@ _run_main_loop_with_timeout(IBusIMContext *ibusimcontext) {
   timeout_data data;
   data.thread_loop = ibusimcontext->thread_loop;
   data.timed_out   = FALSE;
-  int timeout_id   = g_timeout_add(1000 /*ms*/, (GSourceFunc)_timeout_callback, &data);
+  int timeout_id   = g_timeout_add(10 /*ms*/, (GSourceFunc)_timeout_callback, &data);
   g_main_loop_run(ibusimcontext->thread_loop);
   if (!data.timed_out) {
     g_source_remove(timeout_id);
@@ -1067,7 +1069,6 @@ _create_input_context(IBusIMContext *ibusimcontext) {
     if (!g_queue_is_empty(ibusimcontext->events_queue)) {
       GdkEventKey *event;
       while ((event = g_queue_pop_head(ibusimcontext->events_queue))) {
-        _process_key_event(context, event, ibusimcontext);
         gboolean result = _process_key_event(context, event, ibusimcontext);
         if (result) {
           _run_main_loop_with_timeout(ibusimcontext);
@@ -1081,6 +1082,7 @@ _create_input_context(IBusIMContext *ibusimcontext) {
 void
 ibus_im_test_set_thread_loop(IBusIMContext *context, GMainLoop *loop) {
   context->thread_loop = loop;
+  _run_main_loop_with_timeout(context);
 }
 
 void
diff --git a/linux/ibus-keyman/tests/meson.build b/linux/ibus-keyman/tests/meson.build
index 6e3c4355a4..22f16ef975 100644
--- a/linux/ibus-keyman/tests/meson.build
+++ b/linux/ibus-keyman/tests/meson.build
@@ -1,5 +1,8 @@
 test_files = [
+  'DbusTestHelper.cpp',
+  'EventSource.cpp',
   'ibusimcontext.c',
+  'KeyHandling.cpp',
   'testfixture.cpp',
   'testmodule.c',
   '../src/KeymanSystemServiceClient.cpp',
@@ -34,24 +37,7 @@ test_exe = executable(
   include_directories: test_include_dirs,
 )
 
-system_service_dir = meson.current_source_dir() / '../../keyman-system-service/build' / build_machine.cpu_family() / get_option('buildtype') / 'tests/services'
-
-dbus_test_server = executable(
-  'km-dbus-test-server',
-  'KmDbusTestServer.cpp',
-  dependencies: dbus_deps,
-  include_directories: ['..'],
-  cpp_args: [
-  '-DKEYMAN_TEST_SERVICE_PATH="' + system_service_dir + '"'
- ]
-)
-
-stop_test_server = executable(
-  'stop-test-server',
-  'StopTestServer.cpp',
-  dependencies: dbus_deps,
-  include_directories: ['..'],
-)
+subdir('dbus-test-server')
 
 env_file = '/tmp/env.txt'
 cleanup_file = '/tmp/ibus-keyman-test-pids'
@@ -66,104 +52,103 @@ find_tests = find_program('find-tests.sh', dirs: [meson.current_source_dir() / '
 mutter = find_program('mutter', required: false, version: '>=40')
 can_build_wayland = mutter.found()
 
-# TODO: re-enable and fix test setup
-# test(
-#   'setup-x11',
-#   setup_tests,
-#   args: ['--x11', env_file, cleanup_file, pid_file],
-#   env: test_env,
-#   priority: -10,
-#   is_parallel: false,
-#   protocol: 'exitcode'
-# )
+test(
+  'setup-x11',
+  setup_tests,
+  args: ['--x11', env_file, cleanup_file, pid_file],
+  env: test_env,
+  priority: -10,
+  is_parallel: false,
+  protocol: 'exitcode'
+)
 
-# test(
-#   'teardown-x11',
-#   teardown_tests,
-#   args: [cleanup_file],
-#   priority: -19,
-#   is_parallel: false,
-#   protocol: 'exitcode'
-# )
+test(
+  'teardown-x11',
+  teardown_tests,
+  args: [cleanup_file],
+  priority: -19,
+  is_parallel: false,
+  protocol: 'exitcode'
+)
 
-# if can_build_wayland
-#   test(
-#     'setup-wayland',
-#     setup_tests,
-#     args: ['--wayland', env_file, cleanup_file, pid_file],
-#     env: test_env,
-#     priority: -20,
-#     is_parallel: false,
-#     protocol: 'exitcode'
-#   )
+if can_build_wayland
+  test(
+    'setup-wayland',
+    setup_tests,
+    args: ['--wayland', env_file, cleanup_file, pid_file],
+    env: test_env,
+    priority: -20,
+    is_parallel: false,
+    protocol: 'exitcode'
+  )
 
-#   test(
-#     'teardown-wayland',
-#     teardown_tests,
-#     args: [cleanup_file],
-#     priority: -29,
-#     is_parallel: false,
-#     protocol: 'exitcode'
-#   )
-# endif
+  test(
+    'teardown-wayland',
+    teardown_tests,
+    args: [cleanup_file],
+    priority: -29,
+    is_parallel: false,
+    protocol: 'exitcode'
+  )
+endif
 
-# kmxtest_files = run_command(
-#   find_tests,
-#   [ common_dir / 'test/keyboards/baseline' ],
-#   check: true,
-# ).stdout().split('\n')
+kmxtest_files = run_command(
+  find_tests,
+  [ common_dir / 'test/keyboards/baseline' ],
+  check: true,
+).stdout().split('\n')
 
-# foreach kmx: kmxtest_files
-#   filename = kmx.split('\t')
-#   if filename[0] == ''
-#     continue
-#   endif
-#   testname = filename[1].split('.kmx')[0]
-#   test_args = [ '--tap', '-k', '--env', env_file, '--cleanup', cleanup_file, '--check', pid_file, '--', filename]
-#   test(
-#     'X11-' + testname + '__surrounding-text',
-#     run_test,
-#     args: [ '--testname', testname, '--x11', '--surrounding-text', test_args],
-#     env: test_env,
-#     depends: [test_exe],
-#     priority: -11,
-#     is_parallel: false,
-#     timeout: 120,
-#     protocol: 'tap',
-#   )
-#   test(
-#     'X11-' + testname + '__no-surrounding-text',
-#     run_test,
-#     args: [ '--testname', testname, '--x11', '--no-surrounding-text', test_args],
-#     env: test_env,
-#     depends: [test_exe],
-#     priority: -12,
-#     is_parallel: false,
-#     timeout: 120,
-#     protocol: 'tap',
-#   )
-#   if can_build_wayland
-#     test(
-#       'Wayland-' + testname + '__surrounding-text',
-#       run_test,
-#       args: [ '--testname', testname, '--wayland', '--surrounding-text', test_args],
-#       env: test_env,
-#       depends: [test_exe],
-#       priority: -21,
-#       is_parallel: false,
-#       timeout: 120,
-#       protocol: 'tap',
-#     )
-#     test(
-#       'Wayland-' + testname + '__no-surrounding-text',
-#       run_test,
-#       args: [ '--testname', testname, '--wayland', '--no-surrounding-text', test_args],
-#       env: test_env,
-#       depends: [test_exe],
-#       priority: -22,
-#       is_parallel: false,
-#       timeout: 120,
-#       protocol: 'tap',
-#     )
-#   endif
-# endforeach
+foreach kmx: kmxtest_files
+  filename = kmx.split('\t')
+  if filename[0] == ''
+    continue
+  endif
+  testname = filename[1].split('.kmx')[0]
+  test_args = [ '--tap', '-k', '--env', env_file, '--cleanup', cleanup_file, '--check', pid_file, '--', filename]
+  test(
+    'X11-' + testname + '__surrounding-text',
+    run_test,
+    args: [ '--testname', testname, '--x11', '--surrounding-text', test_args],
+    env: test_env,
+    depends: [test_exe],
+    priority: -11,
+    is_parallel: false,
+    timeout: 120,
+    protocol: 'tap',
+  )
+  test(
+    'X11-' + testname + '__no-surrounding-text',
+    run_test,
+    args: [ '--testname', testname, '--x11', '--no-surrounding-text', test_args],
+    env: test_env,
+    depends: [test_exe],
+    priority: -12,
+    is_parallel: false,
+    timeout: 120,
+    protocol: 'tap',
+  )
+  if can_build_wayland
+    test(
+      'Wayland-' + testname + '__surrounding-text',
+      run_test,
+      args: [ '--testname', testname, '--wayland', '--surrounding-text', test_args],
+      env: test_env,
+      depends: [test_exe],
+      priority: -21,
+      is_parallel: false,
+      timeout: 120,
+      protocol: 'tap',
+    )
+    test(
+      'Wayland-' + testname + '__no-surrounding-text',
+      run_test,
+      args: [ '--testname', testname, '--wayland', '--no-surrounding-text', test_args],
+      env: test_env,
+      depends: [test_exe],
+      priority: -22,
+      is_parallel: false,
+      timeout: 120,
+      protocol: 'tap',
+    )
+  endif
+endforeach
diff --git a/linux/ibus-keyman/tests/scripts/run-single-test.sh b/linux/ibus-keyman/tests/scripts/run-single-test.sh
index f2b2d37aff..39075421fc 100755
--- a/linux/ibus-keyman/tests/scripts/run-single-test.sh
+++ b/linux/ibus-keyman/tests/scripts/run-single-test.sh
@@ -16,6 +16,7 @@ fi
 
 if ! which Xvfb > /dev/null || ! which Xephyr > /dev/null || ! which metacity > /dev/null || ! which 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
 fi
 
@@ -43,7 +44,7 @@ function help() {
 function run_tests() {
   # Output these lines to stderr - the first line on stdout has to be the TAP version number
   # which running ${TESTFILE} outputs
-  echo "# NOTE: When the tests fail check /tmp/ibus-engine-keyman.log and /tmp/ibus-daemon.log!" >&2
+  echo "# NOTE: When the tests fail check /tmp/ibus-engine-keyman.log, /tmp/ibus-daemon.log and /tmp/km-test-server.log!" >&2
   echo "" >&2
 
   echo "# Starting tests..." >&2
diff --git a/linux/ibus-keyman/tests/scripts/run-tests.sh b/linux/ibus-keyman/tests/scripts/run-tests.sh
index 4b28327259..1f26b39a41 100755
--- a/linux/ibus-keyman/tests/scripts/run-tests.sh
+++ b/linux/ibus-keyman/tests/scripts/run-tests.sh
@@ -25,6 +25,7 @@ fi
 
 if ! which Xvfb > /dev/null || ! which Xephyr > /dev/null || ! which metacity > /dev/null || ! which 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
 fi
 
@@ -36,6 +37,7 @@ function help() {
   echo "  --help, -h, -?          Display this help"
   echo "  --verbose, -v           Run tests verbosely"
   echo "  --debug                 debug test logging output"
+  echo "  --remote-debug          start gdbserver after setup but prior to running the tests"
   echo "  -k                      passed to GLib testing framework"
   echo "  --tap                   output in TAP format. Passed to GLib testing framework"
   echo "  --surrounding-text      run tests with surrounding texts enabled"
@@ -86,10 +88,14 @@ function run_tests() {
   source "$ENV_FILE"
   echo "DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
 
+  if [[ -n ${REMOTE_DEBUG:-} ]]; then
+    echo "===> Now attach debugger to ${REMOTE_HOST}"
+  fi
+
   # Note: -k and --tap are consumed by the GLib testing framework
   #shellcheck disable=SC2068 # we want to split array elements!
   #shellcheck disable=SC2086
-  "${G_TEST_BUILDDIR:-../../build/$(arch)/${CONFIG}/tests}/ibus-keyman-tests" ${ARG_K-} ${ARG_TAP-} \
+  ${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[@]}
   echo "# Finished tests."
@@ -111,6 +117,7 @@ while (( $# )); do
     --no-x11) USE_X11=0;;
     --verbose|-v) ARG_VERBOSE=--verbose;;
     --debug) ARG_DEBUG=--debug-log;;
+    --remote-debug) REMOTE_HOST="$(ip route get 8.8.8.8 | sed -E 's/.*src (\S+) .*/\1/;t;d'):2345" && REMOTE_DEBUG="gdbserver ${REMOTE_HOST}";;
     --) shift && break ;;
     *) echo "Error: Unexpected argument \"$1\". Exiting." ; exit 4 ;;
   esac
diff --git a/linux/ibus-keyman/tests/scripts/test-helper.inc.sh b/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
index 3287acd05c..e9732cc478 100755
--- a/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
+++ b/linux/ibus-keyman/tests/scripts/test-helper.inc.sh
@@ -140,12 +140,12 @@ function _setup_test_dbus_server() {
   CLEANUP_FILE=$2
 
   # Start test dbus server. This will create `/tmp/km-test-server.env`.
-  "${TOP_BINDIR}/tests/km-dbus-test-server" &> /tmp/km-test-server.log &
+  "${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/stop-test-server" >> "$CLEANUP_FILE"
+  echo "${TOP_BINDIR}/tests/dbus-test-server/stop-test-server" >> "$CLEANUP_FILE"
 
   source /tmp/km-test-server.env
   echo "# DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS"
@@ -256,7 +256,7 @@ function _setup_ibus() {
     echo "if kill -9 ${PID}; then ibus restart || ibus start; fi # ibus-daemon" >> "${CLEANUP_FILE}"
   else
     # test run as part of the build
-    echo "kill -9 ${PID} || true" >> "${CLEANUP_FILE}"
+    echo "kill -9 ${PID} || true # ibus-daemon" >> "${CLEANUP_FILE}"
   fi
   echo "${PID} ibus-daemon" >> "${PID_FILE}"
   sleep 1s
diff --git a/linux/ibus-keyman/tests/testfixture.cpp b/linux/ibus-keyman/tests/testfixture.cpp
index dab206731d..f92fe59403 100644
--- a/linux/ibus-keyman/tests/testfixture.cpp
+++ b/linux/ibus-keyman/tests/testfixture.cpp
@@ -1,6 +1,3 @@
-#include <glib-object.h>
-#include <glib.h>
-#include <ibus.h>
 #include <iostream>
 #include <keyman/keyman_core_api.h>
 #include <kmx/kmx_processevent.h>
@@ -10,18 +7,15 @@
 #include <stack>
 #include <stdexcept>
 #include <string>
-#include "ibusimcontext.h"
+#include "DbusTestHelper.h"
 #include "keycodes.h"
 #include "keymanutil.h"
 #include "KeymanSystemServiceClient.h"
 #include "kmx_test_source.hpp"
 #include "testmodule.h"
+#include "testfixture.h"
+#include "KeyHandling.h"
 
-typedef struct {
-  IBusBus *bus;
-  GtkIMContext *context;
-  IBusIMContext *ibuscontext;
-} IBusKeymanTestsFixture;
 
 typedef struct {
   char *test_name;
@@ -32,10 +26,10 @@ typedef struct {
 
 static gboolean loaded        = FALSE;
 static gboolean use_wayland   = FALSE;
-static GdkWindow *window      = NULL;
 static GMainLoop *thread_loop = NULL;
 static GTypeModule *module    = NULL;
 gboolean testing              = TRUE;
+GdkWindow* window             = NULL;
 
 static void
 module_register(GTypeModule *module) {
@@ -48,11 +42,15 @@ destroy(GtkWidget *widget, gpointer data) {
 }
 
 static void
-ibus_keyman_tests_fixture_set_up(IBusKeymanTestsFixture *fixture, gconstpointer user_data) {
-  IBusIMContextClass *classClass;
+ibus_keyman_tests_fixture_set_up(
+  IBusKeymanTestsFixture* fixture,
+  gconstpointer user_data
+) {
+  IBusIMContextClass* classClass;
+  initialize_keyman_system_service_client();
 
   if (!window) {
-    GtkWidget *widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    GtkWidget* widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     g_signal_connect(widget, "destroy", G_CALLBACK(destroy), NULL);
     window = gtk_widget_get_window(widget);
   }
@@ -64,7 +62,7 @@ ibus_keyman_tests_fixture_set_up(IBusKeymanTestsFixture *fixture, gconstpointer
     g_assert_nonnull(module);
 
     /* Not loaded until we call ref for the first time */
-    classClass = static_cast<IBusIMContextClass *>(g_type_class_peek(IBUS_TYPE_IM_CONTEXT));
+    classClass = static_cast<IBusIMContextClass*>(g_type_class_peek(IBUS_TYPE_IM_CONTEXT));
     g_assert_null(classClass);
 
     loaded = TRUE;
@@ -75,6 +73,7 @@ ibus_keyman_tests_fixture_set_up(IBusKeymanTestsFixture *fixture, gconstpointer
 
 static void
 ibus_keyman_tests_fixture_tear_down(IBusKeymanTestsFixture *fixture, gconstpointer user_data) {
+  dbus_testhelper_close();
   if (thread_loop) {
     g_main_loop_unref(thread_loop);
     thread_loop = NULL;
@@ -88,16 +87,6 @@ ibus_keyman_tests_fixture_tear_down(IBusKeymanTestsFixture *fixture, gconstpoint
   delete data;
 }
 
-static void
-set_caps_lock_state(IBusKeymanTestsFixture *fixture, bool caps_lock_on) {
-  set_capslock_indicator((guint32)caps_lock_on);
-}
-
-static bool
-get_caps_lock_state(IBusKeymanTestsFixture *fixture) {
-  return get_capslock_indicator();
-}
-
 static void
 switch_keyboard(IBusKeymanTestsFixture *fixture, const gchar *keyboard) {
   ibus_bus_set_global_engine(fixture->bus, keyboard);
@@ -119,6 +108,7 @@ switch_keyboard(IBusKeymanTestsFixture *fixture, const gchar *keyboard) {
   fixture->context     = (GtkIMContext *)fixture->ibuscontext;
 
   thread_loop = g_main_loop_new(NULL, TRUE);
+  dbus_testhelper_init(fixture);
   ibus_im_test_set_thread_loop(fixture->ibuscontext, thread_loop);
 }
 
@@ -136,105 +126,7 @@ string_format(const std::string &format, Args... args) {
   return std::string(buf.get(), buf.get() + size - 1);  // We don't want the '\0' inside
 }
 
-static unsigned short vk_to_keycode(unsigned short vk) {
-  for (int i = 0; i < (int)sizeof(keycode_to_vk); i++) {
-    if (keycode_to_vk[i] == vk)
-      return i;
-  }
-  return -1;
-}
-
-#define KEYMAN_LCTRL 29  // 0x1D
-#define KEYMAN_LALT 56   // 0x38
-#define KEYMAN_RCTRL 97  // 0x61
-#define KEYMAN_RALT 100  // 0x64
-
-typedef struct {
-  guint modifiers_keydown;
-  guint modifiers_keyup;
-  guint keyval;
-  guint16 keycode;
-  guint is_modifier;
-} gdk_key_event;
-
-static gdk_key_event
-get_key_event_for_modifier(guint modifier, guint & prev_modifiers, guint keyval, guint keycode) {
-  gdk_key_event event;
-  event.modifiers_keydown = prev_modifiers;
-  event.modifiers_keyup   = prev_modifiers | modifier | IBUS_RELEASE_MASK;
-  prev_modifiers |= modifier;
-  event.keyval  = keyval;
-  event.keycode = keycode;
-  event.is_modifier = 1;
-  return event;
-}
-
-static bool
-is_modifier(guint16 keycode) {
-  switch (keycode) {
-    case KEY_LEFTSHIFT:
-    case KEY_RIGHTSHIFT:
-    case KEY_LEFTALT:
-    case KEY_RIGHTALT:
-    case KEY_LEFTCTRL:
-    case KEY_RIGHTCTRL:
-    case KEY_CAPSLOCK:
-      return true;
-    }
-    return false;
-}
-
-static std::list<gdk_key_event>
-get_involved_keys(IBusKeymanTestsFixture *fixture, km::tests::key_event test_event) {
-  guint modifiers = 0;
-  if (get_caps_lock_state(fixture)) {
-    modifiers = IBUS_LOCK_MASK;
-  }
-
-  // process all modifiers
-  std::list<gdk_key_event> result;
-  if (test_event.modifier_state & KM_CORE_MODIFIER_SHIFT) {
-    // we don't distinguish between R and L Shift
-    result.push_back(get_key_event_for_modifier(IBUS_SHIFT_MASK, modifiers, GDK_KEY_Shift_L, KEY_LEFTSHIFT));
-  }
-  if (test_event.modifier_state & KM_CORE_MODIFIER_ALT || test_event.modifier_state & KM_CORE_MODIFIER_LALT) {
-    result.push_back(get_key_event_for_modifier(IBUS_MOD1_MASK, modifiers, GDK_KEY_Alt_L, KEY_LEFTALT));
-  }
-  if (test_event.modifier_state & KM_CORE_MODIFIER_RALT) {
-    if (test_event.vk == KEYMAN_RALT)
-      result.push_back(get_key_event_for_modifier(IBUS_MOD1_MASK, modifiers, GDK_KEY_Alt_R, KEY_RIGHTALT));
-    else
-      result.push_back(get_key_event_for_modifier(IBUS_MOD5_MASK, modifiers, GDK_KEY_Alt_R, KEY_RIGHTALT));
-  }
-  if (test_event.modifier_state & KM_CORE_MODIFIER_CTRL || test_event.modifier_state & KM_CORE_MODIFIER_LCTRL) {
-    result.push_back(get_key_event_for_modifier(IBUS_CONTROL_MASK, modifiers, GDK_KEY_Control_L, KEY_LEFTCTRL));
-  }
-  if (test_event.modifier_state & KM_CORE_MODIFIER_RCTRL) {
-    result.push_back(get_key_event_for_modifier(IBUS_CONTROL_MASK, modifiers, GDK_KEY_Control_R, KEY_RIGHTCTRL));
-  }
-
-  // process key
-  guint keyval = (test_event.modifier_state & KM_CORE_MODIFIER_SHIFT) ? gdk_keyval_to_upper(test_event.vk)
-                                                                     : gdk_keyval_to_lower(test_event.vk);
-
-  // REVIEW: the keyval we use here are not correct for < 0x20 and >= 0x7f
-  // See /usr/include/X11/keysymdef.h and /usr/include/ibus-1.0/ibuskeysyms.h
-  // Currently this is not a problem because we don't use keyval, but if that ever changes we
-  // should be aware that our test behaves different than the real client.
-
-  gdk_key_event event;
-  event.modifiers_keydown = modifiers;
-  event.modifiers_keyup   = modifiers | IBUS_RELEASE_MASK;
-  event.keyval            = keyval;
-  event.keycode           = vk_to_keycode(test_event.vk);
-  event.is_modifier       = is_modifier(event.keycode);
-  result.push_back(event);
-
-  return result;
-}
-
-static std::list<km::tests::key_event>
-get_context_keys(std::u16string context) {
+static std::list<km::tests::key_event> get_context_keys(std::u16string context) {
   std::list<km::tests::key_event> result;
   for (auto c = context.begin(); c != context.end(); c++) {
     gchar utf8[6];
@@ -249,62 +141,11 @@ get_context_keys(std::u16string context) {
   return result;
 }
 
-static void
-press_keys(IBusKeymanTestsFixture *fixture, km::tests::KmxTestSource & test_source,km::tests::key_event key_event) {
-  auto involved_keys = get_involved_keys(fixture, key_event);
-
-  // press and hold the individual modifier keys, finally the actual key
-  std::stack<GdkEventKey> keys_to_release;
-  for (auto key = involved_keys.begin(); key != involved_keys.end(); key++) {
-    bool old_caps_lock = get_caps_lock_state(fixture);
-    guint lock_modifier = 0;
-
-    // KEY_CAPSLOCK behaves a bit strange:
-    // If capslock is off:
-    // - on keypress we turn on capslock, but the modifier is still not set.
-    // - The LOCK_MASK modifier gets set on release.
-    // When capslock is already on:
-    // - the LOCK_MASK modifier is set on both keypress and release
-    // - capslock gets turned off on release
-    if (key->keycode == KEY_CAPSLOCK && !old_caps_lock) {
-      set_caps_lock_state(fixture, true);
-      lock_modifier = IBUS_LOCK_MASK;
-    }
-    GdkEventKey keyEvent = {
-        .type             = GDK_KEY_PRESS,
-        .window           = window,
-        .send_event       = 0,
-        .time             = 0,
-        .state            = key->modifiers_keydown,
-        .keyval           = key->keyval,
-        .length           = 0,
-        .string           = NULL,
-        .hardware_keycode = key->keycode,
-        .group            = 0,
-        .is_modifier      = key->is_modifier};
-    gtk_im_context_filter_keypress(fixture->context, &keyEvent);
-
-    keyEvent.type  = GDK_KEY_RELEASE;
-    keyEvent.state = key->modifiers_keyup | lock_modifier;
-    keys_to_release.push(keyEvent);
-
-    if (key->keycode == KEY_CAPSLOCK && old_caps_lock) {
-      set_caps_lock_state(fixture, false);
-    }
-  }
-
-  // then release the keys in reverse order
-  while (!keys_to_release.empty()) {
-    auto keyEvent = keys_to_release.top();
-    gtk_im_context_filter_keypress(fixture->context, &keyEvent);
-    keys_to_release.pop();
-  }
-}
-
-static void test_source(IBusKeymanTestsFixture *fixture, gconstpointer user_data) {
+static void test_source(IBusKeymanTestsFixture* fixture, gconstpointer user_data) {
   auto data       = (TestData*)user_data;
   auto sourcefile = string_format("%s.kmn", data->test_path);
   auto kmxfile    = string_format("und:%s.kmx", data->test_path);
+
   ibus_im_test_set_surrounding_text_supported(data->use_surrounding_text);
 
   km::tests::KmxTestSource test_source;
@@ -326,19 +167,19 @@ static void test_source(IBusKeymanTestsFixture *fixture, gconstpointer user_data
   g_settings_sync();
 
   switch_keyboard(fixture, kmxfile.c_str());
-  if (test_source.caps_lock_state() != get_caps_lock_state(fixture)) {
-    set_caps_lock_state(fixture, test_source.caps_lock_state());
+  if (test_source.caps_lock_state() != get_capslock_indicator()) {
+    set_capslock_indicator((guint32)test_source.caps_lock_state());
   }
 
   auto contextKeys = get_context_keys(context);
   for (auto k = contextKeys.begin(); k != contextKeys.end(); k++) {
-    press_keys(fixture, test_source, *k);
+    press_key(fixture, *k);
   }
 
   gtk_im_context_focus_in(fixture->context);
 
   for (auto p = test_source.next_key(keys); p.vk != 0; p = test_source.next_key(keys)) {
-    press_keys(fixture, test_source, p);
+    press_key(fixture, p);
   }
 
   if (expected.length() == 0) {
diff --git a/linux/ibus-keyman/tests/testfixture.h b/linux/ibus-keyman/tests/testfixture.h
new file mode 100644
index 0000000000..bb317618a4
--- /dev/null
+++ b/linux/ibus-keyman/tests/testfixture.h
@@ -0,0 +1,19 @@
+#ifndef __TESTFIXTURE_H__
+#define __TESTFIXTURE_H__
+
+#include <glib-object.h>
+#include <glib.h>
+#include <ibus.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;
+  IBusIMContext* ibuscontext;
+} IBusKeymanTestsFixture;
+
+#endif // __TESTFIXTURE_H__
diff --git a/linux/keyman-config/keyman_config/dbus_util.py b/linux/keyman-config/keyman_config/dbus_util.py
index e960e322d9..af64f2e517 100644
--- a/linux/keyman-config/keyman_config/dbus_util.py
+++ b/linux/keyman-config/keyman_config/dbus_util.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python3
+import contextlib
 import logging
 import os
 
@@ -7,6 +8,8 @@ import dbus.bus
 import dbus.mainloop.glib
 import dbus.service
 
+from dbus import DBusException
+
 BUS_NAME = 'com.Keyman.Config'
 OBJECT_PATH = '/com/Keyman/Config'
 
@@ -27,7 +30,7 @@ class KeymanConfigService(dbus.service.Object):
 
     @dbus.service.method(BUS_NAME)
     def keyboard_list_changed(self):
-        logging.debug("%s: -------------keyboard_list_changed--------------------" % os.getpid())
+        logging.debug(f"{os.getpid()}: -------------keyboard_list_changed--------------------")
         if self.__keyboard_list_changed_handler:
             self.__keyboard_list_changed_handler()
         self.KeyboardListChangedSignal()
@@ -45,30 +48,30 @@ class KeymanConfigServiceManager:
 
     def __is_name_owner(self) -> bool:
         retval = self.__bus.request_name(BUS_NAME, dbus.bus.NAME_FLAG_DO_NOT_QUEUE)
-        return (
-          retval == dbus.bus.REQUEST_NAME_REPLY_ALREADY_OWNER or
-          retval == dbus.bus.REQUEST_NAME_REPLY_PRIMARY_OWNER)
+        return retval in [
+            dbus.bus.REQUEST_NAME_REPLY_ALREADY_OWNER,
+            dbus.bus.REQUEST_NAME_REPLY_PRIMARY_OWNER,
+        ]
 
     def __create_service(self) -> None:
         if self.__signal_receiver:
             self.__signal_receiver.remove()
             self.__signal_receiver = None
         if self.__is_name_owner():
-            logging.debug('%s: I am now owner (%s)' % (os.getpid(), self.__bus.get_name_owner(BUS_NAME)))
+            logging.debug(f'{os.getpid()}: I am now owner ({self.__bus.get_name_owner(BUS_NAME)})')
             if self.__name_owner_watch:
                 self.__name_owner_watch.cancel()
                 self.__name_owner_watch = None
             self.__service = KeymanConfigService(self.__bus, self.__keyboard_list_changed_handler)
         else:
-            logging.debug('%s: Not owner. Owner is %s. Connecting signal' %
-                          (os.getpid(), self.__bus.get_name_owner(BUS_NAME)))
+            logging.debug(f'{os.getpid()}: Not owner. Owner is {self.__bus.get_name_owner(BUS_NAME)}. Connecting signal')
             self.__service = self.__bus.get_object(BUS_NAME, OBJECT_PATH, introspect=False)
             if self.__keyboard_list_changed_handler:
                 self.__signal_receiver = self.__service.connect_to_signal(
                   'KeyboardListChangedSignal', self.__keyboard_list_changed_handler, dbus_interface=BUS_NAME)
 
     def __name_owner_changed(self, new_owner) -> None:
-        logging.debug('%s: Owner changed. Recreating service.' % os.getpid())
+        logging.debug(f'{os.getpid()}: Owner changed. Recreating service.')
         self.__create_service()
 
     def __verify_service_exists(self) -> None:
@@ -77,7 +80,9 @@ class KeymanConfigServiceManager:
 
     def keyboard_list_changed(self) -> None:
         self.__verify_service_exists()
-        if self.__service:
+        if not self.__service:
+            return
+        with contextlib.suppress(DBusException):
             self.__service.keyboard_list_changed()
 
 
diff --git a/linux/keyman-config/keyman_config/gsettings.py b/linux/keyman-config/keyman_config/gsettings.py
index 4140788ce1..d674011c92 100644
--- a/linux/keyman-config/keyman_config/gsettings.py
+++ b/linux/keyman-config/keyman_config/gsettings.py
@@ -5,10 +5,16 @@ import os
 import subprocess
 import sys
 
-from xdg.BaseDirectory import xdg_config_home
 from gi.repository import Gio  # needs to come before gi.overrides.GLib!
 from gi.overrides.GLib import Variant
 
+# The xdg module got renamed to xdg_base_dirs, but the package
+# (python3-xdg) on Ubuntu still ships xdg. So we support both.
+try:
+    from xdg_base_dirs import xdg_config_home
+except ModuleNotFoundError:
+    from xdg.BaseDirectory import xdg_config_home
+
 from keyman_config import file_cleanup, get_dbus_started_for_session
 
 class GSettings():
diff --git a/linux/keyman-config/keyman_config/install_window.py b/linux/keyman-config/keyman_config/install_window.py
index 1342dd44f6..2ca4289b4b 100755
--- a/linux/keyman-config/keyman_config/install_window.py
+++ b/linux/keyman-config/keyman_config/install_window.py
@@ -362,7 +362,10 @@ class InstallKmpWindow(Gtk.Dialog):
                 dialog.run()
                 dialog.destroy()
                 if is_fcitx_running():
-                    subprocess.run(['fcitx5-configtool'])
+                    try:
+                        subprocess.run(['fcitx5-configtool'])
+                    except FileNotFoundError:
+                        logging.warning('Ignoring not found fcitx5-configtool')
 
             if self.viewwindow:
                 self.viewwindow.refresh_installed_kmp()
diff --git a/linux/keyman-config/tests/dbus_util_tests.py b/linux/keyman-config/tests/dbus_util_tests.py
new file mode 100644
index 0000000000..aa126e4f82
--- /dev/null
+++ b/linux/keyman-config/tests/dbus_util_tests.py
@@ -0,0 +1,61 @@
+#!/usr/bin/python3
+import unittest
+from unittest.mock import Mock, patch
+
+from dbus import DBusException
+
+from keyman_config.dbus_util import get_keyman_config_service
+
+
+class KeymanConfigServiceManager(unittest.TestCase):
+    def setUp(self):
+        self.mockDbus = self._setupMock('keyman_config.dbus_util.dbus')
+
+    def _setupMock(self, arg0):
+        patcher = patch(arg0)
+        result = patcher.start()
+        self.addCleanup(patcher.stop)
+        return result
+
+    def test_KeyboardListChanged_HappyPath(self):
+        # Setup
+        serviceManager = get_keyman_config_service()
+        serviceManager.__service = Mock()
+        serviceManager.__service.keyboard_list_changed = Mock()
+
+        # Execute
+        serviceManager.keyboard_list_changed()
+
+        # Verify
+        self.assertEqual(serviceManager.__service.keyboard_list_changed.call_count, 1)
+
+    def test_KeyboardListChanged_IgnoreDbusExceptionDisconnected(self):
+        '''#12902: ignore DBus exceptions happening from call to keyboard_list_changed'''
+
+        # Setup
+        serviceManager = get_keyman_config_service()
+        serviceManager.__service = Mock()
+        serviceManager.__service.keyboard_list_changed = Mock(side_effect=DBusException(
+            'org.freedesktop.DBus.Error.NoReply: Message recipient disconnected from message bus without replying'))
+
+        # Execute
+        serviceManager.keyboard_list_changed()
+
+        # Verify
+        self.assertEqual(serviceManager.__service.keyboard_list_changed.call_count, 1)
+
+    def test_KeyboardListChanged_IgnoreDbusExceptionNoReply(self):
+        '''#13283: ignore DBus exceptions happening from call to keyboard_list_changed'''
+
+        # Setup
+        serviceManager = get_keyman_config_service()
+        serviceManager.__service = Mock()
+        serviceManager.__service.keyboard_list_changed = Mock(side_effect=DBusException(
+            'org.freedesktop.DBus.Error.NoReply: Did not receive a reply.'))
+
+        # Execute
+        serviceManager.keyboard_list_changed()
+
+        # Verify
+        self.assertEqual(serviceManager.__service.keyboard_list_changed.call_count, 1)
+
diff --git a/linux/keyman-config/tests/uninstall_kmp_tests.py b/linux/keyman-config/tests/uninstall_kmp_tests.py
index 79f619c31d..0a6205e12b 100644
--- a/linux/keyman-config/tests/uninstall_kmp_tests.py
+++ b/linux/keyman-config/tests/uninstall_kmp_tests.py
@@ -1,11 +1,10 @@
 #!/usr/bin/python3
-import os
-import tempfile
 import unittest
-from unittest.mock import patch
+from unittest.mock import Mock, patch
+
 from keyman_config.get_kmp import InstallLocation
 
-from keyman_config.uninstall_kmp import _uninstall_keyboards_from_gnome, _uninstall_keyboards_from_ibus, _uninstall_kmp_common
+from keyman_config.uninstall_kmp import _uninstall_keyboards_from_gnome, _uninstall_keyboards_from_ibus, _uninstall_kmp_common, uninstall_kmp
 
 
 class UninstallKmpGnomeTests(unittest.TestCase):
@@ -118,6 +117,7 @@ class UninstallKmpGnomeTests(unittest.TestCase):
 class UninstallKmpIbusTests(unittest.TestCase):
 
     def setUp(self):
+        self.mockIsDir = self._setupMock('os.path.isdir')
         self.mockIbusUtilClass = self._setupMock('keyman_config.uninstall_kmp.IbusUtil')
         self.mockRestartIbus = self._setupMock('keyman_config.uninstall_kmp.restart_ibus')
         self.mockGetIbusBus = self._setupMock('keyman_config.uninstall_kmp.get_ibus_bus')
@@ -237,35 +237,24 @@ class UninstallKmpIbusTests(unittest.TestCase):
 
 class UninstallKmpCommonTests(unittest.TestCase):
     def setUp(self):
-        patcher1 = patch('keyman_config.uninstall_kmp.get_keyboard_dir')
-        self.mockGetKeyboardDir = patcher1.start()
-        self.addCleanup(patcher1.stop)
-        patcher2 = patch('keyman_config.uninstall_kmp.get_keyman_doc_dir')
-        self.mockGetKeymanDocDir = patcher2.start()
-        self.addCleanup(patcher2.stop)
-        patcher3 = patch('keyman_config.uninstall_kmp.get_keyman_font_dir')
-        self.mockGetKeymanFontDir = patcher3.start()
-        self.addCleanup(patcher3.stop)
-        patcher4 = patch('keyman_config.uninstall_kmp.is_gnome_desktop')
-        self.mockIsGnomeShell = patcher4.start()
-        self.addCleanup(patcher4.stop)
+        self.mockIsDir = self._setupMock('os.path.isdir')
+        self.mockGetKeyboardDir = self._setupMock('keyman_config.uninstall_kmp.get_keyboard_dir')
+        self.mockGetKeymanDocDir = self._setupMock('keyman_config.uninstall_kmp.get_keyman_doc_dir')
+        self.mockGetKeymanFontDir = self._setupMock('keyman_config.uninstall_kmp.get_keyman_font_dir')
+        self.mockIsGnomeShell = self._setupMock('keyman_config.uninstall_kmp.is_gnome_desktop')
         self.mockIsGnomeShell.return_value = False
-        patcher5 = patch('keyman_config.uninstall_kmp.is_fcitx_running')
-        self.mockIsFcitxRunning = patcher5.start()
-        self.addCleanup(patcher5.stop)
+        self.mockIsFcitxRunning = self._setupMock('keyman_config.uninstall_kmp.is_fcitx_running')
         self.mockIsFcitxRunning.return_value = False
-        patcher6 = patch('keyman_config.uninstall_kmp._uninstall_keyboards_from_ibus')
-        self.mockUninstallKeyboardsFromIbus = patcher6.start()
-        self.addCleanup(patcher6.stop)
-        patcher7 = patch('keyman_config.uninstall_kmp._uninstall_dir')
-        self.mockUninstallDir = patcher7.start()
-        self.addCleanup(patcher7.stop)
-        patcher8 = patch('keyman_config.uninstall_kmp.get_metadata')
-        self.mockGetMetaData = patcher8.start()
-        self.addCleanup(patcher8.stop)
-        patcher9 = patch('keyman_config.uninstall_kmp.CustomKeyboards')
-        self.mockCustomKeyboardsClass = patcher9.start()
-        self.addCleanup(patcher9.stop)
+        self.mockUninstallKeyboardsFromIbus = self._setupMock('keyman_config.uninstall_kmp._uninstall_keyboards_from_ibus')
+        self.mockUninstallDir = self._setupMock('keyman_config.uninstall_kmp._uninstall_dir')
+        self.mockGetMetaData = self._setupMock('keyman_config.uninstall_kmp.get_metadata')
+        self.mockCustomKeyboardsClass = self._setupMock('keyman_config.uninstall_kmp.CustomKeyboards')
+
+    def _setupMock(self, arg0):
+        patcher = patch(arg0)
+        result = patcher.start()
+        self.addCleanup(patcher.stop)
+        return result
 
     def test_UninstallKmpCommon_NoRemoveLanguage(self):
         # Setup
@@ -318,3 +307,49 @@ class UninstallKmpCommonTests(unittest.TestCase):
         self.mockUninstallKeyboardsFromIbus.assert_called_once_with(keyboards, '/tmp/foo')
         self.mockUninstallDir.assert_called()
         self.assertEqual(mockCustomKeyboardsInstance.remove.call_count, 2)
+
+
+class UninstallKmpTests(unittest.TestCase):
+    def setUp(self):
+        self.mockIsDir = self._setupMock('os.path.isdir')
+        self.mockGetKeyboardDir = self._setupMock('keyman_config.uninstall_kmp.get_keyboard_dir')
+        self.mockGetKeyboardDir.return_value = '/tmp/foo'
+        self.mockGetKeymanDocDir = self._setupMock('keyman_config.uninstall_kmp.get_keyman_doc_dir')
+        self.mockGetKeymanFontDir = self._setupMock('keyman_config.uninstall_kmp.get_keyman_font_dir')
+        self.mockIsGnomeShell = self._setupMock('keyman_config.uninstall_kmp.is_gnome_desktop')
+        self.mockIsGnomeShell.return_value = False
+        self.mockIsFcitxRunning = self._setupMock('keyman_config.uninstall_kmp.is_fcitx_running')
+        self.mockIsFcitxRunning.return_value = False
+        self.mockUninstallKeyboardsFromIbus = self._setupMock(
+            'keyman_config.uninstall_kmp._uninstall_keyboards_from_ibus')
+        self.mockUninstallDir = self._setupMock('keyman_config.uninstall_kmp._uninstall_dir')
+        self.mockGetMetaData = self._setupMock('keyman_config.uninstall_kmp.get_metadata')
+        self.mockCustomKeyboardsClass = self._setupMock('keyman_config.uninstall_kmp.CustomKeyboards')
+        self.mockGetKeymanConfigService = self._setupMock('keyman_config.uninstall_kmp.get_keyman_config_service')
+        self.mockKeymanConfigServiceManager = Mock()
+        self.mockGetKeymanConfigService.return_value = self.mockKeymanConfigServiceManager
+
+    def _setupMock(self, arg0):
+        patcher = patch(arg0)
+        result = patcher.start()
+        self.addCleanup(patcher.stop)
+        return result
+
+    def test_UninstallKmp_HappyPath(self):
+        # Setup
+        mockCustomKeyboardsInstance = self.mockCustomKeyboardsClass.return_value
+        keyboards = [{'id': 'foo1', 'languages': [{'id': 'en'}]}, {'id': 'bar2', 'languages': [{'id': 'fr'}]}]
+        self.mockGetMetaData.return_value = (None, None, None, keyboards, None)
+
+        keyboardListChangedMock = Mock()
+        self.mockKeymanConfigServiceManager.keyboard_list_changed = keyboardListChangedMock
+
+        # Execute
+        uninstall_kmp('foo', False, True)
+
+        # Verify
+        self.mockUninstallKeyboardsFromIbus.assert_called_once_with(keyboards, '/tmp/foo')
+        self.mockUninstallDir.assert_called()
+        self.assertEqual(mockCustomKeyboardsInstance.remove.call_count, 2)
+        self.assertEqual(keyboardListChangedMock.call_count, 1)
+
diff --git a/linux/keyman-system-service/src/KeyboardDevice.cpp b/linux/keyman-system-service/src/KeyboardDevice.cpp
index 783902acaf..5a52c8b2e6 100644
--- a/linux/keyman-system-service/src/KeyboardDevice.cpp
+++ b/linux/keyman-system-service/src/KeyboardDevice.cpp
@@ -1,8 +1,8 @@
 #include <dirent.h>
 #include <fcntl.h>
-#include <iostream>
 #include <string.h>
 #include <string>
+#include <syslog.h>
 #include <unistd.h>
 #include "KeyboardDevice.h"
 
@@ -40,15 +40,17 @@ bool KeyboardDevice::Initialize(const char* name)
 
   fd = open(path.c_str(), O_RDWR);
   if (fd < 0) {
-    std::cerr << "Failed to open device " << path << ": " << strerror(errno) << std::endl;
     Close();
+    syslog(LOG_USER | LOG_NOTICE, "Failed to open device %s: %s",
+      path.c_str(), strerror(errno));
     return false;
   }
 
   int rc = libevdev_new_from_fd(fd, &dev);
   if (rc < 0) {
-    std::cerr << "Failed to init libevdev for " << path << ": " << strerror(-rc) << std::endl;
     Close();
+    syslog(LOG_USER | LOG_NOTICE, "Failed to init libevdev for %s: %s",
+      path.c_str(), strerror(-rc));
     return false;
   }
 
@@ -61,8 +63,8 @@ bool KeyboardDevice::HasCapsLockLed()
     if (!libevdev_has_event_code(dev, EV_LED, LED_CAPSL)) {
       hasCapsLockLed = 0;
       if (debug) {
-        std::cerr << "Device '" << libevdev_get_name(dev) << "' doesn't have "
-                  << libevdev_event_code_get_name(EV_LED, LED_CAPSL) << "." << std::endl;
+        syslog( LOG_USER | LOG_NOTICE, "Device '%s' doesn't have %s.", libevdev_get_name(dev),
+          libevdev_event_code_get_name(EV_LED, LED_CAPSL));
       }
     } else {
       hasCapsLockLed = 1;
@@ -79,8 +81,8 @@ void KeyboardDevice::SetCapsLockLed(bool on)
 
   int rc = libevdev_kernel_set_led_value(dev, LED_CAPSL, on ? LIBEVDEV_LED_ON : LIBEVDEV_LED_OFF);
   if (rc != 0) {
-    std::cerr << "Failed to set LED " << libevdev_event_code_get_name(EV_LED, LED_CAPSL)
-              << ": " << strerror(-rc) << std::endl;
+    syslog(LOG_USER | LOG_NOTICE, "Failed to set LED %s: %s",
+      libevdev_event_code_get_name(EV_LED, LED_CAPSL), strerror(-rc));
   }
 }
 
diff --git a/linux/keyman-system-service/src/KeymanSystemService.cpp b/linux/keyman-system-service/src/KeymanSystemService.cpp
index 56d1e558b3..f226ff2b2f 100644
--- a/linux/keyman-system-service/src/KeymanSystemService.cpp
+++ b/linux/keyman-system-service/src/KeymanSystemService.cpp
@@ -71,9 +71,10 @@ on_call_ordered_output_sentinel(
 ) {
   *ret_error = SD_BUS_ERROR_NULL;
 
-  KeymanSystemService *service = static_cast<KeymanSystemService *>(user_data);
+  int result = sd_bus_reply_method_return(msg, "");
+  KeymanSystemService* service = static_cast<KeymanSystemService*>(user_data);
   service->CallOrderedOutputSentinel();
-  return sd_bus_reply_method_return(msg, "");
+  return result;
 }
 
 static int32_t
@@ -97,49 +98,14 @@ static const sd_bus_vtable system_service_vtable[] = {
 
 KeymanSystemService::KeymanSystemService()
 {
-  int ret;
-
-  GetKbdDevices();
-  CreateOrderedOutputDevice();
-
-#ifdef KEYMAN_TESTING
-  ret = sd_bus_open_user(&bus);
-#else
-  ret = sd_bus_open_system(&bus);
-#endif
-
-  if (ret < 0) {
-    syslog(LOG_USER | LOG_NOTICE, "Failed to connect to system bus: %s", strerror(-ret));
-    failed = true;
-    return;
-  }
-
-  // Install the object
-  ret = sd_bus_add_object_vtable(bus,
-                                 &slot,
-                                 KEYMAN_OBJECT_PATH,
-                                 KEYMAN_INTERFACE_NAME,
-                                 system_service_vtable,
-                                 this);
-  if (ret < 0) {
-    syslog(LOG_USER | LOG_NOTICE, "Failed to issue method call: %s", strerror(-ret));
-    failed = true;
-    return;
-  }
-
-  // Take a well-known service name so that clients can find us
-  ret = sd_bus_request_name(bus, KEYMAN_BUS_NAME, 0);
-  if (ret < 0) {
-    syslog(LOG_USER | LOG_NOTICE, "Failed to acquire service name: %s", strerror(-ret));
-    failed = true;
-    return;
-  }
 }
 
 KeymanSystemService::~KeymanSystemService()
 {
-  if (slot) sd_bus_slot_unref(slot);
-  if (bus)  sd_bus_unref(bus);
+  if (bus) {
+    sd_bus_unref(bus);
+    bus = nullptr;
+  }
 
   if (kbd_devices) {
     for (KeyboardDevice *device : *kbd_devices) {
@@ -155,8 +121,41 @@ KeymanSystemService::~KeymanSystemService()
   }
 }
 
-int KeymanSystemService::Loop()
-{
+void KeymanSystemService::Initialize() {
+  int ret;
+
+  GetKbdDevices();
+#ifdef KEYMAN_TESTING
+  ret = sd_bus_default(&bus);
+#else
+  ret = sd_bus_open_system(&bus);
+#endif
+
+  if (ret < 0) {
+    syslog(LOG_USER | LOG_NOTICE, "Failed to connect to system bus: %s", strerror(-ret));
+    failed = true;
+    return;
+  }
+
+  // Install the object
+  ret = sd_bus_add_object_vtable(bus, NULL, KEYMAN_OBJECT_PATH, KEYMAN_INTERFACE_NAME, system_service_vtable, this);
+  if (ret < 0) {
+    syslog(LOG_USER | LOG_NOTICE, "Failed to issue method call: %s", strerror(-ret));
+    failed = true;
+    return;
+  }
+
+  // Take a well-known service name so that clients can find us
+  ret = sd_bus_request_name(bus, KEYMAN_BUS_NAME, 0);
+  if (ret < 0) {
+    syslog(LOG_USER | LOG_NOTICE, "Failed to acquire service name: %s", strerror(-ret));
+    failed = true;
+    return;
+  }
+  CreateOrderedOutputDeviceIfNecessary();
+}
+
+int KeymanSystemService::Loop() {
   for (;;) {
     // Process requests
     int ret = sd_bus_process(bus, NULL);
@@ -203,13 +202,15 @@ void KeymanSystemService::GetKbdDevices() {
   }
 }
 
-void KeymanSystemService::CreateOrderedOutputDevice() {
-  if (!kbd_ordered_output) {
-    kbd_ordered_output = new OrderedOutputDevice();
-    if (!kbd_ordered_output->Initialize()) {
-      delete kbd_ordered_output;
-      kbd_ordered_output = nullptr;
-    }
+void KeymanSystemService::CreateOrderedOutputDeviceIfNecessary() {
+  if (kbd_ordered_output) {
+    return;
+  }
+
+  kbd_ordered_output = ::CreateOrderedOutputDevice();
+  if (!kbd_ordered_output->Initialize()) {
+    delete kbd_ordered_output;
+    kbd_ordered_output = nullptr;
   }
 }
 
diff --git a/linux/keyman-system-service/src/KeymanSystemService.h b/linux/keyman-system-service/src/KeymanSystemService.h
index 19c7efe6cc..4bc67fb798 100644
--- a/linux/keyman-system-service/src/KeymanSystemService.h
+++ b/linux/keyman-system-service/src/KeymanSystemService.h
@@ -17,21 +17,18 @@ class KeymanSystemService {
 private:
   std::list<KeyboardDevice *>* kbd_devices  = nullptr;
   OrderedOutputDevice *kbd_ordered_output   = nullptr;
-  sd_bus_slot *slot                         = nullptr;
   sd_bus *bus                               = nullptr;
   bool failed                               = false;
 
   void GetKbdDevices();
-  void CreateOrderedOutputDevice();
+  void CreateOrderedOutputDeviceIfNecessary();
 
 public:
   KeymanSystemService();
   ~KeymanSystemService();
 
-  bool
-  Failed() {
-    return failed;
-  }
+  void Initialize();
+  bool Failed() { return failed; }
 
   int Loop();
   void SetCapsLockIndicatorOnDevices(uint32_t state);
diff --git a/linux/keyman-system-service/src/OrderedOutputDevice.cpp b/linux/keyman-system-service/src/OrderedOutputDevice.cpp
index cf90ffa2f1..5d388769ff 100644
--- a/linux/keyman-system-service/src/OrderedOutputDevice.cpp
+++ b/linux/keyman-system-service/src/OrderedOutputDevice.cpp
@@ -9,8 +9,16 @@
 
 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();
+}
+#endif
+
 OrderedOutputDevice::OrderedOutputDevice() {
   uinput_dev = nullptr;
 }
diff --git a/linux/keyman-system-service/src/OrderedOutputDevice.h b/linux/keyman-system-service/src/OrderedOutputDevice.h
index 0fb2d15a3f..caede1e353 100644
--- a/linux/keyman-system-service/src/OrderedOutputDevice.h
+++ b/linux/keyman-system-service/src/OrderedOutputDevice.h
@@ -13,12 +13,14 @@ public:
   OrderedOutputDevice();
   virtual ~OrderedOutputDevice();
 
-  bool Initialize();
-  bool PressSentinelKey();
+  virtual bool Initialize();
+  virtual bool PressSentinelKey();
 
-private:
-  void Close();
+protected:
+  virtual void Close();
   struct libevdev_uinput *uinput_dev;
 };
 
+OrderedOutputDevice* CreateOrderedOutputDevice();
+
 #endif // __ORDEROUTPUTDEVICE_H__
diff --git a/linux/keyman-system-service/src/main.cpp b/linux/keyman-system-service/src/main.cpp
index 9a2bb2d0de..4913acbd86 100644
--- a/linux/keyman-system-service/src/main.cpp
+++ b/linux/keyman-system-service/src/main.cpp
@@ -1,10 +1,13 @@
+#include <syslog.h>
 #include "KeymanSystemService.h"
 
 int main(int argc, char *argv[]) {
-  KeymanSystemService dbusService;
-  if (dbusService.Failed()) {
+  KeymanSystemService keymanSystemService;
+  keymanSystemService.Initialize();
+  if (keymanSystemService.Failed()) {
+    syslog(LOG_USER | LOG_NOTICE, "Failed to initialize KeymanSystemService");
     return 1;
   }
 
-  return dbusService.Loop();
+  return keymanSystemService.Loop();
 }
diff --git a/linux/keyman-system-service/tests/OrderedOutputDeviceMock.cpp b/linux/keyman-system-service/tests/OrderedOutputDeviceMock.cpp
new file mode 100644
index 0000000000..ca5db30ae6
--- /dev/null
+++ b/linux/keyman-system-service/tests/OrderedOutputDeviceMock.cpp
@@ -0,0 +1,79 @@
+#include "config.h"
+#if DBUS_IMPLEMENTATION == SYSTEMD
+#include <systemd/sd-bus.h>
+#else
+#include <basu/sd-bus.h>
+#endif
+#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
+
+using namespace std;
+
+// An OrderedOutputDevice used for testing. Instead of creating a real
+// device, we use our test server to simulate the sentinel key.
+
+class OrderedOutputDeviceMock: public OrderedOutputDevice {
+public:
+  OrderedOutputDeviceMock();
+  virtual ~OrderedOutputDeviceMock();
+
+  bool Initialize();
+  bool PressSentinelKey();
+
+protected:
+  void Close();
+  sd_bus* bus         = NULL;
+};
+
+static const sd_bus_vtable test_helper_vtable[] = {
+  SD_BUS_VTABLE_START(0),
+    SD_BUS_SIGNAL("SendSentinel", "", 0),
+  SD_BUS_VTABLE_END
+};
+
+OrderedOutputDevice* CreateOrderedOutputDevice() {
+  return new OrderedOutputDeviceMock();
+}
+
+OrderedOutputDeviceMock::OrderedOutputDeviceMock() {
+}
+
+OrderedOutputDeviceMock::~OrderedOutputDeviceMock() {
+  Close();
+}
+
+bool OrderedOutputDeviceMock::Initialize() {
+  sd_bus_open_user(&bus);
+  int result = sd_bus_add_object_vtable(bus, NULL, KEYMAN_TESTHELPER_OBJECT_PATH,
+    KEYMAN_TESTHELPER_INTERFACE_NAME, test_helper_vtable, this);
+  if (result < 0) {
+    return false;
+  }
+
+  // Take a well-known service name so that clients can find us
+  result = sd_bus_request_name(bus, KEYMAN_TESTHELPER_BUS_NAME, 0);
+  if (result < 0) {
+    return false;
+  }
+
+  return true;
+}
+
+void OrderedOutputDeviceMock::Close() {
+  if (bus)   { sd_bus_unref(bus); }
+}
+
+bool OrderedOutputDeviceMock::PressSentinelKey() {
+  int result = sd_bus_emit_signal(bus, KEYMAN_TESTHELPER_OBJECT_PATH,
+    KEYMAN_TESTHELPER_INTERFACE_NAME, "SendSentinel", NULL);
+  return result >= 0;
+}
diff --git a/linux/keyman-system-service/tests/meson.build b/linux/keyman-system-service/tests/meson.build
index 917f0b15e6..df6072ec44 100644
--- a/linux/keyman-system-service/tests/meson.build
+++ b/linux/keyman-system-service/tests/meson.build
@@ -3,13 +3,14 @@ test_service_files = files(
   '../src/KeymanSystemService.cpp',
   '../src/OrderedOutputDevice.cpp',
   'KeyboardDeviceMock.cpp',
+  'OrderedOutputDeviceMock.cpp',
 )
 
 deps = [evdev, systemd]
 
 test_c_args = [
   '-DKEYMAN_TESTING',
-  '-DKeyboardDevice=KeyboardDeviceMock'
+  '-DKeyboardDevice=KeyboardDeviceMock',
 ]
 
 exe = executable(
diff --git a/oem/firstvoices/android/app/build.gradle b/oem/firstvoices/android/app/build.gradle
index fa5dc5a127..95bbcf2fa2 100644
--- a/oem/firstvoices/android/app/build.gradle
+++ b/oem/firstvoices/android/app/build.gradle
@@ -95,7 +95,8 @@ if (env_keys_json_file != null && file(env_keys_json_file).exists()) {
 
         // Deactivate lower conflicting version APKs
         resolutionStrategy.set(com.github.triplet.gradle.androidpublisher.ResolutionStrategy.IGNORE)
-        switch (System.env.TIER) {
+        String tier = new File('../../../TIER.md').getText('UTF-8').trim();
+        switch (tier) {
             case 'beta':
                 track.set("beta")
                 println "TIER set to beta"
diff --git a/oem/firstvoices/ios/FirstVoices.xcodeproj/project.pbxproj b/oem/firstvoices/ios/FirstVoices.xcodeproj/project.pbxproj
index f11f08ddbb..7546e31557 100644
--- a/oem/firstvoices/ios/FirstVoices.xcodeproj/project.pbxproj
+++ b/oem/firstvoices/ios/FirstVoices.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -581,7 +581,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -633,7 +633,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -653,7 +653,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = D7TR486TEH;
 				INFOPLIST_FILE = FirstVoices/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -682,7 +682,7 @@
 				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = D7TR486TEH;
 				INFOPLIST_FILE = FirstVoices/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -709,7 +709,7 @@
 				DEVELOPMENT_TEAM = D7TR486TEH;
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = SWKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -740,7 +740,7 @@
 				DEVELOPMENT_TEAM = D7TR486TEH;
 				HEADER_SEARCH_PATHS = "";
 				INFOPLIST_FILE = SWKeyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				KEYMAN_ROOT = "$(SRCROOT)/../../..";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/oem/firstvoices/windows/src/xml/menuframe_hotkeys.png b/oem/firstvoices/windows/src/xml/menuframe_hotkeys.png
index 8bba89fd71..01872c7605 100644
Binary files a/oem/firstvoices/windows/src/xml/menuframe_hotkeys.png and b/oem/firstvoices/windows/src/xml/menuframe_hotkeys.png differ
diff --git a/oem/firstvoices/windows/src/xml/menuframe_keepintouch.png b/oem/firstvoices/windows/src/xml/menuframe_keepintouch.png
index fa701ce263..6f1227cb40 100644
Binary files a/oem/firstvoices/windows/src/xml/menuframe_keepintouch.png and b/oem/firstvoices/windows/src/xml/menuframe_keepintouch.png differ
diff --git a/oem/firstvoices/windows/src/xml/menuframe_keyboardlist.png b/oem/firstvoices/windows/src/xml/menuframe_keyboardlist.png
index 75bf8b867b..fbb2d8a13a 100644
Binary files a/oem/firstvoices/windows/src/xml/menuframe_keyboardlist.png and b/oem/firstvoices/windows/src/xml/menuframe_keyboardlist.png differ
diff --git a/oem/firstvoices/windows/src/xml/menuframe_options.png b/oem/firstvoices/windows/src/xml/menuframe_options.png
index 9ce4af2e69..d4d98a880d 100644
Binary files a/oem/firstvoices/windows/src/xml/menuframe_options.png and b/oem/firstvoices/windows/src/xml/menuframe_options.png differ
diff --git a/oem/firstvoices/windows/src/xml/menuframe_support.png b/oem/firstvoices/windows/src/xml/menuframe_support.png
index 70a0325caf..faa4ea1444 100644
Binary files a/oem/firstvoices/windows/src/xml/menuframe_support.png and b/oem/firstvoices/windows/src/xml/menuframe_support.png differ
diff --git a/oem/firstvoices/windows/src/xml/menuframe_update.png b/oem/firstvoices/windows/src/xml/menuframe_update.png
new file mode 100644
index 0000000000..bc70066b56
Binary files /dev/null and b/oem/firstvoices/windows/src/xml/menuframe_update.png differ
diff --git a/resources/build/builder.md b/resources/build/builder.md
index 2c6162dfc0..c815a9a22c 100644
--- a/resources/build/builder.md
+++ b/resources/build/builder.md
@@ -230,7 +230,7 @@ builder_describe \
 
 ## Constraining build targets by platform or tooling
 
-You can use [`builder_describe_platform`](#builderdescribeplatform-function) to
+You can use [`builder_describe_platform`] to
 constrain certain targets to only run on specific platforms or if specific
 toolchains are installed.
 
@@ -244,8 +244,8 @@ builder_parse "$@"
 ```
 
 If any parameters are invalid, the script will be terminated by
-[`builder_parse`](#builderparse-function) with an error and will print the
-script usage help using [`builder_display_usage`](#builderdisplayusage-function).
+[`builder_parse`] with an error and will print the script usage help using
+[`builder_display_usage`].
 
 # Build script actions
 
@@ -1069,7 +1069,7 @@ builder_run_action  test    builder_do_typescript_tests [coverage_threshold]
 
 ### Parameters
 
-* **coverage_threshold** optional, minimum coverage for c8 to pass tests, 
+* **coverage_threshold** optional, minimum coverage for c8 to pass tests,
   defaults to 90 (percent)
 
 --------------------------------------------------------------------------------
@@ -1098,22 +1098,23 @@ 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
-[`builder_describe`]: #builderdescribe-function
-[`builder_describe_outputs`]: #builderdescribeoutputs-function
-[`builder_describe_internal_dependency`]: #builderdescribeinternaldependency-function
-[`builder_display_usage`]: #builderdisplayusage-function
-[`$builder_extra_params`]: #builderextraparams-variable
-[`builder_finish_action`]: #builderfinishaction-function
-[`builder_has_action`]: #builderhasaction-function
-[`builder_has_option`]: #builderhasoption-function
-[`builder_parse`]: #builderparse-function
-[`builder_start_action`]: #builderstartaction-function
-[`builder_use_color`]: #builderusecolor-function
-[`$builder_verbose`]: #builderverbose-variable
+[`builder_describe`]: #builder_describe-function
+[`builder_describe_internal_dependency`]: #builder_describe_internal_dependency-function
+[`builder_describe_outputs`]: #builder_describe_outputs-function
+[`builder_describe_platform`]: #builder_describe_platform-function
+[`builder_display_usage`]: #builder_display_usage-function
+[`$builder_extra_params`]: #builder_extra_params-variable
+[`builder_finish_action`]: #builder_finish_action-function
+[`builder_has_action`]: #builder_has_action-function
+[`builder_has_option`]: #builder_has_option-function
+[`builder_parse`]: #builder_parse-function
+[`builder_start_action`]: #builder_start_action-function
+[`builder_use_color`]: #builder_use_color-function
+[`$builder_verbose`]: #builder_verbose-variable
 [formatting variables]: #formatting-variables
-[`builder_run_action`]: #builderrunaction-function
-[`builder_run_child_actions`]: #builderrunchildactions-function
-[`builder_echo`]: #builderecho-function
-[`builder_die`]: #builderdie-function
-[`builder_echo_debug`]: #builderechodebug-function
-[`builder_is_debug_build`]: #builderisdebugbuild-function
+[`builder_run_action`]: #builder_run_action-function
+[`builder_run_child_actions`]: #builder_run_child_actions-function
+[`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/web/.c8rc.json b/web/.c8rc.json
index f308b48487..070ef1b1d2 100644
--- a/web/.c8rc.json
+++ b/web/.c8rc.json
@@ -7,7 +7,17 @@
   "reporter": ["text", "text-summary"],
   "reports-dir": "build/coverage",
   "src": [
-    "**/src/",
+    "src/**",
     "../common/**/src"
+  ],
+  "include": [
+    "src/**"
+  ],
+  "exclude": [
+    "src/test/**",
+    "**/src/tests/**",
+    "**/build/**",
+    "src/tools/**",
+    "../node_modules/*"
   ]
 }
diff --git a/web/build.sh b/web/build.sh
index e6d9a5feb8..0dd9b5ef53 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -35,7 +35,7 @@ builder_describe "Builds engine modules for Keyman Engine for Web (KMW)." \
   ":engine/keyboard-storage  Subset used to collate keyboards and request them from the cloud" \
   ":engine/main              Builds all common code used by KMW's app/-level targets" \
   ":engine/osk               Builds the Web OSK module" \
-  ":engine/predictive-text=src/engine/predictive-text/worker-main     Builds KMW's predictive text module" \
+  ":engine/predictive-text   Builds KMW's predictive text module" \
   ":help                     Online documentation" \
   ":samples                  Builds all needed resources for the KMW sample-page set" \
   ":tools                    Builds engine-related development resources" \
@@ -141,12 +141,26 @@ test_action() {
 
 coverage_action() {
   builder_echo "Creating coverage report..."
-  cd "$KEYMAN_ROOT"
-  mkdir -p web/build/coverage/tmp
-  find . -type f -name coverage-\*.json -print0 | xargs -0 cp -t web/build/coverage/tmp
-  c8 report --config web/.c8rc.json ---reporter html --clean=false --reports-dir=web/build/coverage
-  rm -rf web/build/coverage/tmp
-  cd web
+
+  # Always ensure our collation folder is clean, just in case something went wrong on a prior run.
+  rm -rf build/coverage/tmp
+
+  # Also clean out the sub-report directories + main index.html; don't keep old ones if we fail!
+  rm -rf build/coverage/app
+  rm -rf build/coverage/engine
+  rm -f  build/coverage/index.html
+
+  # Collate the results into a single folder
+  mkdir build/coverage/tmp
+  find . -type f -name coverage-\*.json -print0 | xargs -0 cp -t build/coverage/tmp
+
+  # Note for maintainers:  the .c8rc.json config needs to be written from the perspective of
+  # the working directory - including its `include` and `exclude` entries.  All ignores and
+  # such must be redefined in whatever that top-level .c8rc.json is.
+  c8 report --reporter html
+
+  # No need to keep the collation folder around afterward; we can always redo that work.
+  rm -rf build/coverage/tmp
 }
 
 builder_run_child_actions build:engine/dom-utils
diff --git a/web/common.inc.sh b/web/common.inc.sh
index 429c9a9a8d..5b48464378 100644
--- a/web/common.inc.sh
+++ b/web/common.inc.sh
@@ -99,20 +99,11 @@ function test-headless() {
   fi
 
   TEST_OPTS=
-  TEST_CD_REQD=false
   if builder_has_option --ci; then
     TEST_OPTS="--reporter mocha-teamcity-reporter"
   fi
   if [[ -n "$TEST_EXTENSIONS" ]]; then
     TEST_OPTS="$TEST_OPTS --extension $TEST_EXTENSIONS"
-    TEST_CD_REQD=true
-  fi
-
-  if [ $TEST_CD_REQD ]; then
-    # The mocha config needed to live-compile TS-based tests only applies
-    # if the command is started within the appropriate subfolder.
-    pushd "${TEST_BASE}" > /dev/null
-    TEST_BASE=
   fi
 
   if [[ -e .c8rc.json ]]; then
@@ -120,10 +111,6 @@ function test-headless() {
   else
     mocha --recursive "${TEST_BASE}${TEST_FOLDER}" $TEST_OPTS
   fi
-
-  if [ $TEST_CD_REQD ]; then
-    popd > /dev/null
-  fi
 }
 
 # Runs all headless tests (written in typescript) corresponding to the
diff --git a/web/docs/engine/guide/examples/__manual-control.html b/web/docs/engine/guide/examples/__manual-control.html
index 9ccc74824c..4680400e4d 100644
--- a/web/docs/engine/guide/examples/__manual-control.html
+++ b/web/docs/engine/guide/examples/__manual-control.html
@@ -6,21 +6,16 @@
   <script type='text/javascript' src='js/laokeys_load.js'></script>
 
   <script type="text/javascript">
-
-    var KWControl = null;
-
     function SetupDocument()
     {
-      keyman.init();
-      KWControl = document.getElementById('KWControl');
-      keyman.setActiveKeyboard('laokeys');
-      keyman.osk.hide();
+      keyman.init().then(function() {
+        keyman.setActiveKeyboard('laokeys');
+        keyman.osk.hide();
+      });
     }
 
     function KWControlClick()
     {
-      var KWControl = document.getElementById('KWControl');
-
       if(keyman.osk.isEnabled()) {
         keyman.osk.hide();
       } else {
diff --git a/web/docs/engine/guide/examples/manual-control.md b/web/docs/engine/guide/examples/manual-control.md
index 2f0f57021a..1087c518c8 100644
--- a/web/docs/engine/guide/examples/manual-control.md
+++ b/web/docs/engine/guide/examples/manual-control.md
@@ -14,13 +14,12 @@ Include the following script in the HEAD of your page:
   function SetupDocument()
   {
     /* Make sure that Keyman is initialized (we can't guarantee initialization order) */
-    keyman.init();
-
-    KWControl = document.getElementById('KWControl');
-    /* Prevents automatic display of the onscreen keyboard. (default automatic) */
-    keyman.osk.hide();
-    /* Select the LaoKeys keyboard */
-    keyman.setActiveKeyboard('laokeys');
+    keyman.init().then(function () {
+      /* Prevents automatic display of the onscreen keyboard. (default automatic) */
+      keyman.osk.hide();
+      /* Select the LaoKeys keyboard */
+      keyman.setActiveKeyboard('laokeys');
+    });
   }
 
   /* KWControlClick: Called when user clicks on the KWControl IMG */
@@ -56,7 +55,7 @@ And finally, include the control img for KeymanWeb:
 
 ```html
 <!-- Display the KeymanWeb icon for the user to click on -->
-<img style="border: solid 1px black; padding: 2px 2px 3px 2px" src='kmicon.png' alt='KeymanWeb' onclick='KWControlClick()' id='KWControl' />
+<img style="border: solid 1px black; padding: 2px 2px 3px 2px" src='kmicon.png' alt='KeymanWeb' onclick='KWControlClick()' />
 ```
 
 ## API References
diff --git a/web/src/app/browser/.c8rc.json b/web/src/app/browser/.c8rc.json
new file mode 100644
index 0000000000..3e9bef1df0
--- /dev/null
+++ b/web/src/app/browser/.c8rc.json
@@ -0,0 +1,10 @@
+{
+  "check-coverage": false,
+  "clean": true,
+  "exclude-after-remap": true,
+  "reporter": ["text", "text-summary"],
+  "reports-dir": "../../../build/coverage/raw/app/browser",
+  "src": [
+    "src/"
+  ]
+}
\ No newline at end of file
diff --git a/web/src/app/browser/src/contextManager.ts b/web/src/app/browser/src/contextManager.ts
index c2254c1fdd..711a1b718e 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -759,7 +759,7 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     var v = cookie.load(decodeURIComponent);
 
     if(typeof(v.current) != 'string') {
-      return 'Keyboard_us:en';
+      return null;
     } else if(v.current == 'Keyboard_us:eng') {
       // 16.0 used the :eng variant!
       return 'Keyboard_us:en';
@@ -820,11 +820,14 @@ export default class ContextManager extends ContextManagerBase<BrowserConfigurat
     }
 
     // Find the matching stub; if it doesn't exist, default to the first available stub.
-    let stub = this.keyboardCache.getStub(t[0], t[1]) || this.keyboardCache.defaultStub;
+    let stub = this.keyboardCache.getStub(t[0], t[1]);
 
     // Sets the default stub (as specified with the `getSavedKeyboard` call) as active.
     if(stub) {
       this.activateKeyboard(t[0], t[1]);
+    } else {
+      const {id, langId} = this.getFallbackStubKey()
+      this.activateKeyboard(id, langId);
     }
   }
 
diff --git a/web/src/app/browser/src/debug-main.ts b/web/src/app/browser/src/debug-main.ts
index 2613cf3a11..4a2096d3d3 100644
--- a/web/src/app/browser/src/debug-main.ts
+++ b/web/src/app/browser/src/debug-main.ts
@@ -13,4 +13,4 @@ import { SourcemappedWorker } from '@keymanapp/lexical-model-layer/web'
  var sPath = ss.substr(0,ss.lastIndexOf('/')+1);
 
 // @ts-ignore
-window['keyman'] = new KeymanEngine(SourcemappedWorker.constructInstance(), sPath);
\ No newline at end of file
+window['keyman'] = new KeymanEngine(SourcemappedWorker, sPath);
\ No newline at end of file
diff --git a/web/src/app/browser/src/keymanEngine.ts b/web/src/app/browser/src/keymanEngine.ts
index 3c30740e81..dd53693ce5 100644
--- a/web/src/app/browser/src/keymanEngine.ts
+++ b/web/src/app/browser/src/keymanEngine.ts
@@ -27,6 +27,7 @@ import { UIModule } from './uiModuleInterface.js';
 import { HotkeyManager } from './hotkeyManager.js';
 import { BeepHandler } from './beepHandler.js';
 import KeyboardInterface from './keyboardInterface.js';
+import { WorkerFactory } from '@keymanapp/lexical-model-layer/web';
 
 export default class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, ContextManager, HardwareEventKeyboard> {
   touchLanguageMenu?: LanguageMenu;
@@ -55,10 +56,10 @@ export default class KeymanEngine extends KeymanEngineBase<BrowserConfiguration,
     this.contextManager.restoreLastActiveTarget();
   }
 
-  constructor(worker: Worker, sourceUri: string) {
+  constructor(workerFactory: WorkerFactory, sourceUri: string) {
     const config = new BrowserConfiguration(sourceUri);  // currently set to perform device auto-detect.
 
-    super(worker, config, new ContextManager(config, () => this.legacyAPIEvents), (engine) => {
+    super(workerFactory, config, new ContextManager(config, () => this.legacyAPIEvents), (engine) => {
       return {
         // The `engine` parameter cannot be supplied with the constructing instance before calling
         // `super`, hence the 'fun' rigging to supply it _from_ `super` via this closure.
@@ -203,7 +204,7 @@ export default class KeymanEngine extends KeymanEngineBase<BrowserConfiguration,
 
     // Capture the saved-keyboard string now, before we load any keyboards/stubs
     // or do anything that would mutate the value.
-    const savedKeyboardStr = this.contextManager.getSavedKeyboardRaw();
+    let savedKeyboardStr = this.contextManager.getSavedKeyboardRaw();
 
     if(device.touchable) {
       this.osk = new views.AnchoredOSKView(this);
@@ -228,12 +229,17 @@ export default class KeymanEngine extends KeymanEngineBase<BrowserConfiguration,
     // Let any deferred, pre-init stubs complete registration
     await Promise.resolve();
 
-    // Attempt to restore the user's last-used keyboard from their previous session.
-    //
-    // Note:  any cloud stubs will probably not be available yet.
-    // If we tracked cloud requests and awaited a Promise.all on pending queries,
-    // we could handle that too.
-    this.contextManager.restoreSavedKeyboard(savedKeyboardStr);
+    // If there's no value here, we should check to see if `Keyboard_us:en`
+    // is one of the available stubs; we default to that if it's available.
+    savedKeyboardStr ||= this.contextManager.getSavedKeyboard();
+    if(savedKeyboardStr) {
+      // Attempt to restore the user's last-used keyboard from their previous session.
+      //
+      // Note:  any cloud stubs will probably not be available yet.
+      // If we tracked cloud requests and awaited a Promise.all on pending queries,
+      // we could handle that too.
+      this.contextManager.restoreSavedKeyboard(savedKeyboardStr);
+    }
 
     await Promise.resolve();
   }
diff --git a/web/src/app/browser/src/release-main.ts b/web/src/app/browser/src/release-main.ts
index 62fefb5ad2..01b318c714 100644
--- a/web/src/app/browser/src/release-main.ts
+++ b/web/src/app/browser/src/release-main.ts
@@ -13,4 +13,4 @@ import { Worker } from '@keymanapp/lexical-model-layer/web'
  var sPath = ss.substr(0,ss.lastIndexOf('/')+1);
 
 // @ts-ignore
-window['keyman'] = new KeymanEngine(Worker.constructInstance(), sPath);
\ No newline at end of file
+window['keyman'] = new KeymanEngine(Worker, sPath);
\ No newline at end of file
diff --git a/web/src/app/ui/kmwuibutton.ts b/web/src/app/ui/kmwuibutton.ts
index 5bdb01dff8..d3b55d7036 100644
--- a/web/src/app/ui/kmwuibutton.ts
+++ b/web/src/app/ui/kmwuibutton.ts
@@ -5,9 +5,20 @@
 
 import type { KeymanEngine, UIModule } from 'keyman/app/browser';
 
-declare var keyman: KeymanEngine
+declare global {
+  interface Window {
+    keyman: KeymanEngine
+  }
+}
 
-if(!keyman?.ui?.name) {
+const keymanweb=window.keyman;
+
+// If a UI module has been loaded, we can rely on the publically-published 'name' property
+// having been set as a way to short-out a UI reload.  Its parent object always exists by
+// this point in the build process.
+if(!keymanweb) {
+  throw new Error("`keyman` global is missing; Keyman Engine for Web script has not been loaded");
+} else if(!keymanweb.ui?.name) {
 
   /********************************/
   /*                              */
@@ -26,7 +37,6 @@ if(!keyman?.ui?.name) {
 
   try {
     // Declare KeymanWeb, OnScreen keyboard and Util objects
-    const keymanweb = keyman;
     const util=keymanweb.util;
     // var dbg=keymanweb['debug'];
 
diff --git a/web/src/app/ui/kmwuifloat.ts b/web/src/app/ui/kmwuifloat.ts
index 8d06534ad7..b2743f2953 100644
--- a/web/src/app/ui/kmwuifloat.ts
+++ b/web/src/app/ui/kmwuifloat.ts
@@ -5,12 +5,20 @@
 
 import type { KeymanEngine, UIModule } from 'keyman/app/browser';
 
-declare var keyman: KeymanEngine
+declare global {
+  interface Window {
+    keyman: KeymanEngine
+  }
+}
+
+const keymanweb=window.keyman;
 
 // If a UI module has been loaded, we can rely on the publically-published 'name' property
 // having been set as a way to short-out a UI reload.  Its parent object always exists by
 // this point in the build process.
-if(!keyman?.ui?.name) {
+if(!keymanweb) {
+  throw new Error("`keyman` global is missing; Keyman Engine for Web script has not been loaded");
+} else if(!keymanweb.ui?.name) {
   /********************************/
   /*                              */
   /* Floating User Interface      */
@@ -29,7 +37,6 @@ if(!keyman?.ui?.name) {
   try {
 
     // Declare KeymanWeb, OnScreen keyboard and Util objects
-    const keymanweb = keyman;
     const util=keymanweb.util;
 
     // Disable UI for touch devices
diff --git a/web/src/app/ui/kmwuitoggle.ts b/web/src/app/ui/kmwuitoggle.ts
index e354b0c97e..f5a234471a 100644
--- a/web/src/app/ui/kmwuitoggle.ts
+++ b/web/src/app/ui/kmwuitoggle.ts
@@ -6,7 +6,11 @@
 import type { KeymanEngine, KeyboardCookie, UIModule } from 'keyman/app/browser';
 import type { FloatingOSKViewCookie } from 'keyman/engine/osk';
 
-declare var keyman: KeymanEngine
+declare global {
+  interface Window {
+    keyman: KeymanEngine
+  }
+}
 
 type KeyboardMenuEntry = {
   _InternalName: string,
@@ -18,10 +22,14 @@ interface Owned<T> {
   _owningObject?: T;
 }
 
+const keymanweb=window.keyman;
+
 // If a UI module has been loaded, we can rely on the publically-published 'name' property
 // having been set as a way to short-out a UI reload.  Its parent object always exists by
 // this point in the build process.
-if(!keyman?.ui?.name) {
+if(!keymanweb) {
+  throw new Error("`keyman` global is missing; Keyman Engine for Web script has not been loaded");
+} else if(!keymanweb.ui?.name) {
   /********************************/
   /*                              */
   /* Toggle User Interface Code   */
@@ -39,7 +47,6 @@ if(!keyman?.ui?.name) {
 
   try {
     // Declare KeymanWeb, OnScreen Keyboard and Util objects
-    const keymanweb = keyman;
     //var dbg=keymanweb['debug'];
     const util = keymanweb.util;
 
diff --git a/web/src/app/ui/kmwuitoolbar.ts b/web/src/app/ui/kmwuitoolbar.ts
index bf1cd6b8f2..b4aea5f80b 100644
--- a/web/src/app/ui/kmwuitoolbar.ts
+++ b/web/src/app/ui/kmwuitoolbar.ts
@@ -5,7 +5,11 @@
 
 import type { KeymanEngine, KeyboardCookie, UIModule } from 'keyman/app/browser';
 
-declare var keyman: KeymanEngine
+declare global {
+  interface Window {
+    keyman: KeymanEngine
+  }
+}
 
 type MapRegion = {
   /** The title of the region */
@@ -50,10 +54,14 @@ interface ListedKeyboard {
   aNode: HTMLAnchorElement;
 }
 
+const keymanweb=window.keyman;
+
 // If a UI module has been loaded, we can rely on the publically-published 'name' property
 // having been set as a way to short-out a UI reload.  Its parent object always exists by
 // this point in the build process.
-if(!keyman?.ui?.name) {
+if(!keymanweb) {
+  throw new Error("`keyman` global is missing; Keyman Engine for Web script has not been loaded");
+} else if(!keymanweb.ui?.name) {
   /********************************/
   /*                              */
   /* Toolbar User Interface       */
@@ -71,7 +79,6 @@ if(!keyman?.ui?.name) {
 
   try {
     // Declare KeymanWeb, OnScreen keyboard and Util objects
-    const keymanweb=keyman;
     const util=keymanweb.util;
 
     // Disable UI for touch devices
diff --git a/web/src/app/webview/src/debug-main.ts b/web/src/app/webview/src/debug-main.ts
index d903a9d536..3e7c7270ec 100644
--- a/web/src/app/webview/src/debug-main.ts
+++ b/web/src/app/webview/src/debug-main.ts
@@ -13,4 +13,4 @@ const ss = scripts[scripts.length-1].src;
 const sPath = ss.substring(0,ss.lastIndexOf('/')+1);
 
 // @ts-ignore
-window['keyman'] = new KeymanEngine(SourcemappedWorker.constructInstance(), sPath);
\ No newline at end of file
+window['keyman'] = new KeymanEngine(SourcemappedWorker, sPath);
\ No newline at end of file
diff --git a/web/src/app/webview/src/keymanEngine.ts b/web/src/app/webview/src/keymanEngine.ts
index d390a6ce1b..1d7088f7ed 100644
--- a/web/src/app/webview/src/keymanEngine.ts
+++ b/web/src/app/webview/src/keymanEngine.ts
@@ -9,12 +9,13 @@ import { WebviewConfiguration, WebviewInitOptionDefaults, WebviewInitOptionSpec
 import ContextManager, { ContextHost } from './contextManager.js';
 import PassthroughKeyboard from './passthroughKeyboard.js';
 import { buildEmbeddedGestureConfig, setupEmbeddedListeners } from './oskConfiguration.js';
+import { WorkerFactory } from '@keymanapp/lexical-model-layer';
 
 export default class KeymanEngine extends KeymanEngineBase<WebviewConfiguration, ContextManager, PassthroughKeyboard> {
   // Ideally, we would be able to auto-detect `sourceUri`: https://stackoverflow.com/a/60244278.
   // But it's too new of a feature to utilize... and also expects to be in a module, when this may
   // be compiled down to an IIFE.
-  constructor(worker: Worker, sourceUri: string) {
+  constructor(workerFactory: WorkerFactory, sourceUri: string) {
     const config = new WebviewConfiguration(sourceUri);  // currently set to perform device auto-detect.
 
     config.onRuleFinalization = (ruleBehavior: RuleBehavior) => {
@@ -30,7 +31,7 @@ export default class KeymanEngine extends KeymanEngineBase<WebviewConfiguration,
       }
     }
 
-    super(worker, config, new ContextManager(config), (engine) => {
+    super(workerFactory, config, new ContextManager(config), (engine) => {
       return {
         // The `engine` parameter cannot be supplied with the constructing instance before calling
         // `super`, hence the 'fun' rigging to supply it _from_ `super` via this closure.
diff --git a/web/src/app/webview/src/release-main.ts b/web/src/app/webview/src/release-main.ts
index e594e0b70f..fd8bcd8dce 100644
--- a/web/src/app/webview/src/release-main.ts
+++ b/web/src/app/webview/src/release-main.ts
@@ -13,4 +13,4 @@ const ss = scripts[scripts.length-1].src;
 const sPath = ss.substring(0,ss.lastIndexOf('/')+1);
 
 // @ts-ignore
-window['keyman'] = new KeymanEngine(Worker.constructInstance(), sPath);
\ No newline at end of file
+window['keyman'] = new KeymanEngine(Worker, sPath);
\ No newline at end of file
diff --git a/web/src/engine/attachment/.c8rc.json b/web/src/engine/attachment/.c8rc.json
index c789716cd5..eea63036d2 100644
--- a/web/src/engine/attachment/.c8rc.json
+++ b/web/src/engine/attachment/.c8rc.json
@@ -3,7 +3,7 @@
   "clean": true,
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../build/coverage/raw/engine/attachment",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/common/web-utils/.c8rc.json b/web/src/engine/common/web-utils/.c8rc.json
index 16a4e93b9c..4c652ff892 100644
--- a/web/src/engine/common/web-utils/.c8rc.json
+++ b/web/src/engine/common/web-utils/.c8rc.json
@@ -10,7 +10,7 @@
   ],
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../build/coverage/raw/raw/engine/common/web-utils",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/events/.c8rc.json b/web/src/engine/events/.c8rc.json
index c789716cd5..65dd2858d4 100644
--- a/web/src/engine/events/.c8rc.json
+++ b/web/src/engine/events/.c8rc.json
@@ -3,7 +3,7 @@
   "clean": true,
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../build/coverage/raw/engine/events",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/interfaces/.c8rc.json b/web/src/engine/interfaces/.c8rc.json
index c42b096f68..ebcb215dba 100644
--- a/web/src/engine/interfaces/.c8rc.json
+++ b/web/src/engine/interfaces/.c8rc.json
@@ -3,7 +3,7 @@
   "clean": true,
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "../../../build/engine/interfaces/coverage",
+  "reports-dir": "../../../build/coverage/raw/engine/interfaces",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/keyboard-storage/.c8rc.json b/web/src/engine/keyboard-storage/.c8rc.json
index c789716cd5..396d0ddcc5 100644
--- a/web/src/engine/keyboard-storage/.c8rc.json
+++ b/web/src/engine/keyboard-storage/.c8rc.json
@@ -3,7 +3,7 @@
   "clean": true,
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../build/coverage/raw/engine/keyboard-storage",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/keyboard/.c8rc.json b/web/src/engine/keyboard/.c8rc.json
index ceca963e15..b6bd4a818f 100644
--- a/web/src/engine/keyboard/.c8rc.json
+++ b/web/src/engine/keyboard/.c8rc.json
@@ -8,7 +8,7 @@
   ],
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../build/coverage/raw/engine/keyboard",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/main/build.sh b/web/src/engine/main/build.sh
index 705bfbb902..8d6e39e0d2 100755
--- a/web/src/engine/main/build.sh
+++ b/web/src/engine/main/build.sh
@@ -49,6 +49,4 @@ do_build () {
 builder_run_action configure verify_npm_setup
 builder_run_action clean rm -rf "$KEYMAN_ROOT/web/build/$SUBPROJECT_NAME"
 builder_run_action build do_build
-
-# No headless tests for this child project.  Currently, DOM-based unit &
-# integrated tests are run solely by the top-level $KEYMAN_ROOT/web project.
\ No newline at end of file
+builder_run_action test test-headless "${SUBPROJECT_NAME}"
\ No newline at end of file
diff --git a/web/src/engine/main/src/headless/inputProcessor.ts b/web/src/engine/main/src/headless/inputProcessor.ts
index c13a0bf00a..2a21ec2b92 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -20,6 +20,7 @@ import {
 
 import { TranscriptionCache } from "./transcriptionCache.js";
 import { LexicalModelTypes } from '@keymanapp/common-types';
+import { WorkerFactory } from "@keymanapp/lexical-model-layer";
 
 export class InputProcessor {
   public static readonly DEFAULT_OPTIONS: ProcessorInitOptions = {
@@ -37,7 +38,7 @@ export class InputProcessor {
 
   private readonly contextCache = new TranscriptionCache();
 
-  constructor(device: DeviceSpec, predictiveTextWorker: Worker, options?: ProcessorInitOptions) {
+  constructor(device: DeviceSpec, predictiveWorkerFactory: WorkerFactory, options?: ProcessorInitOptions) {
     if(!device) {
       throw new Error('device must be defined');
     }
@@ -48,7 +49,7 @@ export class InputProcessor {
 
     this.contextDevice = device;
     this.kbdProcessor = new KeyboardProcessor(device, options);
-    this.lngProcessor = new LanguageProcessor(predictiveTextWorker, this.contextCache);
+    this.lngProcessor = new LanguageProcessor(predictiveWorkerFactory, this.contextCache);
   }
 
   public get languageProcessor(): LanguageProcessor {
diff --git a/web/src/engine/main/src/headless/languageProcessor.ts b/web/src/engine/main/src/headless/languageProcessor.ts
index 6783e344c9..b4b1f74797 100644
--- a/web/src/engine/main/src/headless/languageProcessor.ts
+++ b/web/src/engine/main/src/headless/languageProcessor.ts
@@ -1,5 +1,5 @@
 import { EventEmitter } from "eventemitter3";
-import { LMLayer } from "@keymanapp/lexical-model-layer/web";
+import { LMLayer, WorkerFactory } from "@keymanapp/lexical-model-layer/web";
 import { OutputTarget, Transcription, Mock } from "keyman/engine/js-processor";
 import { LanguageProcessorEventMap, ModelSpec, StateChangeEnum, ReadySuggestions } from 'keyman/engine/interfaces';
 import ContextWindow from "./contextWindow.js";
@@ -25,7 +25,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
 
   private _state: StateChangeEnum = 'inactive';
 
-  public constructor(predictiveTextWorker: Worker, transcriptionCache: TranscriptionCache, supportsRightDeletions: boolean = false) {
+  public constructor(predictiveWorkerFactory: WorkerFactory, transcriptionCache: TranscriptionCache, supportsRightDeletions: boolean = false) {
     super();
 
     this.recentTranscriptions = transcriptionCache;
@@ -38,11 +38,21 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
       maxRightContextCodePoints: supportsRightDeletions ? 0 : 64
     }
 
-    if(!predictiveTextWorker) {
+    if(!predictiveWorkerFactory) {
       return;
     }
 
-    this.lmEngine = new LMLayer(capabilities, predictiveTextWorker);
+    let workerInstance: Worker;
+    try {
+      workerInstance = predictiveWorkerFactory?.constructInstance();
+    } catch(e) {
+      // We can condition on `lmEngine` being null/undefined.
+      console.warn('Web workers are not available: ' + (e ?? '').toString());
+      workerInstance = null;
+    }
+    if(workerInstance) {
+      this.lmEngine = new LMLayer(capabilities, workerInstance);
+    }
   }
 
   public get activeModel(): ModelSpec {
@@ -58,6 +68,10 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
   }
 
   public unloadModel() {
+    if(!this.isActive) {
+      return;
+    }
+
     this.lmEngine.unloadModel();
     delete this.currentModel;
     delete this.configuration;
@@ -71,6 +85,10 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
       throw new Error("Null reference not allowed.");
     }
 
+    if(!this.canEnable) {
+      return Promise.resolve();
+    }
+
     let specType: 'file'|'raw' = model.path ? 'file' : 'raw';
     let source = specType == 'file' ? model.path : model.code;
 
@@ -108,9 +126,6 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
   }
 
   public invalidateContext(outputTarget: OutputTarget, layerId: string): Promise<Suggestion[]> {
-    // Signal to any predictive text UI that the context has changed, invalidating recent predictions.
-    this.emit('invalidatesuggestions', 'context');
-
     // If there's no active model, there can be no predictions.
     // We'll also be missing important data needed to even properly REQUEST the predictions.
     if(!this.currentModel || !this.configuration) {
@@ -121,7 +136,12 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
     // invalidateContext otherwise bypasses .predict()'s check against this.
     if(!this.isActive) {
       return Promise.resolve([]);
-    } else if(outputTarget) {
+    }
+
+    // Signal to any predictive text UI that the context has changed, invalidating recent predictions.
+    this.emit('invalidatesuggestions', 'context');
+
+    if(outputTarget) {
       let transcription = outputTarget.buildTranscriptionFrom(outputTarget, null, false);
       return this.predict_internal(transcription, true, layerId);
     } else {
@@ -173,6 +193,10 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
       throw "Accepting suggestions requires a destination OutputTarget instance."
     }
 
+    if(!this.isActive) {
+      return null;
+    }
+
     if(!this.isConfigured) {
       // If we're in this state, the suggestion is now outdated; the user must have swapped keyboard and model.
       console.warn("Could not apply suggestion; the corresponding model has been unloaded");
@@ -244,6 +268,10 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
       throw "Accepting suggestions requires a destination OutputTarget instance."
     }
 
+    if(!this.isActive) {
+      return null;
+    }
+
     // Find the state of the context at the time the suggestion was generated.
     // This may refer to the context before an input keystroke or before application
     // of a predictive suggestion.
@@ -278,7 +306,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
   }
 
   public predictFromTarget(outputTarget: OutputTarget, layerId: string): Promise<Suggestion[]> {
-    if(!outputTarget) {
+    if(!this.isActive || !outputTarget) {
       return null;
     }
 
@@ -292,7 +320,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
    * @param transcription The triggering transcription (if it exists)
    */
   private predict_internal(transcription: Transcription, resetContext: boolean, layerId: string): Promise<Suggestion[]> {
-    if(!transcription) {
+    if(!this.isActive || !transcription) {
       return null;
     }
 
@@ -341,19 +369,19 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
   }
 
   public shutdown() {
-    this.lmEngine.shutdown();
+    this.lmEngine?.shutdown();
     this.removeAllListeners();
   }
 
   public get isActive(): boolean {
-    if(!this.canEnable()) {
+    if(!this.canEnable) {
       this._mayPredict = false;
       return false;
     }
     return (this.activeModel || false) && this._mayPredict;
   }
 
-  canEnable(): boolean {
+  public get canEnable(): boolean {
     // Is not initialized if there is no worker.
     return !!this.lmEngine;
   }
@@ -363,7 +391,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
   }
 
   public set mayPredict(flag: boolean) {
-    if(!this.canEnable()) {
+    if(!this.canEnable) {
       return;
     }
 
@@ -416,6 +444,10 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
   }
 
   public tryAcceptSuggestion(source: string): boolean {
+    if(!this.isActive) {
+      return false;
+    }
+
     // The object below is to facilitate a pass-by-reference on the boolean flag,
     // allowing the event's handler to signal if whitespace has been added via
     // auto-applied suggestion that should be blocked on the next keystroke.
@@ -426,6 +458,10 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
   }
 
   public tryRevertSuggestion(): boolean {
+    if(!this.isActive) {
+      return false;
+    }
+
     // If and when we do auto-revert, the suggestion is to pass this object to the event and
     // denote any mutations to the contained value.
     //let returnObj = {shouldSwallow: false};
diff --git a/web/src/engine/main/src/keymanEngine.ts b/web/src/engine/main/src/keymanEngine.ts
index beced96d18..8ef53a9008 100644
--- a/web/src/engine/main/src/keymanEngine.ts
+++ b/web/src/engine/main/src/keymanEngine.ts
@@ -1,6 +1,7 @@
 import { type KeyEvent, type Keyboard, KeyboardKeymanGlobal } from "keyman/engine/keyboard";
 import { OutputTarget, ProcessorInitOptions, RuleBehavior } from 'keyman/engine/js-processor';
 import { DOMKeyboardLoader as KeyboardLoader } from "keyman/engine/keyboard/dom-keyboard-loader";
+import { WorkerFactory } from "@keymanapp/lexical-model-layer/web"
 import { InputProcessor } from './headless/inputProcessor.js';
 import { OSKView } from "keyman/engine/osk";
 import { KeyboardRequisitioner, ModelCache, toUnprefixedKeyboardId as unprefixed } from "keyman/engine/keyboard-storage";
@@ -112,7 +113,7 @@ export default class KeymanEngine<
    *                                   the superclass constructor.
    */
   constructor(
-    worker: Worker,
+    workerFactory: WorkerFactory,
     config: Configuration,
     contextManager: ContextManager,
     processorConfigInitializer: (engine: KeymanEngine<Configuration, ContextManager, HardKeyboard>) => ProcessorConfiguration
@@ -123,7 +124,7 @@ export default class KeymanEngine<
     const processorConfiguration = processorConfigInitializer(this);
     processorConfiguration.baseLayout = determineBaseLayout();
     this.interface = processorConfiguration.keyboardInterface as KeyboardInterface<ContextManager>;
-    this.core = new InputProcessor(config.hostDevice, worker, processorConfiguration);
+    this.core = new InputProcessor(config.hostDevice, workerFactory, processorConfiguration);
 
     this.core.languageProcessor.on('statechange', (state) => {
       // The banner controller cannot directly trigger a layout-refresh at this time,
diff --git a/web/src/engine/osk/gesture-processor/.c8rc.json b/web/src/engine/osk/gesture-processor/.c8rc.json
index 719cd11dae..24afdfdddf 100644
--- a/web/src/engine/osk/gesture-processor/.c8rc.json
+++ b/web/src/engine/osk/gesture-processor/.c8rc.json
@@ -11,7 +11,7 @@
     "src/engine/headless/*"
   ],
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../../build/coverage/raw/engine/osk/gesture-processor",
   "src": [
     "src/engine/headless/*"
   ]
diff --git a/web/src/engine/predictive-text/build.sh b/web/src/engine/predictive-text/build.sh
index 677d8b2269..015c0ea3be 100755
--- a/web/src/engine/predictive-text/build.sh
+++ b/web/src/engine/predictive-text/build.sh
@@ -53,7 +53,6 @@ builder_run_child_actions configure
 ## Build actions
 
 builder_run_child_actions build:wordbreakers
-
 builder_run_child_actions build:templates
 builder_run_child_actions build:worker-thread
 builder_run_child_actions build:worker-main
diff --git a/web/src/engine/predictive-text/templates/.c8rc.json b/web/src/engine/predictive-text/templates/.c8rc.json
index d107a1cacb..b938594fb2 100644
--- a/web/src/engine/predictive-text/templates/.c8rc.json
+++ b/web/src/engine/predictive-text/templates/.c8rc.json
@@ -7,7 +7,7 @@
   ],
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../../build/coverage/raw/engine/predictive-text/templates",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/predictive-text/wordbreakers/.c8rc.json b/web/src/engine/predictive-text/wordbreakers/.c8rc.json
index 6a0e2589da..c2ea18e238 100644
--- a/web/src/engine/predictive-text/wordbreakers/.c8rc.json
+++ b/web/src/engine/predictive-text/wordbreakers/.c8rc.json
@@ -7,7 +7,7 @@
   ],
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../../build/coverage/raw/engine/predictive-text/wordbreakers",
   "src": [
     "src/"
   ]
diff --git a/web/src/engine/predictive-text/worker-main/src/index.ts b/web/src/engine/predictive-text/worker-main/src/index.ts
index e087e6957d..98a9dd9101 100644
--- a/web/src/engine/predictive-text/worker-main/src/index.ts
+++ b/web/src/engine/predictive-text/worker-main/src/index.ts
@@ -1,3 +1,7 @@
 export { default as LMLayer } from './lmlayer.js';
 export { default as NodeWorker } from './node/worker.js';
-export { default as WebWorker } from './web/worker.js';
\ No newline at end of file
+export { default as WebWorker } from './web/worker.js';
+
+export interface WorkerFactory {
+  constructInstance(): Worker
+}
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-main/src/node/index.ts b/web/src/engine/predictive-text/worker-main/src/node/index.ts
index 1a70a48bf3..3393c22b81 100644
--- a/web/src/engine/predictive-text/worker-main/src/node/index.ts
+++ b/web/src/engine/predictive-text/worker-main/src/node/index.ts
@@ -1,3 +1,7 @@
 export { default as LMLayer } from '../lmlayer.js';
 export { default as Worker } from './worker.js';
-export { default as SourcemappedWorker } from './sourcemappedWorker.js';
\ No newline at end of file
+export { default as SourcemappedWorker } from './sourcemappedWorker.js';
+
+export interface WorkerFactory {
+    constructInstance(): Worker
+  }
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-main/src/node/worker.ts b/web/src/engine/predictive-text/worker-main/src/node/worker.ts
index 5ad04e55d0..aafb2c4869 100644
--- a/web/src/engine/predictive-text/worker-main/src/node/worker.ts
+++ b/web/src/engine/predictive-text/worker-main/src/node/worker.ts
@@ -6,6 +6,10 @@ import { LMLayerWorkerCode, LMLayerWorkerSourcemapComment } from "@keymanapp/lm-
 export default class Worker {
   static constructInstance(): Worker {
     let scriptStr = unwrap(LMLayerWorkerCode);
+    const srcMapUrlIndex = scriptStr.indexOf("//# sourceMappingURL")
+    if(srcMapUrlIndex > 0) {
+      scriptStr = scriptStr.substring(0, srcMapUrlIndex);
+    }
 
     scriptStr += '\n' + LMLayerWorkerSourcemapComment;
     let worker = new MappedWorker(scriptStr);
diff --git a/web/src/engine/predictive-text/worker-main/src/web/index.ts b/web/src/engine/predictive-text/worker-main/src/web/index.ts
index 1a70a48bf3..f133f6f2f8 100644
--- a/web/src/engine/predictive-text/worker-main/src/web/index.ts
+++ b/web/src/engine/predictive-text/worker-main/src/web/index.ts
@@ -1,3 +1,7 @@
 export { default as LMLayer } from '../lmlayer.js';
 export { default as Worker } from './worker.js';
-export { default as SourcemappedWorker } from './sourcemappedWorker.js';
\ No newline at end of file
+export { default as SourcemappedWorker } from './sourcemappedWorker.js';
+
+export interface WorkerFactory {
+  constructInstance(): Worker
+}
\ No newline at end of file
diff --git a/web/src/engine/predictive-text/worker-thread/.c8rc.json b/web/src/engine/predictive-text/worker-thread/.c8rc.json
index b66bb5b106..f30fb6465e 100644
--- a/web/src/engine/predictive-text/worker-thread/.c8rc.json
+++ b/web/src/engine/predictive-text/worker-thread/.c8rc.json
@@ -7,7 +7,7 @@
   ],
   "exclude-after-remap": true,
   "reporter": ["text", "text-summary"],
-  "reports-dir": "build/coverage",
+  "reports-dir": "../../../../build/coverage/raw/engine/predictive-text/worker-thread",
   "src": [
     "src/main"
   ]
diff --git a/web/src/test/auto/dom/web-test-runner.CI.config.mjs b/web/src/test/auto/dom/web-test-runner.CI.config.mjs
index d18a8a9cb0..2ce3711078 100644
--- a/web/src/test/auto/dom/web-test-runner.CI.config.mjs
+++ b/web/src/test/auto/dom/web-test-runner.CI.config.mjs
@@ -9,5 +9,6 @@ export default {
   reporters: [
     teamcityReporter(), /* custom-written, for CI-friendly reports */
     sessionStabilityReporter({ciMode: true})
-  ]
+  ],
+  concurrency: 1
 }
\ No newline at end of file
diff --git a/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js b/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
index 9aa9cd8015..6ec7a0bbd9 100644
--- a/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
+++ b/web/src/test/auto/headless/engine/interfaces/prediction/predictionContext.tests.js
@@ -64,18 +64,17 @@ function dummiedGetLayer() {
 }
 
 describe("PredictionContext", () => {
-  let worker;
+  let langProcessor;
 
   beforeEach(function() {
-    worker = LMWorker.constructInstance();
+    langProcessor = new LanguageProcessor(LMWorker, new TranscriptionCache());
   });
 
   afterEach(function() {
-    worker.terminate();
+    langProcessor.shutdown();
   });
 
   it('receives predictions as they are generated', async function () {
-    const langProcessor = new LanguageProcessor(worker, new TranscriptionCache());
     await langProcessor.loadModel(appleDummyModel);  // await:  must fully 'configure', load script into worker.
 
     const predictiveContext = new PredictionContext(langProcessor, dummiedGetLayer);
@@ -115,7 +114,6 @@ describe("PredictionContext", () => {
   });
 
   it('ignores outdated predictions', async function () {
-    const langProcessor = new LanguageProcessor(worker, new TranscriptionCache());
     await langProcessor.loadModel(appleDummyModel);  // await:  must fully 'configure', load script into worker.
 
     const predictiveContext = new PredictionContext(langProcessor, dummiedGetLayer);
@@ -179,7 +177,6 @@ describe("PredictionContext", () => {
   });
 
   it('sendUpdateState retrieves the most recent suggestion set', async function() {
-    const langProcessor = new LanguageProcessor(worker, new TranscriptionCache());
     await langProcessor.loadModel(appleDummyModel);  // await:  must fully 'configure', load script into worker.
 
     const predictiveContext = new PredictionContext(langProcessor, dummiedGetLayer);
@@ -204,7 +201,6 @@ describe("PredictionContext", () => {
   });
 
   it('suggestion application logic & triggered effects', async function () {
-    const langProcessor = new LanguageProcessor(worker, new TranscriptionCache());
     await langProcessor.loadModel(appleDummyModel);  // await:  must fully 'configure', load script into worker.
 
     const predictiveContext = new PredictionContext(langProcessor, dummiedGetLayer);
@@ -271,7 +267,6 @@ describe("PredictionContext", () => {
   });
 
   it('reversion application logic & triggered effects', async function () {
-    const langProcessor = new LanguageProcessor(worker, new TranscriptionCache());
     await langProcessor.loadModel(appleDummyModel);  // await:  must fully 'configure', load script into worker.
 
     const predictiveContext = new PredictionContext(langProcessor, dummiedGetLayer);
diff --git a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
index 68eb5136e3..09780444d9 100644
--- a/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/basic-engine.tests.js
@@ -1,6 +1,7 @@
 import { assert } from 'chai';
 import fs from 'fs';
 
+
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
@@ -9,6 +10,9 @@ import { KeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
+import { env } from 'node:process';
+const KEYMAN_ROOT = env.KEYMAN_ROOT;
+
 describe('Engine - Basic Simulation', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/basic_lao_simulation.json'));
   // Common test suite setup.
@@ -25,7 +29,7 @@ describe('Engine - Basic Simulation', function() {
   before(async function() {
     // -- START: Standard Recorder-based unit test loading boilerplate --
     let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
-    let keyboard = await keyboardLoader.loadKeyboardFromPath('../../../../../common/test/' + testSuite.keyboard.filename);
+    let keyboard = await keyboardLoader.loadKeyboardFromPath(KEYMAN_ROOT + '/common/test/' + testSuite.keyboard.filename);
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
 
diff --git a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
index c2220b7f5d..e8a3e30f9e 100644
--- a/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/chirality.tests.js
@@ -10,6 +10,9 @@ import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader'
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 import { ModifierKeyConstants } from '@keymanapp/common-types';
 
+import { env } from 'node:process';
+const KEYMAN_ROOT = env.KEYMAN_ROOT;
+
 describe('Engine - Chirality', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/chirality.json'));
   // Common test suite setup.
@@ -26,7 +29,7 @@ describe('Engine - Chirality', function() {
   before(async function() {
     // -- START: Standard Recorder-based unit test loading boilerplate --
     let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
-    let keyboard = await keyboardLoader.loadKeyboardFromPath('../../../../../common/test/' + testSuite.keyboard.filename);
+    let keyboard = await keyboardLoader.loadKeyboardFromPath(KEYMAN_ROOT + '/common/test/' + testSuite.keyboard.filename);
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
 
diff --git a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
index fd5d1457d3..007a4ec9ec 100644
--- a/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/deadkeys.tests.js
@@ -9,6 +9,9 @@ import { KeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
+import { env } from 'node:process';
+const KEYMAN_ROOT = env.KEYMAN_ROOT;
+
 describe('Engine - Deadkeys', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/deadkeys.json'));
   // Common test suite setup.
@@ -25,7 +28,7 @@ describe('Engine - Deadkeys', function() {
   before(async function() {
     // -- START: Standard Recorder-based unit test loading boilerplate --
     let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
-    let keyboard = await keyboardLoader.loadKeyboardFromPath('../../../../../common/test/' + testSuite.keyboard.filename);
+    let keyboard = await keyboardLoader.loadKeyboardFromPath(KEYMAN_ROOT + '/common/test/' + testSuite.keyboard.filename);
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
 
diff --git a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
index 8bfee041eb..fd2536ec22 100644
--- a/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
+++ b/web/src/test/auto/headless/engine/js-processor/engine/unmatched_final_group.tests.js
@@ -9,6 +9,9 @@ import { KeyboardInterface } from 'keyman/engine/js-processor';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { KeyboardTest, NodeProctor } from '@keymanapp/recorder-core';
 
+import { env } from 'node:process';
+const KEYMAN_ROOT = env.KEYMAN_ROOT;
+
 describe('Engine - Unmatched Final Groups', function() {
   let testJSONtext = fs.readFileSync(require.resolve('@keymanapp/common-test-resources/json/engine_tests/ghp_enter.json'));
   // Common test suite setup.
@@ -24,7 +27,7 @@ describe('Engine - Unmatched Final Groups', function() {
   before(async function() {
     // -- START: Standard Recorder-based unit test loading boilerplate --
     let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
-    const keyboard = await keyboardLoader.loadKeyboardFromPath('../../../../../common/test/' + testSuite.keyboard.filename);
+    const keyboard = await keyboardLoader.loadKeyboardFromPath(KEYMAN_ROOT + '/common/test/' + testSuite.keyboard.filename);
     keyboardWithHarness = keyboardLoader.harness;
     keyboardWithHarness.activeKeyboard = keyboard;
 
diff --git a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
index 56aa2f3e5e..91e5410b3a 100644
--- a/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
+++ b/web/src/test/auto/headless/engine/main/headless/inputProcessor.tests.js
@@ -5,7 +5,8 @@ import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 
 import { InputProcessor } from 'keyman/engine/main';
-import { KeyboardInterface, MinimalKeymanGlobal, Mock } from 'keyman/engine/keyboard';
+import { KeyboardInterface, Mock } from 'keyman/engine/js-processor';
+import { MinimalKeymanGlobal } from 'keyman/engine/keyboard';
 import { NodeKeyboardLoader } from 'keyman/engine/keyboard/node-keyboard-loader';
 import { KeyboardTest } from '@keymanapp/recorder-core';
 
@@ -34,12 +35,11 @@ describe('InputProcessor', function() {
     });
 
     it('has expected default values after initialization', function () {
-      // Can construct without the second parameter; if so, the final assertion - .mayPredict
-      // will be invalidated.  (No worker, no ability to predict.)
-      let worker = Worker.constructInstance();
-
+      let core;
       try {
-        let core = new InputProcessor(device, worker);
+        // Can construct without the second parameter; if so, the final assertion - .mayPredict
+        // will be invalidated.  (No worker, no ability to predict.)
+        core = new InputProcessor(device, Worker);
 
         assert.isOk(core.keyboardProcessor);
         assert.isDefined(core.keyboardProcessor.contextDevice);
@@ -60,7 +60,7 @@ describe('InputProcessor', function() {
         assert.isFalse(core.languageProcessor.isActive);
         assert.isTrue(core.languageProcessor.mayPredict);
       } finally {
-        worker.terminate();
+        core?.languageProcessor?.shutdown();
       }
     });
   });
@@ -69,8 +69,10 @@ describe('InputProcessor', function() {
     let testDistribution = [];
     let keyboardWithHarness;
 
-    // Easy peasy long context:  use the input processor's full source!
-    let coreSourceCode = fs.readFileSync('build/lib/index.mjs', 'utf-8');
+    let mainWebScriptURL = require.resolve('@keymanapp/lm-worker/worker-main.wrapped.js');
+
+    // Easy peasy long context:  use the unminified main script for the predictive-text worker!
+    let coreSourceCode = fs.readFileSync(mainWebScriptURL, 'utf-8');
 
     // At the time this test block was written...  810485 chars.
     // Let's force it to the same order of magnitude, even if the codebase grows.
diff --git a/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js b/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
index e4572de21d..b073454dbd 100644
--- a/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
+++ b/web/src/test/auto/headless/engine/main/headless/languageProcessor.tests.js
@@ -2,17 +2,19 @@ import { assert } from 'chai';
 
 import { LanguageProcessor, TranscriptionCache } from 'keyman/engine/main';
 import { SourcemappedWorker as LMWorker } from "@keymanapp/lexical-model-layer/node";
-import { Mock } from 'keyman/engine/keyboard';
+import { Mock } from 'keyman/engine/js-processor';
 
 /*
  * Unit tests for the Dummy prediction model.
  */
 
 import { LexicalModelCompiler } from '@keymanapp/kmc-model';
-import { fileURLToPath } from 'url';
 import path from 'path';
 import { TestCompilerCallbacks } from '@keymanapp/developer-test-helpers';
 
+import { env } from 'node:process';
+const KEYMAN_ROOT = env.KEYMAN_ROOT;
+
 // Required initialization setup.
 global.keyman = {}; // So that keyboard-based checks against the global `keyman` succeed.
                     // 10.0+ dependent keyboards, like khmer_angkor, will otherwise fail to load.
@@ -22,27 +24,40 @@ String.kmwEnableSupplementaryPlane(false);
 
 // Test the KeyboardProcessor interface.
 describe('LanguageProcessor', function() {
-  let worker;
+  let languageProcessor;
   const callbacks = new TestCompilerCallbacks();
 
   beforeEach(function() {
-    worker = LMWorker.constructInstance();
+    languageProcessor = new LanguageProcessor(LMWorker, new TranscriptionCache());
     callbacks.clear();
   });
 
   afterEach(function() {
-    worker.terminate();
+    languageProcessor.shutdown();
   });
 
   describe('[[constructor]]', function () {
     it('should initialize without errors', function () {
-      let lp = new LanguageProcessor(worker, new TranscriptionCache());
-      assert.isNotNull(lp);
+      assert.isNotNull(languageProcessor);
     });
 
-    it('has expected default values after initialization', function () {
-      let languageProcessor = new LanguageProcessor(worker, new TranscriptionCache());
+    it('should initialize without errors even if worker construction throws an error', function () {
+      let workerlessProcessor;
+      try {
+        workerlessProcessor = new LanguageProcessor({
+          constructInstance() {
+            throw new Error("Simulating a platform without Worker support");
+          }
+        }, new TranscriptionCache());
+        assert.isFalse(workerlessProcessor.canEnable);
+      } catch {
+        assert.fail('Worker construction error was unhandled');
+      } finally {
+        workerlessProcessor?.shutdown();
+      }
+    })
 
+    it('has expected default values after initialization', function () {
       // These checks are lifted from the keyboard init checks found in
       // web/src/test/auto/headless/engine/js-processor/basic-init.js.
       assert.isDefined(languageProcessor.lmEngine);
@@ -67,10 +82,7 @@ describe('LanguageProcessor', function() {
     const MODEL_ID = 'example.qaa.trivial';
 
     // ES-module mode leaves out `__dirname`, so we rebuild it using other components.
-    const __filename = fileURLToPath(import.meta.url);
-    const __dirname = path.dirname(__filename);
-
-    const PATH = path.join(__dirname, '../../../../../developer/src/kmc-model/test/fixtures', MODEL_ID);
+    const PATH = path.join(`${KEYMAN_ROOT}/developer/src/kmc-model/test/fixtures`, MODEL_ID);
 
     describe('using angle brackets for quotes', function() {
       let modelCode = null, modelSpec = null;
@@ -92,8 +104,6 @@ describe('LanguageProcessor', function() {
       });
 
       it("successfully loads the model", function(done) {
-        let languageProcessor = new LanguageProcessor(worker, new TranscriptionCache());
-
         languageProcessor.loadModel(modelSpec).then(function() {
           assert.isOk(languageProcessor.activeModel); // is only set after a successful load.
           done();
@@ -103,8 +113,6 @@ describe('LanguageProcessor', function() {
       });
 
       it("generates the expected prediction set", function(done) {
-        let languageProcessor = new LanguageProcessor(worker, new TranscriptionCache());
-
         let contextSource = new Mock("li", 2);
         let transcription = contextSource.buildTranscriptionFrom(contextSource, null, null);
 
@@ -112,7 +120,7 @@ describe('LanguageProcessor', function() {
           languageProcessor.predict(transcription).then(function(suggestions) {
             assert.isOk(suggestions);
             assert.equal(suggestions[0].displayAs, '«li»');
-            assert.equal(suggestions[0].transform.insert, ' ');
+            assert.equal(suggestions[0].transform.insert, 'li ');
             assert.equal(suggestions[1].displayAs, 'like');
             assert.equal(suggestions[1].transform.insert, 'like ');
             done();
@@ -142,8 +150,6 @@ describe('LanguageProcessor', function() {
 
         describe("does not alter casing when input is lowercased", function() {
           it("when input is fully lowercased", function(done) {
-            let languageProcessor = new LanguageProcessor(worker, new TranscriptionCache());
-
             let contextSource = new Mock("li", 2);
             let transcription = contextSource.buildTranscriptionFrom(contextSource, null, null);
 
@@ -161,8 +167,6 @@ describe('LanguageProcessor', function() {
           });
 
           it("when input has non-initial uppercased letters", function(done) {
-            let languageProcessor = new LanguageProcessor(worker, new TranscriptionCache());
-
             let contextSource = new Mock("lI", 2);
             let transcription = contextSource.buildTranscriptionFrom(contextSource, null, null);
 
@@ -181,8 +185,6 @@ describe('LanguageProcessor', function() {
           });
 
           it("unless the suggestion has uppercased letters", function(done) {
-            let languageProcessor = new LanguageProcessor(worker, new TranscriptionCache());
-
             let contextSource = new Mock("i", 1);
             let transcription = contextSource.buildTranscriptionFrom(contextSource, null, null);
 
@@ -202,8 +204,6 @@ describe('LanguageProcessor', function() {
 
         describe("uppercases suggestions when input is fully capitalized ", function() {
           it("for suggestions with default casing  (== 'lower')", function(done) {
-            let languageProcessor = new LanguageProcessor(worker, new TranscriptionCache());
-
             let contextSource = new Mock("LI", 2);
             let transcription = contextSource.buildTranscriptionFrom(contextSource, null, null);
 
@@ -222,8 +222,6 @@ describe('LanguageProcessor', function() {
           });
 
           it("for precapitalized suggestions", function(done) {
-            let languageProcessor = new LanguageProcessor(worker, new TranscriptionCache());
-
             let contextSource = new Mock("I", 1);
             let transcription = contextSource.buildTranscriptionFrom(contextSource, null, null);
 
@@ -244,8 +242,6 @@ describe('LanguageProcessor', function() {
         describe("initial-cases suggestions when input uses initial casing ", function() {
           describe("when input is a single capitalized letter", function() {
             it("for suggestions with default casing (== 'lower')", function(done) {
-              let languageProcessor = new LanguageProcessor(worker, new TranscriptionCache());
-
               let contextSource = new Mock("L", 1);
               let transcription = contextSource.buildTranscriptionFrom(contextSource, null, null);
 
@@ -266,8 +262,6 @@ describe('LanguageProcessor', function() {
 
           describe("input length > 1", function() {
             it("for suggestions with default casing (== 'lower')", function(done) {
-              let languageProcessor = new LanguageProcessor(worker, new TranscriptionCache());
-
               let contextSource = new Mock("Li", 2);
               let transcription = contextSource.buildTranscriptionFrom(contextSource, null, null);
 
diff --git a/web/src/test/manual/web/issue11785/clear-cookies.js b/web/src/test/manual/web/issue11785/clear-cookies.js
new file mode 100644
index 0000000000..641bb6382f
--- /dev/null
+++ b/web/src/test/manual/web/issue11785/clear-cookies.js
@@ -0,0 +1,16 @@
+function clearCookies() {
+    var cookies = document.cookie.split("; ");
+    for (var c = 0; c < cookies.length; c++) {
+        var d = window.location.hostname.split(".");
+        while (d.length > 0) {
+            var cookieBase = encodeURIComponent(cookies[c].split(";")[0].split("=")[0]) + '=; expires=Thu, 01-Jan-1970 00:00:01 GMT; domain=' + d.join('.') + ' ;path=';
+            var p = location.pathname.split('/');
+            document.cookie = cookieBase + '/';
+            while (p.length > 0) {
+                document.cookie = cookieBase + p.join('/');
+                p.pop();
+            };
+            d.shift();
+        }
+    }
+}
\ No newline at end of file
diff --git a/web/src/test/manual/web/issue11785/index.html b/web/src/test/manual/web/issue11785/index.html
index bd82343ca9..5df453aab9 100644
--- a/web/src/test/manual/web/issue11785/index.html
+++ b/web/src/test/manual/web/issue11785/index.html
@@ -35,7 +35,8 @@
     <script src="../../../../../build/publish/debug/kmwuitoggle.js"></script>
 
     <!-- Add keyboard management script for local selection of keyboards to use -->
-    <script src="../commonHeader.js"></script>
+    <script src="./load-keyboards.js"></script>
+    <script src="./clear-cookies.js"></script>
 
     <!-- Initialization: set paths to keyboards, resources and fonts as required -->
     <script>
@@ -69,6 +70,10 @@
     <h3>or in this input field:</h3>
     <input class='test' value='' placeholder='or here'/>
 
+    <div>
+    <input type="button" id="'cookie-clear" onclick="clearCookies();" value="Clear page cookies" />
+    </div>
+
     <!--  The following elements show how the language menu can be dynamically extended at any time -->
     <h3>Add a keyboard by keyboard name:</h3>
     <input type='input' id='kbd_id1' class='kmw-disabled' onkeypress="clickOnEnter(event,1);"/>
diff --git a/web/src/test/manual/web/issue11785/load-keyboards.js b/web/src/test/manual/web/issue11785/load-keyboards.js
new file mode 100644
index 0000000000..b8884df780
--- /dev/null
+++ b/web/src/test/manual/web/issue11785/load-keyboards.js
@@ -0,0 +1,171 @@
+// JavaScript Document samplehdr.js: Keyboard management for KeymanWeb demonstration pages
+
+/*
+    The keyboard name and/or BCP-47 language code must be specified for each keyboard that is to be available.
+    If the same keyboard is used for several languages, it must be listed for each
+    language, but the keyboard itself will only be loaded once.
+    If two (or more) keyboards are to be available for a given language, both must be listed.
+    Any number of keyboards may be specified in one or more calls.
+    Keyboard paths may be absolute (with respect to the server root) or relative to the keyboards option path.
+    The actual keyboard object will be downloaded asynchronously when first selected for use.
+
+    Each argument to addKeyboards() is a string, for example:
+      european2         loads the current version of the Eurolatin 2 keyboard (for its default language)
+      european2@fr      loads the current version of the Eurolatin 2 keyboard for French
+      european2@fr@1.2  loads version 1.2 of the Eurolatin 2 keyboard for French
+
+    Argument syntax also supports the following extensions:
+      @fr               load the current version of the default keyboard for French
+      @fr$              load all available keyboards (current version) for French
+
+    Each call to addKeyboards() requires a single call to the remote server,
+    (unless all keyboards listed are local and fully specified) so it is better
+    to use multiple arguments rather than separate function calls.
+
+    Calling addKeyboards() with no arguments returns a list of *all* available keyboards.
+    The Toolbar (desktop browser) UI is best suited for allowing users to select
+    the appropriate language and keyboard in this case.
+
+    Keyboards may also be specified by language name using addKeyboardsForLanguage()
+    for example:
+      keymanweb.addKeyboardsForLanguage('Burmese');
+
+    Appending $ to the language name will again cause all available keyboards for that
+    language to be loaded rather than the default keyboard.
+
+    The first call to addKeyboardsForLanguage() makes an additional call to the
+    keyman API to load the current list of keyboard/language associations.
+
+    In this example, the following function loads the indicated keyboards,
+    and is called when the page loads.
+*/
+
+  function errToString(err) {
+    // Painful?  Kinda.  But needed on un-updated Android API 21!
+    if(Array.isArray(err)) {
+      var result = '';
+      for(var i = 0; i < err.length; i++) {
+        var e = err[i];
+        if(e.error instanceof Error) {
+          result += e.error.message + '\n';
+        } else {
+          result += JSON.stringify(e) + '\n';
+        }
+      }
+      return result;
+    }
+    if(err instanceof Error) {
+      return err.message;
+    }
+    return JSON.stringify(err);
+  }
+
+  function doAddKeyboards(data) {
+    return keyman.addKeyboards(data).catch(function(err) {
+      console.error('keyman.addKeyboards failed with '+errToString(err)+' for '+JSON.stringify(data));
+    });
+  }
+
+  function doAddKeyboardsForLanguage(data) {
+    return keyman.addKeyboardsForLanguage(data).catch(function(err) {
+      console.error('keyman.addKeyboardsForLanguage failed with '+errToString(err)+' for '+JSON.stringify(data));
+    });
+  }
+
+  function loadKeyboards(nestLevel)
+  {
+    var kmw=keyman;
+
+    var base_prefix = '../';
+    var prefix = './'; // The default - when prefix == 0.
+
+    if(nestLevel !== undefined && nestLevel > 0) {
+      prefix = '';
+      for(var i=0; i < nestLevel; i++) {
+        prefix = prefix + base_prefix;
+      }
+    }
+
+    // The first keyboard added will be the default keyboard for touch devices.
+    // For faster loading, it may be best for the default keyboard to be
+    // locally sourced.
+    // doAddKeyboards({id:'us',name:'English',languages:{id:'en',name:'English'},
+    //   filename:(prefix + 'us-1.0.js')});
+
+    // Do NOT link the us-1.0 keyboard here!
+
+    doAddKeyboards({id:'test_chirality',name:'test_chirality',languages:{id:'en',name:'English'},
+      filename:(prefix + 'test_chirality.js')});
+
+    doAddKeyboards({id:'obolo_chwerty_6351',name:'obolo_chwerty_6351',languages:{id:'en',name:'English'},
+      filename:(prefix + 'obolo_chwerty_6351.js')});
+
+    doAddKeyboards({id:'gesture_prototyping',name:'Gesture Prototyping',languages:{id:'en',name:'English'},
+      filename:(prefix + 'keyboards/gesture_prototyping/build/gesture_prototyping.js')});
+
+    doAddKeyboards({id:'diacritic_rota',name:'Diacritic 10-key Rota',languages:{id:'en',name:'English'},
+      filename:(prefix + 'keyboards/diacritic_rota/build/diacritic_rota.js')});
+
+    doAddKeyboards({id:'ye_old_ten_key',name:'Classic 10-key',languages:{id:'en',name:'English'},
+      filename:(prefix + 'keyboards/ye_old_ten_key/build/ye_old_ten_key.js')});
+
+      // Add more keyboards to the language menu, by keyboard name,
+    // keyboard name and language code, or just the BCP-47 language code.
+    // We use a different loading pattern here than in the samples version to provide a slightly different set of test cases.
+    doAddKeyboards('french','@he');
+    doAddKeyboards('khmer_angkor','@km');
+    doAddKeyboards({id:'sil_euro_latin', name:'SIL EuroLatin', languages: [{id:'no'}, {id:'sv'}]}); // Loads from partial stub instead of the compact string.
+
+    // Add a keyboard by language name.  Note that the name must be spelled
+    // correctly, or the keyboard will not be found.  (Using BCP-47 codes is
+    // usually easier.)
+    doAddKeyboardsForLanguage('Dzongkha');
+
+    // Add a fully-specified, locally-sourced, keyboard with custom font
+    doAddKeyboards({id:'lao_2008_basic',name:'Lao Basic',
+      languages: {
+          id:'lo',name:'Lao',region:'Asia',
+        },
+      filename:(prefix + 'lao_2008_basic-1.2.js')
+      });
+
+    // The following two optional calls should be delayed until language menus are fully loaded:
+    //  (a) a specific mapped input element input is focused, to ensure that the OSK appears
+    //  (b) a specific keyboard is loaded, rather than the keyboard last used.
+    //window.setTimeout(function(){kmw.setActiveElement('ta1',true);},2500);
+    //window.setTimeout(function(){kmw.setActiveKeyboard('Keyboard_french','fr');},3000);
+
+    // Note that locally specified keyboards will be listed before keyboards
+    // requested from the remote server by user interfaces that do not order
+    // keyboards alphabetically by language.
+  }
+
+  // Script to allow a user to add any keyboard to the keyboard menu
+  function addKeyboard(n)
+  {
+    var sKbd,kmw=keyman;
+    switch(n)
+    {
+      case 1:
+        sKbd=document.getElementById('kbd_id1').value;
+        doAddKeyboards(sKbd);
+        break;
+      case 2:
+        sKbd=document.getElementById('kbd_id2').value.toLowerCase();
+        doAddKeyboards('@'+sKbd);
+        break;
+      case 3:
+        // Add keyboard for comma-separated language name(s)
+        sKbd=document.getElementById('kbd_id3').value;
+        doAddKeyboardsForLanguage(sKbd);
+        break;
+    }
+  }
+
+  // Add keyboard on Enter (as well as pressing button)
+  function clickOnEnter(e,id)
+  {
+    e = e || window.event;
+    if(e.keyCode == 13) addKeyboard(id);
+  }
+
diff --git a/windows/src/desktop/insthelp/build.sh b/windows/src/desktop/insthelp/build.sh
index aed1caa442..de21cb4014 100755
--- a/windows/src/desktop/insthelp/build.sh
+++ b/windows/src/desktop/insthelp/build.sh
@@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 builder_describe "Keyman installation helper module" \
   @/common/include \
   @/common/windows/delphi \
-  clean configure build test publish
+  clean configure build test publish edit
 
 builder_parse "$@"
 
@@ -51,3 +51,4 @@ builder_run_action configure:project    configure_windows_build_environment
 builder_run_action build:project        do_build
 # builder_run_action test:project         do_test
 builder_run_action publish:project      do_publish
+builder_run_action edit:project         start insthelp.dproj
diff --git a/windows/src/desktop/kmbrowserhost/build.sh b/windows/src/desktop/kmbrowserhost/build.sh
index 59dcadbe21..f716c29b74 100755
--- a/windows/src/desktop/kmbrowserhost/build.sh
+++ b/windows/src/desktop/kmbrowserhost/build.sh
@@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 builder_describe "Chromium browser host process for Keyman" \
   @/common/include \
   @/common/windows/delphi \
-  clean configure build test publish install
+  clean configure build test publish install edit
 
 builder_parse "$@"
 
@@ -50,3 +50,4 @@ builder_run_action build:project        do_build
 # builder_run_action test:project         do_test
 builder_run_action publish:project      do_publish
 builder_run_action install:project      cp "$WINDOWS_PROGRAM_APP/kmbrowserhost.exe" "$INSTALLPATH_KEYMANAPP/kmbrowserhost.exe"
+builder_run_action edit:project         start kmbrowserhost.dproj
diff --git a/windows/src/desktop/kmconfig/build.sh b/windows/src/desktop/kmconfig/build.sh
index 817cb05e7d..8507f68ac5 100755
--- a/windows/src/desktop/kmconfig/build.sh
+++ b/windows/src/desktop/kmconfig/build.sh
@@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 builder_describe "Keyman low-level configuration tool" \
   @/common/include \
   @/common/windows/delphi \
-  clean configure build test publish install
+  clean configure build test publish install edit
 
 builder_parse "$@"
 
@@ -50,3 +50,4 @@ builder_run_action build:project        do_build
 # builder_run_action test:project         do_test
 builder_run_action publish:project      do_publish
 builder_run_action install:project      cp "$WINDOWS_PROGRAM_APP/kmconfig.exe" "$INSTALLPATH_KEYMANAPP/kmconfig.exe"
+builder_run_action edit:project         start kmconfig.dproj
diff --git a/windows/src/desktop/kmshell/build.sh b/windows/src/desktop/kmshell/build.sh
index d99d25e7a4..3ce57b9088 100755
--- a/windows/src/desktop/kmshell/build.sh
+++ b/windows/src/desktop/kmshell/build.sh
@@ -9,7 +9,7 @@ builder_describe "Keyman Configuration" \
   @/common/include \
   @/common/windows/delphi \
   @/windows/src/global/delphi:message-identifiers \
-  clean configure build test publish install
+  clean configure build test publish install edit
 
 builder_parse "$@"
 
@@ -82,3 +82,4 @@ builder_run_action build:project        do_build
 # builder_run_action test:project         do_test
 builder_run_action publish:project      do_publish
 builder_run_action install:project      do_install
+builder_run_action edit:project         start kmshell.dproj
diff --git a/windows/src/desktop/kmshell/locale/cs-CZ/strings.xml b/windows/src/desktop/kmshell/locale/cs-CZ/strings.xml
index e1967680c1..04fbdb92dc 100644
--- a/windows/src/desktop/kmshell/locale/cs-CZ/strings.xml
+++ b/windows/src/desktop/kmshell/locale/cs-CZ/strings.xml
@@ -327,6 +327,10 @@
   <string name="koShowWelcome" comment="Startup options - show/hide welcome screen">Zobrazit úvodní obrazovku</string>
   <!-- Context: Configuration Dialog - Options tab -->
   <!-- String Type: FormatString -->
+  <!-- Modified: 18.0.96.0 -->
+  <string name="koCheckForUpdates" comment="Automatically check for updates and download">Automatically check for updates and download</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
   <!-- Introduced: 7.0.236.0 -->
   <string name="koTestKeymanFunctioning" comment="Startup options - test for conflicting apps when Product starts">Test pro protichůdné aplikace při spuštění klíče</string>
   <!-- Context: Configuration Dialog - Options tab -->
@@ -454,6 +458,22 @@
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
   <string name="S_Menu_Diagnostics_Diagnostics" comment="Support button submenu - performs a diagnostic report">Diagnostika</string>
+  <!-- Context: Configuration Dialog - Update tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.168 -->
+  <string name="S_No_Updates_Available" comment="Update tab - no updates are available">Žádné dostupné aktualizace.</string>
+  <!-- Context: Configuration Dialog - Update tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.168 -->
+  <string name="S_Updates_Available" comment="Update tab - informs user updates are available ">K dispozici jsou aktualizace, které budou aplikovány při příštím restartu Windows.</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 ">Aktualizace nyní vyžaduje restart počítače.</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">Aktualizace Keyman je připravena k instalaci.</string>
   <!-- Context: Download Keyboard Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
@@ -546,6 +566,10 @@ klávesnici, kterou používáte v systému Windows. Klávesnice se automaticky
   <string name="SKHotkeyConflicts_Interface" comment="Hotkey dialog - warning of hotkey conflict with hotkey for another interface hotkey">Klávesa %1$s je v konfliktu s jiným klávesovým zkratkou. Pokud budete pokračovat, ostatní klávesová zkratka bude vymazána. Pokračovat?</string>
   <!-- Context: Online Update Dialog -->
   <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.230.0 -->
+  <string name="S_Update" comment="Update tab name">Aktualizovat</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">K dispozici jsou aktualizované komponenty klíče</string>
   <!-- Context: Online Update Dialog -->
@@ -615,6 +639,14 @@ klávesnici, kterou používáte v systému Windows. Klávesnice se automaticky
   <!-- String Type: FormatString -->
   <!-- Introduced: 8.0.288.0 -->
   <string name="SKUpdate_IconMenuExit" comment="Update icon - exit menu item">E&amp;xit online update check</string>
+  <!-- Context: Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 17.0233.0 -->
+  <string name="S_Button_Update_ApplyNow" comment="Apply update now button - update dialog">Aplikovat aktualizaci nyní</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">Zkontrolovat aktualizace</string>
   <!-- Context: Splash Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 8.0.288.0 -->
diff --git a/windows/src/desktop/kmshell/locale/el-polyton/strings.xml b/windows/src/desktop/kmshell/locale/el-polyton/strings.xml
index a11a89da39..10f5b1c759 100644
--- a/windows/src/desktop/kmshell/locale/el-polyton/strings.xml
+++ b/windows/src/desktop/kmshell/locale/el-polyton/strings.xml
@@ -295,6 +295,10 @@
   <string name="koAltGrCtrlAlt" comment="General options - Ctrl+Alt simulates AltGr on computers without AltGr">Ἐξομοιῶστε τὸ AltGr μὲ τὸ Ctrl+Alt</string>
   <!-- Context: Configuration Dialog - Options tab -->
   <!-- String Type: FormatString -->
+  <!-- Introduced: 18.0.95 -->
+  <string name="koRightModifierHK" comment="General options - Right Ctrl Alt and Shift trigger hotkey">Νὰ ἐπιτρέπεται στὰ πλῆκτρα συντομεύσεως ἡ χρήση δεξιῶν πλήκτρων τροποποίησης</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
   <!-- Introduced: 9.0.480.0 -->
   <string name="koDeadkeyConversion" comment="Advanced options - Base keyboard deadkeys are treated as normal keys">Χρησιμοποιῆστε τὰ νεκρὰ πλῆκτρα ὡς συνήθη πλῆκτρα</string>
   <!-- Context: Configuration Dialog - Options tab -->
@@ -323,6 +327,10 @@
   <string name="koShowWelcome" comment="Startup options - show/hide welcome screen">Προβάλετε τὴν ὀθόνης καλωσορίσματος</string>
   <!-- Context: Configuration Dialog - Options tab -->
   <!-- String Type: FormatString -->
+  <!-- Modified: 18.0.96.0 -->
+  <string name="koCheckForUpdates" comment="Automatically check for updates and download">Ἐλέγξτε αὐτομάτως ἂν ὑπάρχουν ἐνημερώσεις καὶ κατεβάστε τες</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
   <!-- Introduced: 7.0.236.0 -->
   <string name="koTestKeymanFunctioning" comment="Startup options - test for conflicting apps when Product starts">Κατὰ τὴν ἔναρξη τοῦ Keyman, νὰ ἐξετάζετε ἂν ὑπάρχουν μὴ συμβατὲς ἐφαρμογές</string>
   <!-- Context: Configuration Dialog - Options tab -->
@@ -416,6 +424,14 @@
   <string name="S_Support_Copyright" comment="Support - Product Copyright">Πνευματικὰ δικαιώματα © SIL International. All Rights Reserved.</string>
   <!-- Context: Configuration Dialog - Support tab -->
   <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.94.0 -->
+  <string name="S_Support_CreatedBySILGlobal" comment="Created by {SIL Global} ">Δημιουργημένο ἀπὸ τὴν %1$s</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.94.0 -->
+  <string name="S_Support_CopyrightSILGlobal" comment="Copyright © {SIL Global}. All Rights Reserved.">Copyright © %1$s. All Rights Reserved.</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
   <string name="S_Support_Version" comment="Support - version">Ἔκδοση</string>
   <!-- Context: Configuration Dialog - Support tab -->
@@ -442,6 +458,22 @@
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
   <string name="S_Menu_Diagnostics_Diagnostics" comment="Support button submenu - performs a diagnostic report">Διαγνωστικά</string>
+  <!-- Context: Configuration Dialog - Update tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.168 -->
+  <string name="S_No_Updates_Available" comment="Update tab - no updates are available">Δὲν ὑπάρχουν ἐνημέρώσεις.</string>
+  <!-- Context: Configuration Dialog - Update tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.168 -->
+  <string name="S_Updates_Available" comment="Update tab - informs user updates are available ">Ὑπάρχουν ἐνημερώσεις ποὺ θὰ ἐφαρμοσθοῦν κατὰ τὴν ἑπόμενη ἐκκίνηση τῶν Windows.</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 ">Ἡ ἐνημέρωση τώρα θὰ ἀπαιτήσει ἐπακεκκίνηση τοῦ ὑπολογιστῆ.</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">Ἡ ἐνημέρωση τοῦ Keyman εἶναι ἕτοιμη νὰ ἐγκατασταθεῖ.</string>
   <!-- Context: Download Keyboard Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
@@ -533,6 +565,10 @@
   <string name="SKHotkeyConflicts_Interface" comment="Hotkey dialog - warning of hotkey conflict with hotkey for another interface hotkey">Τὸ πλῆκτρο συντομεύσεως %1$s δημιουργεῖ πρόβλημα σὲ ἄλλο πλῆκτρο συντομεύσεως. Ἂν συνεχίσετε, τὸ ἄλλο πλῆκτρο θὰ διαγραφεῖ. Θὰ συνεχίσετε\;</string>
   <!-- Context: Online Update Dialog -->
   <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.230.0 -->
+  <string name="S_Update" comment="Update tab name">Ἐνημερώσεις</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 πρὸς ἐνημέρωσιν</string>
   <!-- Context: Online Update Dialog -->
@@ -602,16 +638,27 @@
   <!-- String Type: FormatString -->
   <!-- Introduced: 8.0.288.0 -->
   <string name="SKUpdate_IconMenuExit" comment="Update icon - exit menu item">Τερματισμὸς ἐλέγχου ὀνλάϊν ἐνημερώσεων</string>
+  <!-- Context: Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 17.0233.0 -->
+  <string name="S_Button_Update_ApplyNow" comment="Apply update now button - update dialog">Ἐκτελέστε τὴν ἐνημέρωση τώρα</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">Ἀναζητῆστε τυχὸν νέες ἐνημερώσεις</string>
   <!-- Context: Splash Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 8.0.288.0 -->
-  <string name="S_Splash_Name" comment="Splash major title">Keyman</string>
   <!-- Context: Splash Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 8.0.294.0 -->
   <string name="S_Splash_Start" comment="Start Keyman button">Ἔναρξη Keyman</string>
   <!-- Context: Splash Dialog -->
   <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0 -->
+  <string name="S_Splash_Start_2" comment="Start {Keyman} button">Ἔναρξη %1$s</string>
+  <!-- Context: Splash Dialog -->
+  <!-- String Type: PlainText -->
   <!-- Introduced: 8.0.294.0 -->
   <string name="S_Splash_Exit" comment="Exit button">Ἔξοδος</string>
   <!-- Context: Splash Dialog -->
@@ -653,7 +700,6 @@
   <!-- Context: Formatted Messages -->
   <!-- String Type: FormatString -->
   <!-- Introduced: 7.0.230.0 -->
-  <string name="SKShortApplicationTitle" comment="Product name">Keyman</string>
   <!-- Context: Hints -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.244.0 -->
@@ -697,11 +743,11 @@
   <!-- Context: Help Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
-  <string name="S_Help_Keyboard_Prefix" comment="Help - text preceding keyboard name">Βοήθεια γιὰ τὸ \"</string>
+  <string name="S_Help_Keyboard_Prefix" comment="Help - text preceding keyboard name">Βοήθεια γιὰ τὸ πληκτρολόγιο \"</string>
   <!-- Context: Help Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
-  <string name="S_Help_Keyboard_Suffix" comment="Help - text following keyboard name">πληκτρολόγιο \"</string>
+  <string name="S_Help_Keyboard_Suffix" comment="Help - text following keyboard name">\"</string>
   <!-- Context: Toolbar Context Help -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
@@ -777,7 +823,6 @@
   <!-- Context: Formatted Messages -->
   <!-- String Type: FormatString -->
   <!-- Introduced: 7.0.230.0 -->
-  <string name="SKApplicationTitle" comment="Product name used for the title of message boxes and message dialogs">Keyman</string>
   <!-- Parameters: %1$s = Version number string -->
   <!-- Context: Formatted Messages -->
   <!-- Introduced: 7.0.230.0 -->
diff --git a/windows/src/desktop/kmshell/locale/km-KH/strings.xml b/windows/src/desktop/kmshell/locale/km-KH/strings.xml
index c005d5d6ab..7cb65c16e2 100644
--- a/windows/src/desktop/kmshell/locale/km-KH/strings.xml
+++ b/windows/src/desktop/kmshell/locale/km-KH/strings.xml
@@ -327,6 +327,10 @@
   <string name="koShowWelcome" comment="Startup options - show/hide welcome screen">បង្ហាញ​អេក្រង់​ស្វាគមន៍</string>
   <!-- Context: Configuration Dialog - Options tab -->
   <!-- String Type: FormatString -->
+  <!-- Modified: 18.0.96.0 -->
+  <string name="koCheckForUpdates" comment="Automatically check for updates and download">ពិនិត្យ​រក​អាប់ដេត និងទាញយកដោយស្វ័យប្រវត្តិ​</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
   <!-- Introduced: 7.0.236.0 -->
   <string name="koTestKeymanFunctioning" comment="Startup options - test for conflicting apps when Product starts">តេស្ត​រក​កម្មវិធីដែល​ប្រឆាំងគ្នា ពេល Keyman ចាប់ផ្ដើម</string>
   <!-- Context: Configuration Dialog - Options tab -->
@@ -454,6 +458,22 @@
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
   <string name="S_Menu_Diagnostics_Diagnostics" comment="Support button submenu - performs a diagnostic report">ការវិភាគ</string>
+  <!-- Context: Configuration Dialog - Update tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.168 -->
+  <string name="S_No_Updates_Available" comment="Update tab - no updates are available">គ្មានការអាប់ដេត</string>
+  <!-- Context: Configuration Dialog - Update tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.168 -->
+  <string name="S_Updates_Available" comment="Update tab - informs user updates are available ">មាន​ការអាប់ដេតដែលនឹងអនុវត្ពពេលវីនដូដំណើរការជាថ្មី</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 ">អាប់ដេតឥឡូវនឹងត្រូវឲកុំព្យូទ័រដំណើរការជាថ្មី</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">ការអាប់ដេត Keyman ត្រៀមរួចរាល់សម្រាប់ដំឡើង។</string>
   <!-- Context: Download Keyboard Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
@@ -545,6 +565,10 @@
   <string name="SKHotkeyConflicts_Interface" comment="Hotkey dialog - warning of hotkey conflict with hotkey for another interface hotkey">គ្រាប់​ចុច​ផ្លូវ​កាត់ %1$s ប្រឆាំង​គ្នា​ជា​មួយ​គ្រាប់​ចុច​ផ្លូវ​កាត់​មួយ​ផ្សេងទៀត។ បើ​បន្ត គ្រាប់​ចុច​ផ្លូវ​កាត់​មួយ​ផ្សេង​ទៀត​នោះ​នឹង​ត្រូវ​​លុបចោល។ បន្ត?</string>
   <!-- Context: Online Update Dialog -->
   <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.230.0 -->
+  <string name="S_Update" comment="Update tab name">អាប់ដេត</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 ដែល​បាន​អាប់ដេត</string>
   <!-- Context: Online Update Dialog -->
@@ -614,6 +638,14 @@
   <!-- String Type: FormatString -->
   <!-- Introduced: 8.0.288.0 -->
   <string name="SKUpdate_IconMenuExit" comment="Update icon - exit menu item">បិទ​ការ​ពិនិត្យ​រក​ការអាប់ដេត​អនឡាញ</string>
+  <!-- Context: Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 17.0233.0 -->
+  <string name="S_Button_Update_ApplyNow" comment="Apply update now button - update dialog">អនុវត្ដការអាប់ដេតឥឡូវ</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">ពិនិត្យ​រក​ការអាប់ដេតថ្មីៗ</string>
   <!-- Context: Splash Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 8.0.288.0 -->
diff --git a/windows/src/desktop/kmshell/locale/mnw-MM/strings.xml b/windows/src/desktop/kmshell/locale/mnw-MM/strings.xml
index 24e47fedc1..eb9809e3a8 100644
--- a/windows/src/desktop/kmshell/locale/mnw-MM/strings.xml
+++ b/windows/src/desktop/kmshell/locale/mnw-MM/strings.xml
@@ -295,6 +295,10 @@
   <string name="koAltGrCtrlAlt" comment="General options - Ctrl+Alt simulates AltGr on computers without AltGr">ပချဳ AltGr နကဵု Ctrl+Alt</string>
   <!-- Context: Configuration Dialog - Options tab -->
   <!-- String Type: FormatString -->
+  <!-- Introduced: 18.0.95 -->
+  <string name="koRightModifierHK" comment="General options - Right Ctrl Alt and Shift trigger hotkey">ကဵုအခေါၚ်ကု မဝ်ဒဳဝှာၚ်ယျာ လ္ပါ်ပုၚ် သွက် မဍဵုတၟေၚ်</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
   <!-- Introduced: 9.0.480.0 -->
   <string name="koDeadkeyConversion" comment="Advanced options - Base keyboard deadkeys are treated as normal keys">စွံ မဍဵုချိုတ်တ် နကဵု မဍဵု အလောတ်</string>
   <!-- Context: Configuration Dialog - Options tab -->
@@ -323,6 +327,10 @@
   <string name="koShowWelcome" comment="Startup options - show/hide welcome screen">ထ္ၜးမုက်လိက် ဒုၚ်တၠုၚ်</string>
   <!-- Context: Configuration Dialog - Options tab -->
   <!-- String Type: FormatString -->
+  <!-- Modified: 18.0.96.0 -->
+  <string name="koCheckForUpdates" comment="Automatically check for updates and download">Automatically check for updates and download</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
   <!-- Introduced: 7.0.236.0 -->
   <string name="koTestKeymanFunctioning" comment="Startup options - test for conflicting apps when Product starts">စၟဳစၟတ် အပလဳကေယှေန် ပဠပထုဲမာန် အဃောစ ကဳမာန်</string>
   <!-- Context: Configuration Dialog - Options tab -->
@@ -416,6 +424,14 @@
   <string name="S_Support_Copyright" comment="Support - Product Copyright">တၠမူ © SIL International. အခေါၚ်အဝဵုနွံပေၚ်ၚ်။</string>
   <!-- Context: Configuration Dialog - Support tab -->
   <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.94.0 -->
+  <string name="S_Support_CreatedBySILGlobal" comment="Created by {SIL Global} ">ညးကၠောန်ဗဒှ်%1$s</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.94.0 -->
+  <string name="S_Support_CopyrightSILGlobal" comment="Copyright © {SIL Global}. All Rights Reserved.">တၠမူ © %1$s။ အခေါၚ်အရာဖအိုတ်ဂှ် ညးပိုၚ်ရောၚ်။</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
   <string name="S_Support_Version" comment="Support - version">ပါယှေန်</string>
   <!-- Context: Configuration Dialog - Support tab -->
@@ -442,6 +458,22 @@
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
   <string name="S_Menu_Diagnostics_Diagnostics" comment="Support button submenu - performs a diagnostic report">ဂၠိုၚ်ဂၠါဲပြဿနာ</string>
+  <!-- Context: Configuration Dialog - Update tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.168 -->
+  <string name="S_No_Updates_Available" comment="Update tab - no updates are available">တၚ်သမၠုၚ်က္ဆံၚ်ဟွံမွဲဏီ။</string>
+  <!-- Context: Configuration Dialog - Update tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.168 -->
+  <string name="S_Updates_Available" comment="Update tab - informs user updates are available ">သမၠုၚ်ပ္တိုန်တံဂှ် ယဝ်ကၟာတ်ပံက်ထောံ မုက်လိက်တုဲမ္ဂး ဒှ်ဒတန်ရ။</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 ">သမၠုၚ်ပ္တိုန်လၟုဟ်မ္ဂး ဒးကၟာတ်ပံက်စက်ဏောၚ်။ </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">တၚ်သမၠုၚ်က္ဆံၚ်သွက်ကဳမာန် စုတ်မာန်ရ။</string>
   <!-- Context: Download Keyboard Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.230.0 -->
@@ -533,6 +565,10 @@
   <string name="SKHotkeyConflicts_Interface" comment="Hotkey dialog - warning of hotkey conflict with hotkey for another interface hotkey">မဍဵုတၟေၚ် %1$s ဒှ်ပြဿနာကု မဍဵုတၟေၚ်တၞဟ်ဟ်ရ။ ယဝ်ဆက်အာမ္ဂး မဍဵုတၟေၚ်တၞဟ်ဟ်ဂှ် သ္အးထောံရောၚ်။ ဆက်အာဟာ\?</string>
   <!-- Context: Online Update Dialog -->
   <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.230.0 -->
+  <string name="S_Update" comment="Update tab name">တၚ်သမၠုၚ်ပ္တိုန်</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">ကပေါတ်တၟိသွက်ကဳမာန်တံကလိဂွံမာန်ယျ</string>
   <!-- Context: Online Update Dialog -->
@@ -602,16 +638,27 @@
   <!-- String Type: FormatString -->
   <!-- Introduced: 8.0.288.0 -->
   <string name="SKUpdate_IconMenuExit" comment="Update icon - exit menu item">ဗ&amp;ဒေါံ စၟဳစၟတ်သမၠုၚ်က္ဆံၚ်အောန်လာၚ်</string>
+  <!-- Context: Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 17.0233.0 -->
+  <string name="S_Button_Update_ApplyNow" comment="Apply update now button - update dialog">ပ္တိုန်တၚ်သမၠုၚ်စက်လၟုဟ်</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">စၟဳစၟတ်သွက် တၚ်သမၠုၚ်ပ္တိုန်တၟိတၟိ</string>
   <!-- Context: Splash Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 8.0.288.0 -->
-  <string name="S_Splash_Name" comment="Splash major title">ကဳမာန်</string>
   <!-- Context: Splash Dialog -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 8.0.294.0 -->
   <string name="S_Splash_Start" comment="Start Keyman button">စ ကဳမာန်</string>
   <!-- Context: Splash Dialog -->
   <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0 -->
+  <string name="S_Splash_Start_2" comment="Start {Keyman} button">စ %1$s</string>
+  <!-- Context: Splash Dialog -->
+  <!-- String Type: PlainText -->
   <!-- Introduced: 8.0.294.0 -->
   <string name="S_Splash_Exit" comment="Exit button">တိတ်</string>
   <!-- Context: Splash Dialog -->
@@ -653,7 +700,6 @@
   <!-- Context: Formatted Messages -->
   <!-- String Type: FormatString -->
   <!-- Introduced: 7.0.230.0 -->
-  <string name="SKShortApplicationTitle" comment="Product name">ကဳမာအ်</string>
   <!-- Context: Hints -->
   <!-- String Type: PlainText -->
   <!-- Introduced: 7.0.244.0 -->
@@ -777,7 +823,6 @@
   <!-- Context: Formatted Messages -->
   <!-- String Type: FormatString -->
   <!-- Introduced: 7.0.230.0 -->
-  <string name="SKApplicationTitle" comment="Product name used for the title of message boxes and message dialogs">ကဳမာန်</string>
   <!-- Parameters: %1$s = Version number string -->
   <!-- Context: Formatted Messages -->
   <!-- Introduced: 7.0.230.0 -->
@@ -900,6 +945,10 @@
   <!-- String Type: FormatString -->
   <!-- Introduced: 8.0.294.0 -->
   <string name="S_OSK_FontHelper_ChooseKeyboard" comment="OSK Font helper choose keyboard">သ္ဂောံဆဵု မလိက်ကောန်ဍောၚ် မဆေၚ်စပ်တံဂှ် ရုဲကဵု ကဳဗုဒ် ကဳမာန်တံညိ။</string>
+  <!-- Context: OSK Font Helper -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 17.0.312.0 -->
+  <string name="S_OSK_FontHelper_NoFonts" comment="OSK Font helper no fonts found for keyboard">မလိက်ဝှတ် မကဵုဖျုန်ကဵု သွက်ကဳဗုက် %1$s ဟွံဆဵုရ.</string>
   <!-- Context: Text Editor -->
   <!-- String Type: FormatString -->
   <!-- Introduced: 10.0.836.0 -->
diff --git a/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas b/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas
index afce261cfa..a6cf9bd2e5 100644
--- a/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas
+++ b/windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas
@@ -159,6 +159,7 @@ type
     procedure HandleDownload; override;
     procedure HandleAbort; override;
     procedure HandleInstallNow; override;
+    procedure HandleFirstRun; override;
   end;
 
   UpdateAvailableState = class(TState)
@@ -669,6 +670,14 @@ begin
   // Do Nothing
 end;
 
+procedure IdleState.HandleFirstRun;
+begin
+  // This would be the case if it was a clean first time install of Keyman
+  // and not an update. However, incase it was some sort of failed update
+  // clean any cached files.
+  bucStateContext.RemoveCachedFiles;
+end;
+
 { UpdateAvailableState }
 
 procedure UpdateAvailableState.StartDownloadProcess;
diff --git a/windows/src/desktop/kmshell/main/initprog.pas b/windows/src/desktop/kmshell/main/initprog.pas
index 27d1ea95b5..829183b8ed 100644
--- a/windows/src/desktop/kmshell/main/initprog.pas
+++ b/windows/src/desktop/kmshell/main/initprog.pas
@@ -533,8 +533,8 @@ begin
     fmTextEditor:
       begin  // I2720
         FMutex := TKeymanMutex.Create('KeymanTextEditor');
-        if FMutex.TakeOwnership 
-          then OpenTextEditor 
+        if FMutex.TakeOwnership
+          then OpenTextEditor
           else FocusTextEditor;
       end;
 
@@ -662,11 +662,35 @@ begin
     end;
 end;
 
+function ShouldSendToBUpdateSM(FSilent: Boolean; BUpdateSM: TUpdateStateMachine; FMode: TKMShellMode): Boolean;
+// The following logic around the WaitingRestartState should be
+// encapsulated in the state machine however as we want separation of
+// UI elements from the state machine we have bring some of logic here.
+var
+  frmStartInstall: TfrmStartInstall;
+begin
+  if not FSilent and BUpdateSM.ReadyToInstall and
+     (FMode in [fmStart, fmSplash, fmMain, fmAbout,
+                fmHelp, fmShowHelp, fmSettings, fmBoot]) then
+  begin
+    frmStartInstall := TfrmStartInstall.Create(nil);
+    try
+      Result := frmStartInstall.ShowModal = mrOk;
+    finally
+      frmStartInstall.Free;
+    end;
+  end
+  else if FSilent and BUpdateSM.ReadyToInstall then
+    Result := False
+  else
+    Result := True;
+end;
+
 function ProcessBackgroundUpdate(FMode: TKMShellMode; FSilent: Boolean) : Boolean;
 var
   BUpdateSM : TUpdateStateMachine;
   frmStartInstall: TfrmStartInstall;
-  UserCanceled : Boolean;
+  SendToBUpdateSM: Boolean;
   SkipBUpdate : Boolean;
 begin
   BUpdateSM := TUpdateStateMachine.Create(False);
@@ -704,25 +728,10 @@ begin
         SkipBUpdate := (BUpdateSM.IsInstallingState and (FMode in [fmInstallTip,
         fmInstallTipsForPackages, fmRegisterTip, fmUpgradeKeyboards,
         fmUpgradeMnemonicLayout]));
-        // The following logic around the WaitingRestartState should be
-        // encapsulated in the state machine however as we want separation of
-        // UI elements from the state machine we have bring some of logic here.
-        UserCanceled := False;
-        if BUpdateSM.ReadyToInstall and
-          (not FSilent and (FMode in [fmStart, fmSplash, fmMain, fmAbout,
-          fmHelp, fmShowHelp, fmSettings, fmBoot])) then
-        begin
-          frmStartInstall := TfrmStartInstall.Create(nil);
-          try
-            if frmStartInstall.ShowModal = mrOk then
-              UserCanceled := False
-            else
-              UserCanceled := True
-          finally
-            frmStartInstall.Free;
-          end;
-        end;
-        if not UserCanceled and not SkipBUpdate and (BUpdateSM.HandleKmShell = 1) then
+
+        SendToBUpdateSM := ShouldSendToBUpdateSM(FSilent, BUpdateSM, FMode);
+
+        if SendToBUpdateSM and not SkipBUpdate and (BUpdateSM.HandleKmShell = 1) then
         begin
           Result := True;
           Exit;
diff --git a/windows/src/desktop/kmshell/startup/UfrmSplash.pas b/windows/src/desktop/kmshell/startup/UfrmSplash.pas
index d10379fc3e..8d8e8f54e3 100644
--- a/windows/src/desktop/kmshell/startup/UfrmSplash.pas
+++ b/windows/src/desktop/kmshell/startup/UfrmSplash.pas
@@ -265,10 +265,6 @@ begin
 
     until False;
 
-    if kmcom.Options[KeymanOptionName(TUtilKeymanOption.koCheckForUpdates)].Value then
-    begin
-      RunConfiguration(0, '-buc -s');
-    end;
   end;
 end;
 
diff --git a/windows/src/desktop/kmshell/xml/menuframe_hotkeys.png b/windows/src/desktop/kmshell/xml/menuframe_hotkeys.png
index 8bba89fd71..01872c7605 100644
Binary files a/windows/src/desktop/kmshell/xml/menuframe_hotkeys.png and b/windows/src/desktop/kmshell/xml/menuframe_hotkeys.png differ
diff --git a/windows/src/desktop/kmshell/xml/menuframe_keepintouch.png b/windows/src/desktop/kmshell/xml/menuframe_keepintouch.png
index fa701ce263..d4d98a880d 100644
Binary files a/windows/src/desktop/kmshell/xml/menuframe_keepintouch.png and b/windows/src/desktop/kmshell/xml/menuframe_keepintouch.png differ
diff --git a/windows/src/desktop/kmshell/xml/menuframe_keyboardlist.png b/windows/src/desktop/kmshell/xml/menuframe_keyboardlist.png
index 75bf8b867b..fbb2d8a13a 100644
Binary files a/windows/src/desktop/kmshell/xml/menuframe_keyboardlist.png and b/windows/src/desktop/kmshell/xml/menuframe_keyboardlist.png differ
diff --git a/windows/src/desktop/kmshell/xml/menuframe_options.png b/windows/src/desktop/kmshell/xml/menuframe_options.png
index 9ce4af2e69..faa4ea1444 100644
Binary files a/windows/src/desktop/kmshell/xml/menuframe_options.png and b/windows/src/desktop/kmshell/xml/menuframe_options.png differ
diff --git a/windows/src/desktop/kmshell/xml/menuframe_support.png b/windows/src/desktop/kmshell/xml/menuframe_support.png
index 70a0325caf..6f1227cb40 100644
Binary files a/windows/src/desktop/kmshell/xml/menuframe_support.png and b/windows/src/desktop/kmshell/xml/menuframe_support.png differ
diff --git a/windows/src/desktop/kmshell/xml/menuframe_update.png b/windows/src/desktop/kmshell/xml/menuframe_update.png
index 5a7bc9d47b..bc70066b56 100644
Binary files a/windows/src/desktop/kmshell/xml/menuframe_update.png and b/windows/src/desktop/kmshell/xml/menuframe_update.png differ
diff --git a/windows/src/desktop/setup/build.sh b/windows/src/desktop/setup/build.sh
index dfa6a41a09..bb72965c86 100755
--- a/windows/src/desktop/setup/build.sh
+++ b/windows/src/desktop/setup/build.sh
@@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 builder_describe "Keyman Setup bootstrap" \
   @/common/include \
   @/common/windows/delphi \
-  clean configure build test publish debug-manifest
+  clean configure build test publish debug-manifest edit
 
 builder_parse "$@"
 
@@ -71,3 +71,4 @@ builder_run_action build:project        do_build
 builder_run_action publish:project      do_publish
 
 builder_run_action debug-manifest:project  do_build_debug_manifest
+builder_run_action edit:project         start setup.dproj
diff --git a/windows/src/engine/insthelper/build.sh b/windows/src/engine/insthelper/build.sh
index d57e091ad3..a31fc605fc 100755
--- a/windows/src/engine/insthelper/build.sh
+++ b/windows/src/engine/insthelper/build.sh
@@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 builder_describe "Installation helper module" \
   @/common/include \
   @/common/windows/delphi \
-  clean configure build test publish
+  clean configure build test publish edit
 
 builder_parse "$@"
 
@@ -46,3 +46,4 @@ builder_run_action configure:project    configure_windows_build_environment
 builder_run_action build:project        do_build
 # builder_run_action test:project         do_test
 builder_run_action publish:project      do_publish
+builder_run_action edit:project         start insthelper.dproj
diff --git a/windows/src/engine/keyman/build.sh b/windows/src/engine/keyman/build.sh
index ce34599410..5f142c350c 100755
--- a/windows/src/engine/keyman/build.sh
+++ b/windows/src/engine/keyman/build.sh
@@ -9,7 +9,7 @@ builder_describe "Keyman main host process (32-bit)" \
   @/common/include \
   @/common/windows/delphi \
   @/windows/src/global/delphi \
-  clean configure build test publish install debug-manifest
+  clean configure build test publish install debug-manifest edit
 
 builder_parse "$@"
 
@@ -85,3 +85,4 @@ builder_run_action publish:project      do_publish
 builder_run_action install:project      cp "$WINDOWS_PROGRAM_ENGINE/keyman.exe" "$INSTALLPATH_KEYMANENGINE/keyman.exe"
 
 builder_run_action debug-manifest:project  do_build_debug_manifest
+builder_run_action edit:project         start keyman.dproj
diff --git a/windows/src/engine/keyman32/build.sh b/windows/src/engine/keyman32/build.sh
index e21b45ae26..c452809958 100755
--- a/windows/src/engine/keyman32/build.sh
+++ b/windows/src/engine/keyman32/build.sh
@@ -7,7 +7,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 
 builder_describe "Keystroke processing engine" \
   @/common/include \
-  @/core \
+  @/core:win \
   clean configure build test publish install \
   :x86 :x64
 
diff --git a/windows/src/engine/kmcomapi/build.sh b/windows/src/engine/kmcomapi/build.sh
index 0a5cf23977..b808bc4d5b 100755
--- a/windows/src/engine/kmcomapi/build.sh
+++ b/windows/src/engine/kmcomapi/build.sh
@@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 builder_describe "COM API library" \
   @/common/include \
   @/common/windows/delphi \
-  clean configure build test publish install
+  clean configure build test publish install edit
 
 builder_parse "$@"
 
@@ -76,4 +76,5 @@ builder_run_action build:project        do_build
 # builder_run_action test:project         do_test
 builder_run_action publish:project      do_publish
 builder_run_action install:project      do_install
+builder_run_action edit:project         start kmcompapi.dproj
 
diff --git a/windows/src/engine/tsysinfo/build.sh b/windows/src/engine/tsysinfo/build.sh
index 22dd589587..01688a6a70 100755
--- a/windows/src/engine/tsysinfo/build.sh
+++ b/windows/src/engine/tsysinfo/build.sh
@@ -9,7 +9,7 @@ builder_describe "Diagnostics (32-bit)" \
   @/common/include \
   @/common/windows/delphi \
   @/windows/src/engine/tsysinfox64 \
-  clean configure build test publish install
+  clean configure build test publish install edit
 
 builder_parse "$@"
 
@@ -71,4 +71,5 @@ builder_run_action build:project        do_build
 # builder_run_action test:project         do_test
 builder_run_action publish:project      do_publish
 builder_run_action install:project      do_install
+builder_run_action edit:project         start tsysinfo.dproj
 
diff --git a/windows/src/engine/tsysinfox64/build.sh b/windows/src/engine/tsysinfox64/build.sh
index 08bb7e174b..b9a38be7c3 100755
--- a/windows/src/engine/tsysinfox64/build.sh
+++ b/windows/src/engine/tsysinfox64/build.sh
@@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 builder_describe "Diagnostics (64-bit)" \
   @/common/include \
   @/common/windows/delphi \
-  clean configure build test publish install
+  clean configure build test publish install edit
 
 builder_parse "$@"
 
@@ -50,4 +50,4 @@ builder_run_action build:project        do_build
 # builder_run_action test:project         do_test
 builder_run_action publish:project      do_publish
 builder_run_action install:project      do_install
-
+builder_run_action edit:project         start tsysinfox64.dproj
diff --git a/windows/src/global/delphi/build.sh b/windows/src/global/delphi/build.sh
index 735465830e..5628d216d4 100755
--- a/windows/src/global/delphi/build.sh
+++ b/windows/src/global/delphi/build.sh
@@ -8,7 +8,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 builder_describe \
   "Keyman for Windows Delphi components" \
   @/common/windows/delphi \
-  clean configure build test \
+  clean configure build test edit \
   :components \
   :message-identifiers
 builder_parse "$@"
@@ -45,3 +45,4 @@ builder_run_action build:components                 do_build_components
 builder_run_action clean:message-identifiers        rm -f "$KEYMAN_ROOT/$MESSAGE_IDENTIFIERS"
 builder_run_action build:message-identifiers        do_build_message_identifiers
 # builder_run_action test:project         do_test
+builder_run_action edit:components                  start keyman_components.dproj
diff --git a/windows/src/support/oskbulkrenderer/build.sh b/windows/src/support/oskbulkrenderer/build.sh
index 76fa8a4032..7d7dc22918 100755
--- a/windows/src/support/oskbulkrenderer/build.sh
+++ b/windows/src/support/oskbulkrenderer/build.sh
@@ -6,7 +6,7 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 ## END STANDARD BUILD SCRIPT INCLUDE
 
 builder_describe "oskbuildrenderer" \
-  clean configure build test
+  clean configure build test edit
 
 builder_parse "$@"
 
@@ -37,3 +37,4 @@ builder_run_action clean:project        do_clean
 builder_run_action configure:project    configure_windows_build_environment
 builder_run_action build:project        do_build
 # builder_run_action test:project         do_test
+builder_run_action edit:project         start oskbulkrenderer.dproj