diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index a1bb728f64..269031b13e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -18,6 +18,9 @@ body:
         You may also wish to discuss your bug report with the Keyman community at:
           https://community.software.sil.org/c/keyman
 
+        Are you using Linux and fcitx5? If so, please create issues at:
+          https://github.com/fcitx/fcitx5-keyman/issues/new/choose
+
   - type: textarea
     id: description
     attributes:
diff --git a/HISTORY.md b/HISTORY.md
index 9de791f041..402bffa7e3 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,5 +1,22 @@
 # Keyman Version History
 
+## 19.0.13 alpha 2025-03-12
+
+* feat(windows): hard code key cap colour (#13444)
+
+## 19.0.12 alpha 2025-03-04
+
+* chore: remove legacy IIS setup notes (#13403)
+
+## 19.0.11 alpha 2025-03-03
+
+* chore(linux): Update debian changelog (#13347)
+* fix(common): improve resilience of build script trigger (#13402)
+
+## 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 +59,166 @@
 * refactor(windows): rename `TKeymanMutex.MutexOwned` to `TakeOwnership` and add `ReleaseOwnership` (#13168)
 * chore: increment to alpha 19.0 (#13187)
 
+## 18.0.214 beta 2025-03-13
+
+* fix(mac): change text in privacy alert for macOS 13.0 and later (#13480)
+* docs(mac): update troubleshooting page for macOS security (#13476)
+* fix(core): unalign `usetCount` and `rangeCount` (#13450)
+* fix(developer): strip markers when generating KVK from LDML (#13479)
+
+## 18.0.213 beta 2025-03-12
+
+* docs(developer): fix typos in readme and add link (#13414)
+* fix(developer): add folder text to Error_FileDoesNotExist message (#13457)
+* fix(developer): load Keyman Developer options in Server before use (#13459)
+* chore(core): add `clean` actions for `:mac` and `:win` targets (#13460)
+* chore(common): update langtags.json to 2025-02-18 release (#13461)
+* fix(developer): use '-' as placeholder for temp project name in cmdline (#13462)
+* chore: handle failure to retrieve GitHub PR status in build triggers (#13474)
+
+## 18.0.212 beta 2025-03-11
+
+* fix(oem/fv/android): Avoid resetting keyboard index (#13449)
+* fix(android/engine): Ignore key errors if user switched to another IME (#13466)
+* fix(android): Cache inputType to determine external keyboard handling (#13475)
+
+## 18.0.211 beta 2025-03-10
+
+* feat(windows): hide update header if no updates are available (#13442)
+* fix(ios): suppress Get Started dialog when closing help page (#13422)
+* docs(ios): update minimum supported ios version (#13452)
+
+## 18.0.210 beta 2025-03-07
+
+* chore(common): Add crowdin localization for Vietnamese (#13322)
+* chore(linux): add link to fcitx5 issues to bug issue template (#13451)
+
+## 18.0.209 beta 2025-03-06
+
+* fix(common): fail builds with low test coverage for all typescript projects (#13418)
+* fix(windows): Check for updates registry value stored under the one Key (#13413)
+* fix(windows): remove online update deadcode (#13421)
+
+## 18.0.208 beta 2025-03-05
+
+* fix(windows): Check registry report usage value in setup process (#13215)
+* fix(android): Don't report missing kmp.json (#13411)
+
+## 18.0.207 beta 2025-03-04
+
+* fix(common): improve resilience of build script trigger (#13407)
+* fix(mac): improve compliance checking (#13337)
+* chore(common): add unit test for nul and context() in context part of rule (#13412)
+
+## 18.0.206 beta 2025-03-03
+
+* fix(android): Control when system keyboard Keyboard Picker clears activity stack (#13313)
+* docs(android): document control flag for system keyboard picker and task (#13373)
+
+## 18.0.205 beta 2025-03-02
+
+* chore(linux): Update debian changelog (#13346)
+
+## 18.0.204 beta 2025-03-01
+
+* chore(windows): ensure dependencies for keyman32 exclude core:wasm (#13379)
+
+## 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..431adb7b69 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-19.0.10
\ No newline at end of file
+19.0.14
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..d1965f41b4 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;
@@ -44,6 +45,7 @@ public class SystemKeyboard extends InputMethodService implements OnKeyboardEven
   private static View inputView = null;
   private static ExtractedText exText = null;
   private KMHardwareKeyboardInterpreter interpreter = null;
+  private int inputType = InputType.TYPE_NULL;
   private int lastOrientation = Configuration.ORIENTATION_UNDEFINED;
 
   private static final String TAG = "SystemKeyboard";
@@ -84,7 +86,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,18 +156,9 @@ 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;
+    inputType = attribute.inputType;
     KMManager.setMayPredictOverride(inputType);
     if (KMManager.getMayPredictOverride()) {
       KMManager.setBannerOptions(false);
@@ -207,6 +205,9 @@ public class SystemKeyboard extends InputMethodService implements OnKeyboardEven
   public void onStartInputView(EditorInfo attribute, boolean restarting) {
     super.onStartInputView(attribute, restarting);
     setInputView(onCreateInputView());
+
+    // Update the input type
+    inputType = attribute.inputType;
   }
 
   @Override
@@ -228,6 +229,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 +261,6 @@ public class SystemKeyboard extends InputMethodService implements OnKeyboardEven
       if (exText != null)
         exText = null;
     }
-    // Initialize keyboard options
-    KMManager.sendOptionsToKeyboard();
   }
 
   @Override
@@ -271,6 +280,11 @@ public class SystemKeyboard extends InputMethodService implements OnKeyboardEven
 
   @Override
   public boolean onKeyDown(int keyCode, KeyEvent event) {
+    // Determine if Physical keystroke should be passed off
+    if (inputType == InputType.TYPE_NULL) {
+      return false; // Revert to default handling
+    }
+
     if (event.getAction() == KeyEvent.ACTION_DOWN) {
       switch (keyCode) {
         case KeyEvent.KEYCODE_BACK:
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/KeymanSettingsActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsActivity.java
index 7e6dcbe5b1..7113e0a982 100644
--- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsActivity.java
+++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeymanSettingsActivity.java
@@ -3,6 +3,7 @@ package com.tavultesoft.kmapro;
 import android.os.Bundle;
 
 import com.keyman.engine.BaseActivity;
+import com.keyman.engine.KMManager;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
@@ -32,6 +33,9 @@ public class KeymanSettingsActivity extends BaseActivity {
     }
 
     innerFragment = (KeymanSettingsFragment) getSupportFragmentManager().findFragmentById(R.id.keyman_settings_fragment);
+
+    // For Keyman sites, disable keyboard picker task flag so keyboard picker doesn't dismiss Keyman app
+    KMManager.dontCloseParentAppOnShowKeyboardPicker();
   }
 
   @Override
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..f5a3c63cb9 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();
   }
@@ -240,6 +247,9 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
     KMManager.onResume();
     KMManager.hideSystemKeyboard();
 
+    // Reset keyboard picker Activity Task flag
+    KMManager.closeParentAppOnShowKeyboardPicker();
+
     // onConfigurationChanged() only triggers when device is rotated while app is in foreground
     // This handles when device is rotated while app is in background
     // using KMManager.getOrientation() since getConfiguration().orientation is unreliable #10241
@@ -475,8 +485,7 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
 
   @Override
   public void onKeyboardLoaded(KeyboardType keyboardType) {
-    // Initialize keyboard options
-    KMManager.sendOptionsToKeyboard();
+    // Do nothing
   }
 
   @Override
@@ -770,39 +779,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-kr-rNG/strings.xml b/android/KMAPro/kMAPro/src/main/res/values-kr-rNG/strings.xml
index 2b403705d3..c9e26a3015 100644
--- a/android/KMAPro/kMAPro/src/main/res/values-kr-rNG/strings.xml
+++ b/android/KMAPro/kMAPro/src/main/res/values-kr-rNG/strings.xml
@@ -148,7 +148,7 @@
   <!-- Context: KMP Package strings -->
   <string name="no_new_predictive_text_to_install" comment="Notification when no dictionaries can be installed">No new predictive text to install</string>
   <!-- Context: KMP Package strings -->
-  <string name="no_targets_to_install" comment="Notification when a package doesn't contain keyboards or dictionaries">No keyboards or predictive text to install</string>
+  <string name="no_targets_to_install" comment="Notification when a package doesn't contain keyboards or dictionaries">This is not a valid Keyman keyboard or predictive text package.</string>
   <!-- Context: KMP Package strings -->
   <string name="no_associated_languages" comment="Notification when a keyboard package doesn't contain languages">Keyboard package has no associated languages to install</string>
   <!-- Context: KMP Package strings -->
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-vi-rVN/strings.xml b/android/KMAPro/kMAPro/src/main/res/values-vi-rVN/strings.xml
new file mode 100644
index 0000000000..8364edbf40
--- /dev/null
+++ b/android/KMAPro/kMAPro/src/main/res/values-vi-rVN/strings.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!-- app_name removed in 16.0 beta. Set in build.gradle -->
+  <!-- Context: Menu Action -->
+  <string name="action_share" comment="Menu action to send text content to another app">Chia sẻ</string>
+  <!-- Context: Menu Action -->
+  <string name="action_web" comment="Menu action to open Keyman browser">Trình duyệt</string>
+  <!-- Context: Menu Action -->
+  <string name="action_text_size" comment="Menu action to adjust text size">Cỡ chữ</string>
+  <!-- Context: Menu Action -->
+  <string name="action_overflow" comment="Show additional menu items">Thêm</string>
+  <!-- Context: Menu Action -->
+  <string name="action_clear_text" comment="Menu action to erase text">Xóa văn bản</string>
+  <!-- Context: Menu Action -->
+  <string name="action_info" comment="Menu action to display Keyman help page">Thông tin</string>
+  <!-- Context: Menu Action -->
+  <string name="action_settings" comment="Menu action to open Settings menu">Cài đặt</string>
+  <!-- Context: Menu Action -->
+  <string name="action_install_updates" comment="Menu notification that keyboard or dictionary updates available">Cài đặt Cập nhật</string>
+  <!-- Context: Title -->
+  <string name="title_version" comment="Title of Keyman for Android version">Phiên bản: %1$s</string>
+  <!-- Context: Text label when old Chrome version installed -->
+  <string name="text_require_chrome_57" comment="Banner text when old version of Chrome is installed">Keyman cần trình duyệt Chrome phiên bản 57 hoặc mới hơn.</string>
+  <!-- Context: Button label -->
+  <string name="button_update_chrome" comment="Prompt to upgrade Chrome in the Play Store">Cập nhật Chrome</string>
+  <!-- Context: Textfield prompt (&#8230; is the ellipsis character "...") -->
+  <string name="textview_hint" comment="Prompt to start typing">Bắt đầu nhập tại đây&#8230;</string>
+  <!-- Context: Splash screen (version/copyright info currently disabled -->
+  <!-- Context: Splash screen (version/copyright info currently disabled -->
+  <!-- Context: Text Size dialog -->
+  <string name="text_size" comment="Current text size (number)">Cỡ chữ: %1$d</string>
+  <!-- Context: Text Size dialog -->
+  <string name="ic_text_size_up" comment="Make text bigger">Tăng cỡ chữ</string>
+  <!-- Context: Text Size dialog -->
+  <string name="ic_text_size_down" comment="Make text smaller">Giảm cỡ chữ</string>
+  <!-- Context: Text Size dialog -->
+  <string name="ic_text_size_slider" comment="Adjust text size">Thanh trượt kích thước văn bản</string>
+  <!-- Context: Clear Text dialog -->
+  <string name="all_text_will_be_cleared" comment="Erase all the text">\nTất cả văn bản sẽ bị xóa\n</string>
+  <!-- Context: Get Started menu -->
+  <string name="get_started" comment="Menu for getting started">Bắt đầu</string>
+  <!-- Context: Get Started menu -->
+  <string name="add_a_keyboard" comment="Menu item to add a keyboard">Thêm bàn phím cho ngôn ngữ của bạn</string>
+  <!-- Context: Get Started menu -->
+  <string name="enable_system_keyboard" comment="Menu item to enable Keyman as system keyboard">Đặt Keyman làm bàn phím hệ thống</string>
+  <!-- Context: Get Started menu -->
+  <string name="set_keyman_as_default" comment="Menu item to set Keyman as default system keyboard">Đặt Keyman làm bàn phím mặc định</string>
+  <!-- Context: Get Started menu -->
+  <string name="more_info" comment="Open the Keyman for Android help page">Thêm thông tin</string>
+  <!-- Context: Get Started menu -->
+  <string name="show_get_started" comment="Show the &quot;Get Started&quot; menu on startup">Hiển thị \"%1$s\" khi khởi động</string>
+  <!-- Context: Android Storage Permission -->
+  <string name="request_storage_permission" comment="Request storage permission to access keyboard packages">Để cài đặt bàn phím, hãy cho phép Keyman đọc bộ nhớ ngoài</string>
+  <!-- Context: Android Storage Permission -->
+  <string name="storage_permission_denied" comment="Keyboard package installation may fail since Android storage permission not granted">Yêu cầu cho phép bộ nhớ đã bị từ chối. Có khả năng không thể cài đặt bàn phím</string>
+  <string name="storage_permission_denied2" comment="Keyboard package installation failed. Recommend install from local file">    Yêu cầu cấp quyền bộ nhớ không thành công. Hãy vào cài đặt trong Keyman - Cài đặt từ tệp cục bộ</string>
+  <!-- Context: Keyman Settings menu -->
+  <string name="keyman_settings" comment="Settings menu title">Cài đặt</string>
+  <!-- Context: Keyman Settings menu -->
+  <plurals name="installed_languages">
+    <item quantity="other">Ngôn ngữ đã cài đặt (%1$d)</item>
+  </plurals>
+  <!-- Context: Keyman Settings menu -->
+  <string name="install_keyboard_or_dictionary" comment="Menu item to install keyboard or dictionary">Cài đặt Bàn phím hay Từ điển</string>
+  <!-- Context: Keyman Settings menu -->
+  <string name="change_display_language" comment="Menu action to change interface language">Ngôn ngữ hiển thị</string>
+  <!-- Context: Keyman Settings menu -->
+  <string name="adjust_keyboard_height" comment="Menu action to adjust keyboard height">Điều chỉnh độ cao bàn phím</string>
+  <!-- Context: Keyman Settings menu -->
+  <string name="adjust_longpress_delay" comment="Menu action to adjust longpress delay duration">Điều chỉnh độ trễ khi nhấn lâu</string>
+  <!-- Context: Keyman Settings menu -->
+  <string name="spacebar_caption" comment="Menu action to set the spacebar caption">Tên phím khoảng cách</string>
+  <!-- Context: Keyman Settings menu / Spacebar caption -->
+  <string name="spacebar_caption_keyboard" comment="Spacebar caption option - keyboard">Bàn phím</string>
+  <!-- Context: Keyman Settings menu / Spacebar caption -->
+  <string name="spacebar_caption_language" comment="Spacebar caption option - language">Ngôn ngữ</string>
+  <!-- Context: Keyman Settings menu / Spacebar caption -->
+  <string name="spacebar_caption_language_keyboard" comment="Spacebar caption option - language + keyboard">Ngôn ngữ + Bàn phím</string>
+  <!-- Context: Keyman Settings menu / Spacebar caption -->
+  <string name="spacebar_caption_blank" comment="Spacebar caption option - blank">Trống</string>
+  <!-- Context: Keyman Settings menu / Spacebar caption hint -->
+  <string name="spacebar_caption_hint_keyboard" comment="Spacebar caption hint - keyboard">Hiển thị tên bàn phím trên phím cách</string>
+  <!-- Context: Keyman Settings menu / Spacebar caption hint -->
+  <string name="spacebar_caption_hint_language" comment="Spacebar caption hint - language">Hiển thị tên ngôn ngữ trên phím cách</string>
+  <!-- Context: Keyman Settings menu / Spacebar caption hint -->
+  <string name="spacebar_caption_hint_language_keyboard" comment="Spacebar caption hint - language + keyboard">Ngôn ngữ và bàn phím trên phím cách</string>
+  <!-- Context: Keyman Settings menu / Spacebar caption hint -->
+  <string name="spacebar_caption_hint_blank" comment="Spacebar caption hint - blank">Không hiển thị gì trên phím cách</string>
+  <!-- Context: Keyman Settings menu / Haptic feedback -->
+  <string name="haptic_feedback" comment="haptic feedback on key press">Rung khi đánh máy</string>
+  <!-- Context: Keyman Settings menu. Removed in Keyman 18 -->
+  <string name="show_banner" comment="text suggestions banner">Luôn hiển thị dòng biểu ngữ</string>
+  <!-- Context: Keyman Settings menu. Removed in Keyman 18 -->
+  <string name="show_banner_on" comment="Description when toggle is on">Sắp được cài đặt</string>
+  <!-- Context: Keyman Settings menu. Removed in Keyman 18 -->
+  <string name="show_banner_off" comment="Description when toggle is off">Khi tắt, chỉ hiển thị khi bật tính năng dự đoán chữ</string>
+  <!-- Context: Keyman Settings menu -->
+  <string name="show_send_crash_report" comment="permission for sending crash reports">Cho phép gửi báo cáo vấn đề qua mạng</string>
+  <!-- Context: Keyman Settings menu -->
+  <string name="show_send_crash_report_on" comment="Description when toggle is on">Khi mở, báo cáo vấn đề sẽ được gửi đi</string>
+  <!-- Context: Keyman Settings menu -->
+  <string name="show_send_crash_report_off" comment="Description when toggle is off">Khi tắt, báo cáo vấn đề sẽ không được gửi đi</string>
+  <!-- Context: Keyman Settings "Install Keyboard or Dictionary" menu -->
+  <string name="install_from_keyman_dot_com" comment="Install package from Keyman server">Cài đặt từ keyman.com</string>
+  <!-- Context: Keyman Settings "Install Keyboard or Dictionary" menu -->
+  <string name="install_from_local_file" comment="Install package file from local device">Cài đặt từ tệp cục bộ</string>
+  <!-- Context: Keyman Settings "Install Keyboard or Dictionary" menu -->
+  <string name="install_from_other_device" comment="Scan QR Code">Cài đặt từ thiết bị khác</string>
+  <!-- Context: Keyman Settings "Install Keyboard or Dictionary" menu -->
+  <string name="add_languages_to_installed_keyboard" comment="Install additional languages from a keyboard package">Thêm ngôn ngữ cho bàn phím đã cài đặt</string>
+  <!-- Context: Keyman Settings "Install Keyboard or Dictionary" menu -->
+  <string name="add_language_subtext" comment="Additional information for adding another language">(từ gói bàn phím)</string>
+  <!-- Context: Select Package and Select Languages menu -->
+  <string name="title_select_keyboard_package_list" comment="Select a keyboard package to add languages">Chọn Gói bàn phím</string>
+  <!-- Context: Select Package and Select Languages menu -->
+  <string name="title_select_languages_for_package" comment="Select language names from the keyboard package">Chọn ngôn ngữ cho %1$s</string>
+  <!-- Context: Select Package and Select Languages menu -->
+  <string name="added_language_to_keyboard" comment="Notification that a language name is added to a keyboard">Đã thêm ngôn ngữ \'%1$s\' vào %2$s</string>
+  <!-- Context: Select Package and Select Languages menu -->
+  <string name="all_languages_installed" comment="Text when all languages from a keyboard package have been installed">Tất cả ngôn ngữ đã được cài đặt rồi</string>
+  <!-- Context: Adjust Keyboard Height menu -->
+  <string name="drag_the_keyboard" comment="First line of adjusting keyboard height">Kéo bàn phím để điều chỉnh độ cao</string>
+  <!-- Context: Adjust Keyboard Height menu -->
+  <string name="rotate_the_device" comment="Second line of adjusting keyboard height">Xoay thiết bị để điều chỉnh độ ngang độ dọc</string>
+  <!-- Context: Adjust Keyboard Height menu -->
+  <string name="reset_to_defaults" comment="Button to reset to default heights">Khôi phục mặc định</string>
+  <!-- Context: Adjust Longpress Delay Time menu -->
+  <string name="longpress_delay_time" comment="Current longpress delay time (seconds)">Thời gian trễ: %1$.1f giây</string>
+  <!-- Context: Adjust Longpress Delay Time menu -->
+  <string name="ic_delay_time_up" comment="Make longpress delay longer">Thời gian trễ lâu hơn</string>
+  <!-- Context: Adjust Longpress Delay Time menu -->
+  <string name="ic_delay_time_down" comment="Make longpress delay shorter">Thời gian trễ thấp hơn</string>
+  <!-- Context: Adjust Longpress Delay Time menu -->
+  <string name="ic_longpress_delay_slider" comment="Adjust longpress delay time">Thanh trượt thời gian trễ nhấn lâu</string>
+  <!-- Context: Keyman Web Browser -->
+  <string name="hint_text" comment="Prompt to type in the browser search bar">Tìm kiếm hoặc nhập URL</string>
+  <!-- Context: Keyman Web Browser -->
+  <string name="title_bookmarks" comment="Title for bookmarks">Dấu trang</string>
+  <!-- Context: Keyman Web Browser -->
+  <string name="no_bookmarks" comment="Text when bookmark list is empty">Không có dấu trang</string>
+  <!-- Context: Keyman Web Browser -->
+  <string name="add_bookmark" comment="Confirmation to add bookmark">Thêm dấu trang</string>
+  <!-- Context: Keyman Web Browser -->
+  <string name="hint_title" comment="Page title for saved bookmark">Tiêu đề</string>
+  <!-- Context: Keyman Web Browser -->
+  <string name="hint_url" comment="Page URL for saved bookmark">url</string>
+  <!-- Context: KMP Package strings -->
+  <string name="title_package_failed_to_install" comment="Error dialog title when package failed to install">Cài đặt gói %1$s không thành công</string>
+  <!-- Context: KMP Package strings -->
+  <string name="downloading_keyboard_package" comment="Confirmation to download keyboard package filename">Đang tải xuống gói bàn phím \n%1$s&#8230;</string>
+  <!-- Context: KMP Package strings -->
+  <string name="failed_to_extract" comment="Notification that keyboard package failed to unzip">Giải nén thất bại</string>
+  <!-- Context: KMP Package strings -->
+  <string name="install_keyboard_package" comment="Title to install keyboard package">Cài đặt bàn phím</string>
+  <!-- Context: KMP Package strings -->
+  <string name="install_predictive_text_package" comment="Title to install dictionary package">Cài đặt từ điển</string>
+  <!-- Context: KMP Package strings -->
+  <string name="not_valid_package_file" comment="Notification when invalid package file cannot be installed">%1$s không phải tệp gói bàn phím Keyman hợp lệ.\n%2$s</string>
+  <!-- Context: KMP Package strings -->
+  <string name="no_new_touch_keyboards_to_install" comment="Notification when no touch-optimized keyboards can be installed">Gói bàn phím không có bàn phím được tối ưu hóa để cài đặt</string>
+  <!-- Context: KMP Package strings -->
+  <string name="no_new_predictive_text_to_install" comment="Notification when no dictionaries can be installed">Không có văn bản dự đoán mới để cài đặt</string>
+  <!-- Context: KMP Package strings -->
+  <string name="no_targets_to_install" comment="Notification when a package doesn't contain keyboards or dictionaries">Không có bàn phím hay văn bản dự đoán để cài đặt</string>
+  <!-- Context: KMP Package strings -->
+  <string name="no_associated_languages" comment="Notification when a keyboard package doesn't contain languages">Gói bàn phím không có ngôn ngữ liên quan để cài đặt</string>
+  <!-- Context: KMP Package strings -->
+  <string name="invalid_metadata" comment="kmp.json metadata file is invalid or missing in package">Siêu dữ liệu trong gói không hợp lệ/bị thiếu</string>
+  <!-- Context: KMP Package strings -->
+  <string name="minimum_keyboard_version_not_supported" comment="Notification when keyboard has functionality not supported by current Keyman">Bàn phím cần phiên bản mới hơn của ứng dụng Keyman</string>
+  <!-- Context: anywhere -->
+  <string name="unable_to_open_browser" comment="Notification when a browser activity cannot be launched">Không thể mở trình duyệt</string>
+</resources>
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/DisplayLanguages.java b/android/KMEA/app/src/main/java/com/keyman/engine/DisplayLanguages.java
index 15c0e35827..aa51597cb5 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/DisplayLanguages.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/DisplayLanguages.java
@@ -69,6 +69,7 @@ public class DisplayLanguages {
       new DisplayLanguageType("ru-RU", "Pyccĸий (Russian)"),
       new DisplayLanguageType("shu-latn", "Shuwa (Latin)"),
       new DisplayLanguageType("sv-SE", "svenska (Swedish)"),
+      new DisplayLanguageType("vi-VN", "Tiếng Việt (Vietnamese)"),
       new DisplayLanguageType("uk-UA", "Українська (Ukrainian)"),
       new DisplayLanguageType("hia-NG", "Waha"),
       new DisplayLanguageType("zh-CN", "中文(简体) (Simplified Chinese)")
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/KMKeyboardJSHandler.java b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardJSHandler.java
index ecd55c2bc9..cff1f2a688 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardJSHandler.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KMKeyboardJSHandler.java
@@ -119,7 +119,9 @@ public class KMKeyboardJSHandler {
 
         InputConnection ic = KMManager.getInputConnection(k.keyboardType);
         if (ic == null) {
-          KMLog.LogError(TAG, "insertText failed: InputConnection is null");
+          // current active InputConnection is no longer bound to the Keyman Engine input method
+          // (user switched to another IME) so disregard the keystroke.
+          // https://developer.android.com/reference/android/inputmethodservice/InputMethodService#getCurrentInputConnection()
           return;
         }
 
@@ -273,7 +275,9 @@ public class KMKeyboardJSHandler {
 
         InputConnection ic = KMManager.getInputConnection(k.keyboardType);
         if (ic == null) {
-          KMLog.LogError(TAG, "dispatchKey failed: InputConnection is null");
+          // current active InputConnection is no longer bound to the Keyman Engine input method
+          // (user switched to another IME) so disregard the keystroke.
+          // https://developer.android.com/reference/android/inputmethodservice/InputMethodService#getCurrentInputConnection()
           return;
         }
 
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..39fba8db8b 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);
   }
@@ -768,6 +792,24 @@ public final class KMManager {
     }
   }
 
+  /**
+   * Normally, launching the KeyboardPickerActivity from a system keyboard closes the parent app
+   * (The keyboard picker becomes the root of the activity stack)
+   * Calling this function keeps the parent app running in the background
+   */
+  public static void dontCloseParentAppOnShowKeyboardPicker() {
+    KeyboardPickerActivity.dontCloseParentAppOnShowKeyboardPicker();
+  }
+
+  /**
+   * Normally, launching the KeyboardPickerActivity from a system keyboard closes the parent app
+   * (The keyboard picker becomes the root of the activity stack)
+   * Calling this function restores this default behavior
+   */
+  public static void closeParentAppOnShowKeyboardPicker() {
+    KeyboardPickerActivity.closeParentAppOnShowKeyboardPicker();
+  }
+
   @SuppressLint("InflateParams")
   public static View createInputView(InputMethodService inputMethodService) {
     //final Context context = appContext;
@@ -776,6 +818,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 +967,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 +2170,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 +2186,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));
     }
 
@@ -2270,7 +2318,10 @@ public final class KMManager {
 
     if (kbType == KeyboardType.KEYBOARD_TYPE_SYSTEM) {
       i.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
-      i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+      if (KeyboardPickerActivity.getCanCloseParentAppOnShowKeyboardPicker()) {
+        // Keyboard Picker Activity becomes root activity and clears Keyman app
+        i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+      }
     }
 
     i.putExtra(KMKey_DisplayKeyboardSwitcher, kbType == KeyboardType.KEYBOARD_TYPE_SYSTEM);
@@ -2301,9 +2352,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 +2386,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 +2405,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/KeyboardPickerActivity.java b/android/KMEA/app/src/main/java/com/keyman/engine/KeyboardPickerActivity.java
index 95902bd26e..29cd0e61dc 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/KeyboardPickerActivity.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/KeyboardPickerActivity.java
@@ -81,6 +81,14 @@ public final class KeyboardPickerActivity extends BaseActivity {
   }
 
   private boolean dismissOnSelect = true;
+
+  /*
+  // When the System Keyboard launches the keyboard picker while this flag is set,
+  // the intent includes Intent.FLAG_ACTIVITY_CLEAR_TASK which clears the activity stack.
+  // Disable this to keep the keyboard picker from clearing the parent app.
+   */
+  private static boolean canCloseParentAppOnShowKeyboardPicker = true;
+
   protected static boolean canAddNewKeyboard = true;
   protected static boolean canRemoveKeyboard = true;
   protected static boolean shouldCheckKeyboardUpdates = true;
@@ -474,6 +482,32 @@ public final class KeyboardPickerActivity extends BaseActivity {
     notifyKeyboardsUpdate(context);
   }
 
+  /**
+   * Returns canCloseParentAppOnShowKeyboardPicker
+   * @return boolean
+   */
+  public static boolean getCanCloseParentAppOnShowKeyboardPicker() {
+    return canCloseParentAppOnShowKeyboardPicker;
+  }
+
+  /**
+   * Normally, launching the KeyboardPickerActivity from a system keyboard closes the parent app
+   * (The keyboard picker becomes the root of the activity stack)
+   * Calling this function keeps the parent app running in the background
+   */
+  protected static void dontCloseParentAppOnShowKeyboardPicker() {
+    canCloseParentAppOnShowKeyboardPicker = false;
+  }
+
+  /**
+   * Normally, launching the KeyboardPickerActivity from a system keyboard closes the parent app
+   * (The keyboard picker becomes the root of the activity stack)
+   * Calling this function restores this default behavior
+   */
+  protected static void closeParentAppOnShowKeyboardPicker() {
+    canCloseParentAppOnShowKeyboardPicker = true;
+  }
+
   /**
    * getModelIDFromPosition - Get the lexical model ID at a given position
    * @param context
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/packages/PackageProcessor.java b/android/KMEA/app/src/main/java/com/keyman/engine/packages/PackageProcessor.java
index 65252e63bb..8ef490e660 100644
--- a/android/KMEA/app/src/main/java/com/keyman/engine/packages/PackageProcessor.java
+++ b/android/KMEA/app/src/main/java/com/keyman/engine/packages/PackageProcessor.java
@@ -122,8 +122,8 @@ public class PackageProcessor {
    */
   public File unzipKMP(File path) throws IOException {
     File tempKeyboardPath = constructPath(path, true);
-    if (!tempKeyboardPath.exists()) {
-      tempKeyboardPath.mkdir();
+    if (!tempKeyboardPath.exists() && !tempKeyboardPath.mkdir()) {
+      KMLog.LogBreadcrumb(TAG, "Unable to mkdir for: " + tempKeyboardPath.toString(), true);
     }
     ZipUtils.unzip(path, tempKeyboardPath);
 
@@ -165,7 +165,6 @@ public class PackageProcessor {
       JSONParser parser = new JSONParser();
       return parser.getJSONObjectFromFile(infoFile);
     } else {
-      KMLog.LogError(TAG, "kmp.json does not exist");
       return null;
     }
   }
@@ -421,7 +420,6 @@ public class PackageProcessor {
    */
   public String getPackageTarget(JSONObject json) {
     if (json == null) {
-      KMLog.LogError(TAG, "kmp.json is null");
       return PP_TARGET_INVALID;
     }
     try {
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-vi-rVN/strings.xml b/android/KMEA/app/src/main/res/values-vi-rVN/strings.xml
new file mode 100644
index 0000000000..5715cf325b
--- /dev/null
+++ b/android/KMEA/app/src/main/res/values-vi-rVN/strings.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Device type  -->
+    <!-- Application name (Keyman Engine for Android) -->
+    <!-- Context: Title for list -->
+    <plurals name="title_keyboards">
+        <item quantity="other">Bàn phím</item>
+    </plurals>
+    <!-- Context: Title for list -->
+    <plurals name="title_other_input_methods">
+        <item quantity="other">Bộ gõ khác</item>
+    </plurals>
+    <!-- Context: Title for list -->
+    <string name="title_add_keyboard" comment="Add a new keyboard">Thêm bàn phím mới</string>
+    <!-- Context: Title for list -->
+    <string name="title_languages_settings" comment="List of installed languages">Ngôn ngữ đã cài đặt</string>
+    <!-- Context: Title for list -->
+    <string name="title_language_settings" comment="Keyman Settings for a language">Cài đặt %1$s</string>
+    <!-- Context: Button label -->
+    <string name="label_add" comment="Button to add an item">Thêm</string>
+    <!-- Context: Button label -->
+    <string name="label_back" comment="Button to go back">Quay lại</string>
+    <!-- Context: Button label -->
+    <string name="label_cancel" comment="Button to cancel an action">Hủy</string>
+    <!-- Context: Button label -->
+    <string name="label_close" comment="Close a dialog">Đóng</string>
+    <!-- Context: Button label. Removed in Keyman 15 -->
+    <string name="label_close_keyman" comment="Close the Keyman application">Đóng ứng dụng Keyman</string>
+    <!-- Context: Button label -->
+    <string name="label_forward" comment="Button to go forward">Chuyển tiếp</string>
+    <!-- Context: Button label -->
+    <string name="label_next_input_method" comment="Switch to next input method (replaces label_close_keyman)">Phương thức nhập kế tiếp</string>
+    <!-- Context: Button label -->
+    <string name="label_download" comment="Button to confirm downloading an item">Tải về</string>
+    <!-- Context: Button label -->
+    <string name="label_install" comment="Confirmation to install a package">Cài đặt</string>
+    <!-- Context: Button label -->
+    <string name="label_later" comment="Do an action at a later time">Để sau</string>
+    <!-- Context: Button label -->
+    <string name="label_next" comment="Go to the next screen">Tiếp theo</string>
+    <!-- Context: Button label -->
+    <string name="label_ok" comment="Button to acknowledge a dialog">Vâng</string>
+    <!-- Context: Button label -->
+    <string name="label_update" comment="Dialog button to update a resource">Cập nhật</string>
+    <!-- Context: No internet for updates -->
+    <string name="no_internet_connection" comment="Internet connection missing">Không có kết nối mạng</string>
+    <!-- Context: Keyboard Updates -->
+    <string name="cannot_connect" comment="Error message when network connection fails">Không thể kết nối tới máy chủ Keyman!</string>
+    <!-- Context: Keyboard Updates -->
+    <string name="confirm_delete_keyboard" comment="Confirmation to delete a keyboard">Bạn có muốn xóa bàn phím này không?</string>
+    <!-- Context: Keyboard Updates -->
+    <string name="confirm_download_keyboard" comment="Confirmation to download a keyboard update">Bạn có muốn tải xuống phiên bản mới nhất của bàn phím này?</string>
+    <!-- Context: Keyboard Updates -->
+    <string name="confirm_update" comment="Confirmation to update several resources">Bạn có muốn cập nhật bàn phím lẫn từ điển bây giờ không?</string>
+    <!-- Context: Keyboard Updates -->
+    <string name="keyboard_updates_channel">Cập nhật về Nguồn dữ liệu</string>
+    <!-- Context: Keyboard Updates -->
+    <string name="keyboard_updates_available" comment="Notification when resource updates are available">Có sẵn cập nhật về Nguồn dữ liệu</string>
+    <!-- Context: Keyboard Updates -->
+    <string name="update_available" comment="Currently installed version of a resource with an available update">%1$s (Đã có bản cập nhật)</string>
+    <!-- Context: Keyboard Updates -->
+    <string name="keyboard_update_message" comment="language name: keyboard name">Cập nhật có sẵn cho bàn phím %1$s: %2$s </string>
+    <!-- Context: Keyboard Updates -->
+    <string name="dictionary_update_message">Cập nhật có sẵn cho từ điển%1$s:%2$s </string>
+    <!-- Context: Keyboard Info and Keyboard Settings -->
+    <string name="keyboard_version" comment="Label for keyboard version">Phiên bản bàn phím</string>
+    <!-- Context: Keyboard Info and Keyboard Settings -->
+    <string name="help_link" comment="Label for help link">Link trợ giúp</string>
+    <!-- Context: Keyboard Info and Keyboard Settings -->
+    <string name="uninstall_keyboard" comment="Label for uninstalling keyboard">Gỡ cài đặt bàn phím</string>
+    <!-- Context: Keyboard Info and Keyboard Settings -->
+    <string name="keyboard_picker_new_keyboard" comment="Mark a language name that's newly installed in keyboard list">[new] %1$s</string>
+    <!-- Context: Keyboard Info and Keyboard Settings -->
+    <string name="keyboard_qr_code" comment="QR Code description">Quét mã này để tải bàn phím này \n trên thiết bị khác</string>
+    <!-- Context: Keyboard Help welcome.htm title -->
+    <string name="welcome_package" comment="Title to welcome.htm page (name and version)">Chào mừng đến với %1$s</string>
+    <!-- Context: Keyboard app doesn't include FileProvider library needed to view help file -->
+    <string name="fileprovider_undefined" comment="FileProvider library needed to view help file">Cần có Thư viện FileProvider để xem phần trợ giúp file: %1$s</string>
+    <!-- Context: Fatal keyboard error. Will load default keyboard -->
+    <string name="fatal_keyboard_error" comment="Fatal keyboard error (keyboard ID::packageID for language). Will load default keyboard">Lỗi bàn phím nghiêm trọng với %1$s: %2$s cho ngôn ngữ %3$s. Đang tải bàn phím mặc định.</string>
+    <!-- Context: Fatal keyboard error.  -->
+    <string name="fatal_keyboard_error_short" comment="Error in keyboard (keyboard ID::packageID for language).">Lỗi trong bàn phím %1$s:%2$s cho ngôn ngữ %3$s.</string>
+    <!-- Context: Query for associated dictionary -->
+    <string name="query_associated_model" comment="Check if there's an available dictionary to download">Kiểm tra từ điển liên quan để tải về</string>
+    <string name="cannot_query_associated_model" comment="Cannot reach server to check if there's an available dictionary to download">Không thể kết nối với server của Keyman để kiểm tra từ điển được liên kết để tải xuống</string>
+    <!-- Context: Model Updates -->
+    <string name="confirm_download_model" comment="Confirmation to download a dictionary update">Bạn có muốn tải xuống phiên bản mới nhất của từ điển này?</string>
+    <!-- Context: No associated dictionary found -->
+    <string name="no_associated_model" comment="Confirmation there's no available dictionary to download">Không có từ điển để tải xuống</string>
+    <!-- Context: Model Updates -->
+    <string name="catalog_unavailable" comment="Notification that the cloud resource catalog can't be updated">Catalog kho dữ liệu hiện không có sẵn</string>
+    <!-- Context: Background download messages-->
+    <string name="catalog_download_start_in_background" comment="Notification that the resource catalog update will begin">Cập nhật catalog đã được bắt đầu ngầm</string>
+    <!-- Context: Background download messages-->
+    <string name="catalog_download_is_running_in_background" comment="Notification that the resource catalog update is still downloading">Catalog vẫn đang tải về; xin vui lòng thử lại sau một lát!</string>
+    <!-- Context: Background download messages-->
+    <string name="progress_message_checking_resource_is_running" comment="Progress notification that the check for a resource is still running ">Đang kiểm tra kho dữ liệu</string>
+    <!-- Context: Background download messages-->
+    <string name="keyboard_download_start_in_background" comment="Notification that a keyboard download has started">Bàn phím đã bắt đầu tải về ngầm</string>
+    <!-- Context: Background download messages-->
+    <string name="keyboard_download_is_running_in_background" comment="Notification that a keyboard download is still running">Bàn phím được chọn đang được tải về; vui lòng thử lại sau một lát!</string>
+    <!-- Context: Background download messages-->
+    <string name="keyboard_download_finished" comment="Notification that a keyboard download has finished">Bàn phím đã được tải xong!</string>
+    <!-- Context: Background download messages-->
+    <string name="dictionary_download_start_in_background" comment="Notification that a dictionary download has started">Từ điển đã bắt đầu tải về ngầm</string>
+    <!-- Context: Background download messages-->
+    <string name="dictionary_download_is_running_in_background" comment="Notification that a dictionary download is still running">Từ điển được chọn đang được tải về; vui lòng thử lại sau một lát!</string>
+    <!-- Context: Background download messages. Removed in Keyman 17-->
+    <string name="dictionary_download_finished" comment="Notification that a dictionary download has finished">Tải từ điển hoàn tất.</string>
+    <!-- Context: Background download messages -->
+    <string name="download_failed" comment="Notification that a download failed">Tải xuống thất bại</string>
+    <!-- Context: Background download messages -->
+    <string name="failed_to_retrieve_file" comment="Failed to retrieve downloaded file">Không thể thu hồi file đã tải về</string>
+    <!-- Context: General Updates -->
+    <string name="update_check_unavailable" comment="Error message when a Keyman server can't be reached">Không thể kết nối với máy chủ!</string>
+    <!-- Context: General Updates -->
+    <string name="update_check_current" comment="Notification that all resources are up to date">"Toàn bộ kho dữ liệu đã được cập nhật!"</string>
+    <!-- Context: General Updates -->
+    <string name="update_failed" comment="Notification that a resource update failed">Một hay nhiều dữ liệu không thể cập nhật!</string>
+    <!-- Context: General Updates. Removed in Keyman 17 -->
+    <string name="update_success" comment="Notification that a resource update successfully updated">Kho dữ liệu đã được cập nhật thành công!</string>
+    <!-- Context: Model Info -->
+    <string name="model_version" comment="Title for a dictionary version">Phiên bản từ điển</string>
+    <!-- Context: Model Info -->
+    <string name="uninstall_model" comment="Label to uninstall a dictionary">Gỡ cài đặt từ điển</string>
+    <!-- Context: Model Info -->
+    <string name="confirm_delete_model" comment="Confirmation to delete a dictionary">Bạn có muốn xóa từ điển này không?</string>
+    <!-- Context: Model Deleted -->
+    <string name="model_deleted" comment="Notification when a dictionary is deleted">Từ điển đã bị xóa</string>
+    <!-- Context: Language Settings Keyboard install strings -->
+    <string name="keyboard_install_toast" comment="Notification when a keyboard is installed">%1$s bàn phím đã được cài đặt</string>
+    <!-- Context: Language Settings Keyboard uninstall strings -->
+    <string name="keyboard_deleted_toast" comment="Notification when a keyboard is deleted">Bàn phím đã bị xóa</string>
+    <!-- Context: Language Settings menu strings. Removed in Keyman 18 -->
+    <string name="enable_corrections" comment="Enable corrections from the suggestion banner">Bật hiệu chỉnh</string>
+    <!-- Context: Language Settings menu strings. Removed in Keyman 18 -->
+    <string name="enable_predictions" comment="Enable predictions from the suggestion banner">Bật tiên đoán</string>
+    <!-- Context: Language Settings menu strings - radio buttons -->
+    <string name="suggestions_radio_0" comment="Predictions and corrections disabled">Tắt các đề xuất</string>
+    <string name="suggestions_radio_1" comment="Suggestions Enabled: Predictions with no corrections">Chỉ dự đoán</string>
+    <string name="suggestions_radio_2" comment="Suggestions Enabled: Predictions with corrections">Dự đoán có sửa chữa</string>
+    <string name="suggestions_radio_3" comment="Suggestions Enabled: Predictions with auto-corrections">Dự đoán có sửa chữa tự động</string>
+    <!-- Context: Language Settings menu strings -->
+    <string name="model_label">Từ điển</string>
+    <plurals name="model_count">
+        <item quantity="other">Từ điển</item>
+    </plurals>
+    <!-- Context: Language Settings menu substring - Check for available dictionary -->
+    <string name="check_available_model" comment="Check for available dictionary">Kiểm tra từ điển có sẵn</string>
+    <string name="check_model_online" comment="Check for dictionaries online">Kiểm tra từ điển trên mạng</string>
+    <!-- Context: Language Settings menu strings -->
+    <string name="model_info_header" comment="Dictionary name">Từ điển: %1$s</string>
+    <!-- Context: Language Settings menu strings -->
+    <string name="model_picker_header" comment="Dictionaries for a specified language">%1$s Từ điển</string>
+    <!-- Context: Language Settings menu strings -->
+    <!-- Context: Language Settings menu strings -->
+    <string name="model_install_toast" comment="Notification when a dictionary is installed">Từ điển đã được cài đặt</string>
+    <!-- Context: Language Settings menu strings -->
+    <plurals name="keyboard_count">
+        <item quantity="other">(%1$d bàn phím)</item>
+    </plurals>
+    <!-- Context: "Change Display Language" menu -->
+    <string name="default_locale" comment="Use the device's current locale">Vị trí mặc định</string>
+    <!-- Context: Content descriptions -->
+    <!-- Context: Content descriptions -->
+    <!-- Context: Popup menu labels -->
+    <string name="label_delete" comment="Confirmation to delete an item">Xóa</string>
+    <!-- Context: Shared preferences name -->
+    <!-- Context: Other strings -->
+    <string name="help_bubble_text">Chạm ở đây để đổi bàn phím</string>
+    <!-- Context: anywhere -->
+    <string name="unable_to_open_browser" comment="Notification when a browser activity cannot be launched">Không thể mở trình duyệt</string>
+</resources>
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/closeParentAppOnShowKeyboardPicker.md b/android/docs/engine/KMManager/closeParentAppOnShowKeyboardPicker.md
new file mode 100644
index 0000000000..e6379b3d81
--- /dev/null
+++ b/android/docs/engine/KMManager/closeParentAppOnShowKeyboardPicker.md
@@ -0,0 +1,39 @@
+---
+title: KMManager.closeParentAppOnShowKeyboardPicker()
+---
+
+## Summary
+The **closeParentAppOnShowKeyboardPicker()** method restores the default behavior of the keyboard picker menu closing the parent app.
+
+## Syntax
+
+```java
+KMManager.closeParentAppOnShowKeyboardPicker()
+```
+
+## Description
+Normally, launching the KeyboardPickerActivity from a system keyboard closes the parent app.
+
+(The keyboard picker becomes the root of the activity stack.)
+
+Calling this function restores this default behavior.
+
+## Examples
+
+### Example: Using `closeParentAppOnShowKeyboardPicker()`
+
+The following script illustrates the use of `closeParentAppOnShowKeyboardPicker()`:
+```java
+  @Override
+  protected void onResume() {
+    super.onResume();
+    KMManager.onResume();
+    KMManager.hideSystemKeyboard();
+
+    // Reset keyboard picker Activity Task flag
+    KMManager.closeParentAppOnShowKeyboardPicker();
+```
+
+## See also
+* [dontCloseParentAppOnShowKeyboardPicker()](dontCloseParentAppOnShowKeyboardPicker)
+* [showKeyboardPicker()](showKeyboardPicker)
diff --git a/android/docs/engine/KMManager/dontCloseParentAppOnShowKeyboardPicker.md b/android/docs/engine/KMManager/dontCloseParentAppOnShowKeyboardPicker.md
new file mode 100644
index 0000000000..b597fbc9df
--- /dev/null
+++ b/android/docs/engine/KMManager/dontCloseParentAppOnShowKeyboardPicker.md
@@ -0,0 +1,38 @@
+---
+title: KMManager.dontCloseParentAppOnShowKeyboardPicker()
+---
+
+## Summary
+The **dontCloseParentAppOnShowKeyboardPicker()** method disables the keyboard picker task flag so keyboard picker doesn't dismiss the parent app.
+
+## Syntax
+
+```javascript
+KMManager.dontCloseParentAppOnShowKeyboardPicker()
+```
+
+## Description
+Normally, launching the KeyboardPickerActivity from a system keyboard closes the parent app.
+
+(The keyboard picker becomes the root of the activity stack)
+
+Calling this function keeps the parent app running in the background.
+
+## Examples
+
+### Example: Using `dontCloseParentAppOnShowKeyboardPicker()`
+
+The following script illustrates the use of `dontCloseParentAppOnShowKeyboardPicker()`:
+```java
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    // When using Keyman system keyboard within the Keyman app, 
+    // disable keyboard picker task flag so keyboard picker doesn't dismiss Keyman app
+    KMManager.dontCloseParentAppOnShowKeyboardPicker();
+```
+
+## See also
+* [closeParentAppOnShowKeyboardPicker()](closeParentAppOnShowKeyboardPicker)
+* [showKeyboardPicker()](showKeyboardPicker)
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..9fb1cf4f9c 100644
--- a/android/docs/engine/KMManager/index.md
+++ b/android/docs/engine/KMManager/index.md
@@ -50,6 +50,9 @@ The KMManager is the core class which provides most of the methods and constants
 [`canRemoveKeyboard()`](canRemoveKeyboard)
 : returns whether removing a keyboard is enabled, like in the keyboard picker menu
 
+[`closeParentAppOnShowKeyboardPicker()`](closeParentAppOnShowKeyboardPicker)
+: restores keyboard picker task flag so keyboard picker dismisses the parent app
+
 [`copyHTMLBannerAssets()`](copyHTMLBannerAssets)
 : copies a folder of HTML banner assets so it's available for your keyboard app's resources
 
@@ -59,6 +62,9 @@ The KMManager is the core class which provides most of the methods and constants
 [`deregisterLexicalModel()`](deregisterLexicalModel)
 : deregisters the specified lexical model from the LMLayer so it isn't used
 
+[`dontCloseParentAppOnShowKeyboardPicker()`](dontCloseParentAppOnShowKeyboardPicker)
+: disables keyboard picker task flag so keyboard picker doesn't dismiss the parent app
+
 [`executeHardwareKeystroke()`](executeHardwareKeystroke)
 : process the keystroke generated from a physical keyboard
 
@@ -212,9 +218,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/k_054___nul_and_contextex.kmn b/common/test/keyboards/baseline/k_054___nul_and_contextex.kmn
new file mode 100644
index 0000000000..39ef0d4534
--- /dev/null
+++ b/common/test/keyboards/baseline/k_054___nul_and_contextex.kmn
@@ -0,0 +1,15 @@
+store(&NAME) '054 - nul_and_contextex'
+c Description: Tests that context in context part of rule has the right offset when used with nul
+c keys: [K_T][K_T][K_B]
+c expected: 2tt3
+c context:
+
+store(&version) '10.0'
+
+begin Unicode > use(Main)
+
+store(cons) 'mnpqrstv'
+
+group(Main) using keys
+
+nul any(cons) context(2) + 'b' > '2' context(2) context(3) '3'
diff --git a/common/test/keyboards/baseline/k_054___nul_and_contextex.kmx b/common/test/keyboards/baseline/k_054___nul_and_contextex.kmx
new file mode 100644
index 0000000000..3c75d606f4
Binary files /dev/null and b/common/test/keyboards/baseline/k_054___nul_and_contextex.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/OnScreenKeyboard.pas b/common/windows/delphi/components/OnScreenKeyboard.pas
index 754ff2983a..e1caab4197 100644
--- a/common/windows/delphi/components/OnScreenKeyboard.pas
+++ b/common/windows/delphi/components/OnScreenKeyboard.pas
@@ -1418,7 +1418,7 @@ var
         //       but this requires a file format change, so a much bigger scope
 
         if not Enabled then      Font.Color := $808080
-        else                     Font.Color := clWindowText;
+        else                     Font.Color := KeyFontColor_Cap;
 
         FKeyboard.FDrawChar.DisplayQuality := ctCleartype;
         FKeyboard.FDrawChar.Color := Font.Color;
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..b97ce73515 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 \
@@ -134,29 +139,28 @@ do_action() {
 # -------------------------------------------------------------------------------
 
 do_action clean
+builder_run_action clean:mac   rm -rf "$KEYMAN_ROOT/core/build/mac/$BUILDER_CONFIGURATION"
+builder_run_action clean:win   rm -rf "$KEYMAN_ROOT/core/build/win/$BUILDER_CONFIGURATION"
 
 # -------------------------------------------------------------------------------
 
 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 +181,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_plus.h b/core/src/kmx/kmx_plus.h
index e3a510b76d..d562175054 100644
--- a/core/src/kmx/kmx_plus.h
+++ b/core/src/kmx/kmx_plus.h
@@ -648,8 +648,8 @@ typedef KMX_DWORD KMXPLUS_USET;
 struct COMP_KMXPLUS_USET {
   static const KMX_DWORD IDENT = LDML_SECTIONID_USET;
   COMP_KMXPLUS_HEADER header;
-  KMX_DWORD usetCount;
-  KMX_DWORD rangeCount;
+  KMX_DWORD_unaligned usetCount;
+  KMX_DWORD_unaligned rangeCount;
   // see helper for: usets sub-table
   // see helper for: ranges sub-table
 
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 7cca24965d..fef6864cec 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 2b521a5712..5283296296 100644
--- a/core/tests/unit/kmx/meson.build
+++ b/core/tests/unit/kmx/meson.build
@@ -80,7 +80,12 @@ 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',
+  'k_054___nul_and_contextex',
 ]
 
 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/common/web/utils/build.sh b/developer/src/common/web/utils/build.sh
index f7433cb2fa..251588e2f6 100755
--- a/developer/src/common/web/utils/build.sh
+++ b/developer/src/common/web/utils/build.sh
@@ -49,5 +49,5 @@ function do_build() {
 builder_run_action clean       rm -rf ./build/
 builder_run_action configure   verify_npm_setup
 builder_run_action build       do_build
-builder_run_action test        builder_do_typescript_tests 50
+builder_run_action test        builder_do_typescript_tests 45
 builder_run_action publish     builder_publish_npm
diff --git a/developer/src/common/web/utils/src/utils/options.ts b/developer/src/common/web/utils/src/utils/options.ts
index df32a4a7b9..9d1a93895e 100644
--- a/developer/src/common/web/utils/src/utils/options.ts
+++ b/developer/src/common/web/utils/src/utils/options.ts
@@ -1,6 +1,6 @@
-import * as os from 'os';
-import * as fs from 'fs';
-import * as path from 'path';
+import * as os from 'node:os';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
 
 export interface KeymanDeveloperOptions {
   "use tab char"?: boolean;
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-ldml/build.sh b/developer/src/kmc-ldml/build.sh
index b48e851c71..8bdd5f2217 100755
--- a/developer/src/kmc-ldml/build.sh
+++ b/developer/src/kmc-ldml/build.sh
@@ -47,7 +47,7 @@ function do_build() {
 }
 
 function do_build_abnf() {
-  # we convert over all abnf files found. 
+  # we convert over all abnf files found.
   local file
   for file in "$KEYMAN_ROOT/resources/standards-data/ldml-keyboards"/*/abnf/*.abnf; do
     local cldrver="$(basename $(dirname $(dirname "$file")))"
@@ -82,7 +82,7 @@ builder_run_action configure       do_configure
 builder_run_action build           do_build
 builder_run_action build-fixtures  do_build_fixtures
 builder_run_action api             api-extractor run --local --verbose
-builder_run_action test            builder_do_typescript_tests
+builder_run_action test            builder_do_typescript_tests  75
 
 #-------------------------------------------------------------------------------------------------------------------
 
diff --git a/developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts b/developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts
index 7783d42405..7a4d5d37f0 100644
--- a/developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts
+++ b/developer/src/kmc-ldml/src/compiler/visual-keyboard-compiler.ts
@@ -135,7 +135,9 @@ export class LdmlKeyboardVisualKeyboardCompiler {
 
   private getDisplayFromKey(keydef: KMXPlus.KeysKeys, source: KMXPlus.KMXPlusData) {
     const display = source.disp?.disps?.find(d => d.id.value == keydef.id.value || d.to.value == keydef.to.value);
-    return display?.display.value ?? keydef.to.value;
+    const value = display?.display.value ?? keydef.to.value;
+    // strip markers from the output (these are valid in keydef.to, but not in display.display, nor in kvk)
+    return value.replaceAll(/\uffff\u0008./g, '');
   }
 
   private translateLayerModifiersToVisualKeyboardShift(modifiers: number): VisualKeyboard.VisualKeyboardShiftState {
diff --git a/developer/src/kmc-ldml/test/disp.tests.ts b/developer/src/kmc-ldml/test/disp.tests.ts
index 36f08f2780..31d79ac5e2 100644
--- a/developer/src/kmc-ldml/test/disp.tests.ts
+++ b/developer/src/kmc-ldml/test/disp.tests.ts
@@ -56,7 +56,13 @@ describe('disp', function () {
     assert.equal(disp?.baseCharacter?.value, 'x');
     assert.ok(disp?.disps);
   });
-
+  it('should compile disp without converting markers', async function() {
+    let disp = await loadSectionFixture(DispCompiler, 'sections/disp/not-a-marker.xml', compilerTestCallbacks) as Disp;
+    assert.equal(compilerTestCallbacks.messages.length, 0);
+    assert.ok(disp?.disps);
+    assert.equal(disp.disps.length, 1);
+    assert.equal(disp.disps[0].display?.value, '\\m{hat}');
+  });
   it('should reject duplicate tos', async function() {
     let disp = await loadSectionFixture(DispCompiler, 'sections/disp/invalid-dupto.xml', compilerTestCallbacks) as Disp;
     assert.isNull(disp);
diff --git a/developer/src/kmc-ldml/test/fixtures/sections/disp/not-a-marker.xml b/developer/src/kmc-ldml/test/fixtures/sections/disp/not-a-marker.xml
new file mode 100644
index 0000000000..5ff7196e30
--- /dev/null
+++ b/developer/src/kmc-ldml/test/fixtures/sections/disp/not-a-marker.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="45">
+  <info name="disp-marker"/>
+
+  <displays>
+    <!-- this is not a marker, just plain text -->
+    <display output="\u{0300}" display="\m{hat}" />
+  </displays>
+</keyboard3>
diff --git a/developer/src/kmc-ldml/test/visual-keyboard-compiler.tests.ts b/developer/src/kmc-ldml/test/visual-keyboard-compiler.tests.ts
index 25e3abb47b..77a8482090 100644
--- a/developer/src/kmc-ldml/test/visual-keyboard-compiler.tests.ts
+++ b/developer/src/kmc-ldml/test/visual-keyboard-compiler.tests.ts
@@ -184,6 +184,26 @@ describe('visual-keyboard-compiler', function() {
     assert.equal(vk.keys[0].text, '2');
   });
 
+  it('should strip markers from key.output', async function() {
+    const xml = stripIndent`
+      <?xml version="1.0" encoding="UTF-8"?>
+      <keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="mt" conformsTo="45">
+        <info name="minimal"/>
+        <keys>
+          <key id="x" output="1\\m{hat}2" />
+        </keys>
+        <layers formId="us">
+          <layer modifiers="none"><row keys="x" /></layer>
+        </layers>
+      </keyboard3>
+    `;
+
+    const vk = await loadVisualKeyboardFromXml(xml, 'test');
+
+    assert.equal(vk.keys.length, 1);
+    assert.equal(vk.keys[0].text, '12'); // marker stripped from `1<marker>2`
+  });
+
   it('should read string variables in display.display', async function() {
     const xml = stripIndent`
       <?xml version="1.0" encoding="UTF-8"?>
diff --git a/developer/src/kmc-model-info/build.sh b/developer/src/kmc-model-info/build.sh
index 153c356736..766c9be413 100755
--- a/developer/src/kmc-model-info/build.sh
+++ b/developer/src/kmc-model-info/build.sh
@@ -31,7 +31,7 @@ builder_run_action clean        rm -rf ./build/ ./tsconfig.tsbuildinfo
 builder_run_action configure    verify_npm_setup
 builder_run_action build        tsc --build
 builder_run_action api          api-extractor run --local --verbose
-builder_run_action test         builder_do_typescript_tests 80
+builder_run_action test         builder_do_typescript_tests 55
 
 #-------------------------------------------------------------------------------------------------------------------
 
diff --git a/developer/src/kmc/README.md b/developer/src/kmc/README.md
index cd63fbb7c5..2ab17f67e7 100644
--- a/developer/src/kmc/README.md
+++ b/developer/src/kmc/README.md
@@ -1,8 +1,8 @@
 Keyman Developer - Command Line Compiler
 ================
 
-This package provides a command-line interface to the Keyman Developer compiler
-toolchain, `kmc`.
+This package provides a command-line interface to the
+[Keyman Developer](https://keyman.com/developer) compiler toolchain, `kmc`.
 
 ## Install kmc
 
@@ -116,7 +116,7 @@ keyman.addKeyboards({
     id:'km',                // A BCP 47 code uniquely identifying the language.
     name:'Khmer'            // The language's name.
   },
-  filename:'./khmer-angkor.js',
+  filename:'./khmer_angkor.js',
 });
 ```
 
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..3e1f4f30c6 100644
--- a/developer/src/kmc/src/messages/infrastructureMessages.ts
+++ b/developer/src/kmc/src/messages/infrastructureMessages.ts
@@ -18,7 +18,7 @@ export class InfrastructureMessages {
 
   static ERROR_FileDoesNotExist = SevError | 0x0003;
   static Error_FileDoesNotExist = (o:{filename:string}) => m(this.ERROR_FileDoesNotExist,
-    `File ${def(o.filename)} does not exist`);
+    `File or folder '${def(o.filename)}' does not exist`);
 
   static ERROR_FileTypeNotRecognized = SevError | 0x0004;
   static Error_FileTypeNotRecognized = (o:{filename: string, extensions: string}) => m(this.ERROR_FileTypeNotRecognized,
@@ -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..b5da144115 100644
--- a/developer/src/kmcmplib/tests/meson.build
+++ b/developer/src/kmcmplib/tests/meson.build
@@ -73,7 +73,13 @@ 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',
+  'k_054___nul_and_contextex',
 ]
 
 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/server/src/index.ts b/developer/src/server/src/index.ts
index eed84f3b1a..677c5a7cd5 100644
--- a/developer/src/server/src/index.ts
+++ b/developer/src/server/src/index.ts
@@ -1,16 +1,16 @@
-import { environment } from './environment.js';
-import { KeymanSentry } from '@keymanapp/developer-utils';
-import express from 'express';
-import * as ws from 'ws';
-import * as os from 'os';
-import multer from 'multer';
-import * as fs from 'fs';
-import * as path from 'path';
-import setupRoutes from './routes.js';
-import { configuration } from './config.js';
-import { initTray } from './tray.js';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
 import chalk from 'chalk';
+import express from 'express';
+import multer from 'multer';
+import * as ws from 'ws';
+import { KeymanSentry, loadOptions } from '@keymanapp/developer-utils';
+import { configuration } from './config.js';
+import { environment } from './environment.js';
+import setupRoutes from './routes.js';
 import { shutdown } from './shutdown.js';
+import { initTray } from './tray.js';
 
 const options = {
   ngrokLog: false,   // Set this to true if you need to see ngrok logs in the console
@@ -20,6 +20,11 @@ const options = {
 
 console.log(`Starting Keyman Developer Server ${environment.versionWithTag}, listening on port ${configuration.port}.`);
 
+// We need to load the Keyman Developer options before attempting to initialize
+// Sentry. `loadOptions` silently suppresses exceptions and returns a default
+// set of options if an error occurs.
+await loadOptions();
+
 KeymanSentry.init();
 try {
   await run();
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/Keyman.Developer.System.LaunchProjects.pas b/developer/src/tike/main/Keyman.Developer.System.LaunchProjects.pas
index 333f3ae1a9..a131b21df4 100644
--- a/developer/src/tike/main/Keyman.Developer.System.LaunchProjects.pas
+++ b/developer/src/tike/main/Keyman.Developer.System.LaunchProjects.pas
@@ -16,6 +16,7 @@ type
     FProjectFilename: string;
     FFilenames: TStringList;
     FStatus: TLaunchProjectStatus;
+    function GetLaunchProjectFilename: string;
   public
     constructor Create(const AProjectFilename: string);
     destructor Destroy; override;
@@ -64,11 +65,21 @@ begin
   inherited Destroy;
 end;
 
+/// Use the project filename '-' to indicate launch of a new temporary project
+/// instance, because passing empty string is not possible as a commandline
+/// parameter.
+function TLaunchProject.GetLaunchProjectFilename: string;
+begin
+  if Self.ProjectFilename = ''
+    then Result := '-'
+    else Result := Self.ProjectFilename;
+end;
+
 function TLaunchProject.LaunchAsNewInstance: Boolean;
 var
   filename, cmdline: string;
 begin
-  cmdline := '"'+ParamStr(0)+'" --sub-process "'+Self.ProjectFilename+'"';
+  cmdline := '"'+ParamStr(0)+'" --sub-process "'+Self.GetLaunchProjectFilename+'"';
   for filename in Self.Filenames do
     cmdline := cmdline + ' "'+filename+'"';
 
diff --git a/developer/src/tike/main/UfrmMain.pas b/developer/src/tike/main/UfrmMain.pas
index 8fa7a45c9b..20990fb02f 100644
--- a/developer/src/tike/main/UfrmMain.pas
+++ b/developer/src/tike/main/UfrmMain.pas
@@ -547,6 +547,8 @@ end;
 
 
 procedure TfrmKeymanDeveloper.FormCreate(Sender: TObject);
+var
+  newProject: TProjectUI;
 begin
   inherited;
 
@@ -605,7 +607,13 @@ begin
   if TikeCommandLine.StartupProjectPath <> '' then
   begin
     try
-      LoadGlobalProjectUI(ptUnknown, TikeCommandLine.StartupProjectPath);
+      if TikeCommandLine.StartupProjectPath = '-'
+        then newProject := CreateTempGlobalProjectUI(ptUnknown)
+        else newProject := LoadGlobalProjectUI(ptUnknown, TikeCommandLine.StartupProjectPath);
+      if newProject = nil then
+      begin
+        raise EProjectLoader.Create('Project is already open in another process');
+      end;
     except
       on E:EProjectLoader do
       begin
@@ -1291,7 +1299,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 +1382,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/file-formats/kmx-plus-file-format.md b/docs/file-formats/kmx-plus-file-format.md
index 680f3675b9..2e4577d650 100644
--- a/docs/file-formats/kmx-plus-file-format.md
+++ b/docs/file-formats/kmx-plus-file-format.md
@@ -25,6 +25,7 @@ Draft spec PR: <https://github.com/unicode-org/cldr/pull/1847>
 - All offsets are 32-bit little-endian values.  For all sections except for the
   `'sect'` section (which see), offsets are relative to the beginning of each
   section and must fall within the `size` of the section.
+- Data fields are not necessarily aligned to 32-bit or 64-bit boundaries.
 
 ## C7043.2 Sections
 
@@ -35,8 +36,8 @@ Draft spec PR: <https://github.com/unicode-org/cldr/pull/1847>
 - Other than the `sect` table itself, the rest of the sections follow in binary
   order in the file.  In other words, the binary ordering of the section
   identifiers determines the order of the file layout.
-- All sections other than the `sect` table are optional for the file 
-  format to be valid, however, a valid keyboard will need most or 
+- All sections other than the `sect` table are optional for the file
+  format to be valid, however, a valid keyboard will need most or
   all of the sections present to be usable.
 
 ### C7043.2.1 `sect`—Section Table of contents
diff --git a/docs/minimum-versions.md b/docs/minimum-versions.md
index 7f302f5634..7efc8d176c 100644
--- a/docs/minimum-versions.md
+++ b/docs/minimum-versions.md
@@ -51,7 +51,7 @@ https://help.keyman.com/developer/engine/android/latest-version/
 | KEYMAN_DEFAULT_VERSION_UBUNTU_CONTAINER | noble |
 | KEYMAN_MIN_TARGET_VERSION_ANDROID | 5.0 |
 | KEYMAN_MIN_TARGET_VERSION_ANDROID_CHROME | 53.0 |
-| KEYMAN_MIN_TARGET_VERSION_IOS | 12.2 |
+| KEYMAN_MIN_TARGET_VERSION_IOS | 15.6 |
 | KEYMAN_MIN_TARGET_VERSION_MAC | 10.13 |
 | KEYMAN_MIN_TARGET_VERSION_UBUNTU | 22.04 |
 | KEYMAN_MIN_TARGET_VERSION_WEB_CHROME | 95.0 |
@@ -71,8 +71,8 @@ https://help.keyman.com/developer/engine/android/latest-version/
 | KEYMAN_VERSION_ICU | 73.1 |
 | KEYMAN_VERSION_ISO639_3 | 2024-05-22 |
 | KEYMAN_VERSION_JAVA | 11 |
-| KEYMAN_VERSION_LANGTAGS | 2024-05-22 |
-| KEYMAN_VERSION_LANGTAGS_SUBTAG_REGISTRY | 2024-05-16 |
+| KEYMAN_VERSION_LANGTAGS | 2025-02-18 |
+| KEYMAN_VERSION_LANGUAGE_SUBTAG_REGISTRY | 2024-05-16 |
 | KEYMAN_VERSION_UNICODE | 16.0.0 |
 
 > ### This file is auto-generated by publish-minimum-versions.sh. Do not modify
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/docs/help/about/system-requirements.md b/ios/docs/help/about/system-requirements.md
index afedfdb540..7563130aed 100644
--- a/ios/docs/help/about/system-requirements.md
+++ b/ios/docs/help/about/system-requirements.md
@@ -6,4 +6,4 @@ title: System Requirements - Keyman for iPhone and iPad Help
 
 ### Minimum iOS Version
 Keyman for iPhone and iPad will run on Apple iPhones and iPads that have a minimum version of
-iOS 12.1.
+iOS 15.6
diff --git a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
index 045506b9af..524aecdfba 100644
--- a/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
+++ b/ios/engine/KMEI/KeymanEngine.xcodeproj/project.pbxproj
@@ -530,6 +530,9 @@
 		CEFFECD52A417F1300D58C36 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/ResourceInfoView.strings; sourceTree = "<group>"; };
 		CEFFECD62A417F2900D58C36 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
 		CEFFECD72A417F2E00D58C36 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = es; path = es.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
+		D88EC4042D7876650022CB80 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/ResourceInfoView.strings; sourceTree = "<group>"; };
+		D88EC4052D7876910022CB80 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = "<group>"; };
+		D88EC4062D7876990022CB80 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = vi; path = vi.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		F243887E14BBD43000A3E055 /* KeymanEngineDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = KeymanEngineDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		F27FCAEE157FD59100FBBA20 /* Keyman-iphoneos.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Keyman-iphoneos.xcconfig"; sourceTree = "<group>"; };
 		F27FCAEF157FD59100FBBA20 /* Keyman-iphonesimulator.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Keyman-iphonesimulator.xcconfig"; sourceTree = "<group>"; };
@@ -1215,6 +1218,7 @@
 				ru,
 				es,
 				el,
+				vi,
 			);
 			mainGroup = F243887314BBD43000A3E055;
 			productRefGroup = F243887F14BBD43000A3E055 /* Products */;
@@ -1615,6 +1619,7 @@
 				298566DF2980E48C004ACA95 /* ru */,
 				CEFFECD72A417F2E00D58C36 /* es */,
 				CEAC2A232C2A505700C99ABD /* el */,
+				D88EC4062D7876990022CB80 /* vi */,
 			);
 			name = Localizable.stringsdict;
 			sourceTree = "<group>";
@@ -1644,6 +1649,7 @@
 				298566DE2980E486004ACA95 /* ru */,
 				CEFFECD62A417F2900D58C36 /* es */,
 				CEAC2A242C2A508000C99ABD /* el */,
+				D88EC4052D7876910022CB80 /* vi */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -1674,6 +1680,7 @@
 				298566DD2980E477004ACA95 /* ru */,
 				CEFFECD52A417F1300D58C36 /* es */,
 				CEAC2A222C2A503600C99ABD /* el */,
+				D88EC4042D7876650022CB80 /* vi */,
 			);
 			name = ResourceInfoView.xib;
 			sourceTree = "<group>";
@@ -1711,7 +1718,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 +1764,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 +1812,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 +1856,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 +1907,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 +1962,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 +1986,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 +1999,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 +2028,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 +2065,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 +2117,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 +2158,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 +2182,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 +2201,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 +2251,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 +2299,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 +2340,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 +2392,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 +2435,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 +2456,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 +2489,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/Classes/vi.lproj/ResourceInfoView.strings b/ios/engine/KMEI/KeymanEngine/Classes/vi.lproj/ResourceInfoView.strings
new file mode 100644
index 0000000000..15ca5c7f0a
--- /dev/null
+++ b/ios/engine/KMEI/KeymanEngine/Classes/vi.lproj/ResourceInfoView.strings
@@ -0,0 +1,2 @@
+/* Class = "UILabel"; text = "Scan this code to load this keyboard on another device"; ObjectID = "z2O-MT-IoV"; */
+"z2O-MT-IoV.text" = "Quét mã này để tải bàn phím này trên thiết bị khác";
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/engine/KMEI/KeymanEngine/vi.lproj/Localizable.strings b/ios/engine/KMEI/KeymanEngine/vi.lproj/Localizable.strings
new file mode 100644
index 0000000000..e8569e5971
--- /dev/null
+++ b/ios/engine/KMEI/KeymanEngine/vi.lproj/Localizable.strings
@@ -0,0 +1,275 @@
+/* A descriptive message used for errors when the app is already busy downloading */
+"alert-download-error-busy" = "Đang bận tải xuống.";
+
+/* A descriptive message used when a download fails */
+"alert-download-error-detail" = "Xảy ra lỗi trong quá trình tải xuống hay cài đặt.";
+
+/* Title for a "download failed" alert */
+"alert-download-error-title" = "Lỗi tải xuống";
+
+/* Title for a general alert about errors */
+"alert-error-title" = "Lỗi";
+
+/* A descriptive message used when no internet connection is detected */
+"alert-no-connection-detail" = "Không thể truy cập máy chủ Keyman. Xin thử lại sau.";
+
+/* Title for a "no connection" alert */
+"alert-no-connection-title" = "Lỗi kết nối";
+
+/* Short text for a 'back' navigational command.  Used to return to the previous screen */
+"command-back" = "Quay lại";
+
+/* Short text for a 'cancel' command.  Used to back out of a menu or install process without making changes */
+"command-cancel" = "Huỷ";
+
+/* Short text for a 'done' command.  Used to back out of settings menus after changes have been made */
+"command-done" = "Xong";
+
+/* Short text for an 'install' command.  Used to confirm installation of a package. */
+"command-install" = "Cài đặt";
+
+/* Short text for a 'next' navigational command.  Used to advance to the next screen */
+"command-next" = "Tiếp theo";
+
+/* Short text for an 'OK' command.  Used for some error alerts */
+"command-ok" = "OK";
+
+/* Short text for confirmining 'uninstall' commands. */
+"command-uninstall" = "Gỡ cài đặt";
+
+/* Text for the command to uninstall a keyboard */
+"command-uninstall-keyboard" = "Gỡ cài đặt bàn phím";
+
+/* Confirmation text to display before uninstalling a keyboard */
+"command-uninstall-keyboard-confirm" = "Bạn có muốn gỡ cài đặt bàn phím này không?";
+
+/* Text for the command to uninstall a lexical model */
+"command-uninstall-lexical-model" = "Gỡ cài đặt từ điển";
+
+/* Confirmation text to display before uninstalling a lexical model */
+"command-uninstall-lexical-model-confirm" = "Bạn có muốn gỡ cài đặt từ điển này không?";
+
+/* Text for error when a keyboard cannot load properly */
+"error-loading-keyboard" = "Không thể tải được bàn phím được yêu cầu";
+
+/* Text for error when a lexical model cannot load properly */
+"error-loading-lexical-model" = "Không thể tải được từ điển được yêu cầu";
+
+/* Text for error when an installed file is unexpectedly missing */
+"error-missing-file" = "Không thể tìm thấy tệp được yêu cầu.";
+
+/* Text for error when an installed file is unexpectedly missing */
+"error-missing-file-critical" = "Không thể tìm thấy tệp quan trọng. Xin vui lòng thử cài đặt lại ứng dụng.";
+
+/* Text for errors in data received from search queries */
+"error-query-decoding" = "Máy chủ hiện đang gặp sự cố kỹ thuật";
+
+/* A descriptive message used when a download fails */
+"error-query-general" = "Lỗi giao tiếp với máy chủ";
+
+/* Text for error when a search query is unexpectedly empty */
+"error-query-no-data" = "Máy chủ không trả lời";
+
+/* Text for general errors where not much information is known */
+"error-unknown" = "Một lỗi bất ngờ đã xảy ra";
+
+/* Text for error when updating a resource:  cannot download because no source is available */
+"error-update-no-link" = "Không có nguồn dữ iệu cập nhật có sẵn cho gói này";
+
+/* Text for error when updating a resource:  Keyman does not know how to update the resource */
+"error-update-not-managed" = "Không thể cập nhật kho dữ liệu nào không do bộ máy Keyman quản lý";
+
+/* Text for the command to open the help page of a keyboard, as shown on resource information views */
+"info-command-help-keyboard" = "Trợ giúp bàn phím";
+
+/* Text for the command to open the help page of a lexical model, as shown on resource information views */
+"info-command-help-lexical-model" = "Trợ giúp từ điển";
+
+/* Text label for displaying a keyboard's version, as shown on resource information views */
+"info-label-version-keyboard" = "Phiên bản bàn phím";
+
+/* Text label for displaying a lexical model's version, as shown on resource information views */
+"info-label-version-lexical-model" = "Phiên bản từ điển";
+
+/* Label used for the "package info" / readme tab with the package installation prompt on phones. */
+"installer-label-package-info" = "Thông tin gói hàng";
+
+/* Label used for the language-selection tab with the package installation prompt on phones. */
+"installer-label-select-languages" = "Chọn ngôn ngữ";
+
+/* Label used with a package's version, as seen within the package installation prompt.  Example:  "Version: 14.0.0" */
+"installer-label-version" = "Phiên bản: %@";
+
+/* Section header for languages supported by a package, as seen within the package installation prompt */
+"installer-section-available-languages" = "Các ngôn ngữ có sẵn";
+
+/* Text for the help popup for changing keyboards with the globe key */
+"keyboard-help-change" = "Chạm ở đây để đổi bàn phím";
+
+/* Text for the command to exit the Keyman keyboard in favor of other keyboards installed on the system */
+"keyboard-menu-exit" = "Đóng %@ lại";
+
+/* Error installing a Keyman package - could not allocate a location to install it */
+"kmp-error-file-system" = "Lỗi cài đặt gói - lỗi hệ thống tập tin";
+
+/* Error installing a Keyman package - could not copy package files */
+"kmp-error-file-copying" = "Lỗi cài đặt gói - không thể copy các tập tin yêu cầu";
+
+/* Error opening a Keyman package - package is not valid */
+"kmp-error-invalid" = "Tập tin gói bị hỏng.";
+
+/* Error opening a Keyman package - it does not exist / the specified location is wrong */
+"kmp-error-missing" = "Gói được chỉ định không tồn tại.";
+
+/* Error installing a Keyman package - expected resource (keyboard or dictionary) is missing */
+"kmp-error-missing-resource" = "Gói này không chứa bàn phím hay từ điển yêu cầu.";
+
+/* Error installing a Keyman package with a version of Keyman that does not support it */
+"kmp-error-unsupported-keyman-version" = "Gói phần mềm này yêu cầu phiên bản Keyman mới hơn.";
+
+/* Error opening a Keyman package - cannot parse contents */
+"kmp-error-no-metadata" = "Goi này không được tạo đúng cách - không rõ nội dung.";
+
+/* Error opening a Keyman package - package's contents are for desktop platforms only */
+"kmp-error-unsupported" = "Gói này không bao gồm hỗ trợ cho thiết bị của bạn.";
+
+/* Error opening a Keyman package - package contains unexpected resource (keyboard or dictionary) type */
+"kmp-error-wrong-type" = "Gói này không chứa loại dữ liệu mong đợi.";
+
+/* Title for the Installed Languages menu */
+"menu-installed-languages-title" = "Các ngôn ngữ đã cài đặt";
+
+/* Section header for lexical models within a language-specific settings menu */
+"menu-langsettings-label-lexical-models" = "Từ điển";
+
+/* Section header for keyboards within a language-specific settings menu */
+"menu-langsettings-section-keyboards" = "Bàn phím";
+
+/* Section header for the settings toggles within a language-specific settings menu */
+"menu-langsettings-section-settings" = "Cài đặt ngôn ngữ";
+
+/* Title for the language-specific settings menus */
+"menu-langsettings-title" = "Cài đặt %@";
+
+/* Label for the toggle that enables corrections that is displayed within a language-specific settings menu */
+"menu-langsettings-toggle-correct" = "Bật hiệu chỉnh";
+
+/* Label for the toggle that enables predictions that is displayed within a language-specific settings menu */
+"menu-langsettings-toggle-predict" = "Bật tiên đoán";
+
+/* Help message for a prompt that appears for confirming a lexical model download:  language (1): lexical model (dictionary) name (2) */
+"menu-lexical-model-install-message" = "Bạn có muốn cài đặt từ điển này không?";
+
+/* Title for a prompt that appears for confirming a lexical model download:  language (1): lexical model (dictionary) name (2) */
+"menu-lexical-model-install-title" = "%1$@: %2$@";
+
+/* Text for an info alert indicating that no lexical models are available */
+"menu-lexical-model-none-message" = "Không có từ điển nào";
+
+/* Title for the lexical model menu, a submenu of the language-specific settings menus */
+"menu-lexical-model-title" = "%@ Từ điển";
+
+/* Title for the keyboard picker */
+"menu-picker-title" = "Bàn phím";
+
+/* Primary text for the Settings menu option to report keyboard crashes */
+"menu-settings-error-report" = "Cho phép báo lỗi";
+
+/* Secondary text for the Settings menu option to report keyboard crashes */
+"menu-settings-error-report-description" = "Có thể yêu cầu \"toàn quyền truy cập\"";
+
+/* Primary text for the Settings menu local-file package installation option */
+"menu-settings-install-from-file" = "Cài đặt từ file";
+
+/* Secondary text for the Settings menu local-file package installation option */
+"menu-settings-install-from-file-description" = "Tìm các tập tin .kmp";
+
+/* Primary text for the Settings menu option that displays the iOS system menu options for the app's keyboard */
+"menu-settings-system-keyboard-menu" = "Cài đặt Hệ thống Bàn phím";
+
+/* Label for the "Show Banner" toggle on the main settings screen */
+"menu-settings-show-banner" = "Hiển thị biểu ngữ";
+
+/* Label for the "Get Started" automatic display toggle seen in the Settings menu */
+"menu-settings-startup-get-started" = "Hiển thị 'Bắt đầu' ở startup";
+
+/* Title for the main Settings menu */
+"menu-settings-title" = "Cài đặt Keyman";
+
+/* Secondary text showing current setting for spacebar caption - blank */
+"menu-settings-spacebar-hint-blank" = "Không hiển thị gì trên phím cách";
+
+/* Secondary text showing current setting for spacebar caption - keyboard */
+"menu-settings-spacebar-hint-keyboard" = "Hiển thị tên bàn phím trên phím cách";
+
+/* Secondary text showing current setting for spacebar caption - language */
+"menu-settings-spacebar-hint-language" = "Hiển thị tên ngôn ngữ trên phím cách";
+
+/* Secondary text showing current setting for spacebar caption - language + keyboard */
+"menu-settings-spacebar-hint-languageKeyboard" = "Hiển thị ngôn ngữ và bàn phím trên phím cách";
+
+/* Label for the "Spacebar Caption" item on the main settings screen */
+"menu-settings-spacebar-text" = "Tên phím khoảng cách";
+
+/* Title for the "Spacebar Caption" settings screen */
+"menu-settings-spacebar-title" = "Tên phím khoảng cách";
+
+/* Text showing name of spacebar caption - blank */
+"menu-settings-spacebar-item-blank" = "Trống";
+
+/* Text showing name of spacebar caption - keyboard */
+"menu-settings-spacebar-item-keyboard" = "Bàn phím";
+
+/* Text showing name of spacebar caption - language */
+"menu-settings-spacebar-item-language" = "Ngôn ngữ";
+
+/* Text showing name of spacebar caption - language + keyboard */
+"menu-settings-spacebar-item-languageKeyboard" = "Ngôn ngữ và bàn phím";
+
+/* Label for the "Adjust Keyboard Height" item on the main settings screen */
+"menu-settings-adjust-keyboard-height" = "Điều chỉnh độ cao bàn phím";
+
+/* Title for the "Adjust Keyboard Height" settings child screen */
+"adjust-keyboard-height-title" = "Điều chỉnh bàn phím";
+
+/* Label for "Reset to Default Keyboard Height" button on the adjust height screen */
+"button-label-reset-default-keyboard-height" = "Đặt lại Chiều cao bàn phím mặc định";
+
+/* Instruction text to drag keyboard to resize */
+"keyboard-drag-instructions" = "Kéo mũi tên để điều chỉnh chiều cao bàn phím.";
+
+/* Instruction to rotate to adjust landscape keyboard height (displayed when device is portrait) */
+"portrait-keyboard-rotate-instructions" = "Xoay thiết bị để điều chỉnh theo chiều ngang.";
+
+/* Instruction to rotate to adjust portrait keyboard height (displayed when device is landscape) */
+"landscape-keyboard-rotate-instructions" = "Xoay thiết bị để điều chỉnh theo chiều dọc.";
+
+/* Short text for notification:  download failure for keyboard */
+"notification-download-failure-keyboard" = "Tải bàn phím thất bại";
+
+/* Short text for notification:  download failure for lexical model */
+"notification-download-failure-lexical-model" = "Tải từ điển thất bại";
+
+/* Short text for notification:  download success for keyboard */
+"notification-download-success-keyboard" = "Tải bàn phím thành công";
+
+/* Short text for notification:  download success for lexical model */
+"notification-download-success-lexical-model" = "Tải từ điển thành công";
+
+/* Short text for notification:  downloading a keyboard */
+"notification-downloading-keyboard" = "Đang tải về bàn phím\U2026";
+
+/* Short text for notification:  downloading a lexical model */
+"notification-downloading-lexical-model" = "Đang tải về từ điển\U2026";
+
+/* Short text for notification:  an update is available */
+"notification-update-available" = "Có bản cập nhật mới";
+
+/* Short text for notification:  currently updating */
+"notification-update-processing" = "Đang cập nhật\U2026";
+
+/* Text indicating success at installing new keyboards or dictionaries */
+"success-install" = "Đã cập nhật thành công.";
+
+/* A title to use in alerts indicating 'success' at whatever task the user requested */
+"success-title" = "Thành công";
diff --git a/ios/engine/KMEI/KeymanEngine/vi.lproj/Localizable.stringsdict b/ios/engine/KMEI/KeymanEngine/vi.lproj/Localizable.stringsdict
new file mode 100644
index 0000000000..76ee51ac6f
--- /dev/null
+++ b/ios/engine/KMEI/KeymanEngine/vi.lproj/Localizable.stringsdict
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>menu-langsettings-lexical-model-count</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@count@</string>
+      <key>count</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>u</string>
+        <key>other</key>
+        <string>%u từ điển đã được cài đặt</string>
+      </dict>
+    </dict>
+    <key>notification-update-failed</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@count@</string>
+      <key>count</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>u</string>
+        <key>other</key>
+        <string>%u bản cập nhật thất bại</string>
+      </dict>
+    </dict>
+    <key>notification-update-success</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@count@</string>
+      <key>count</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>u</string>
+        <key>other</key>
+        <string>%u bản cập nhật thành công</string>
+      </dict>
+    </dict>
+    <key>settings-keyboards-installed-count</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@count@</string>
+      <key>count</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>u</string>
+        <key>other</key>
+        <string>%u bàn phím đã được cài đặt</string>
+      </dict>
+    </dict>
+    <key>settings-languages-installed-count</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@count@</string>
+      <key>count</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>u</string>
+        <key>other</key>
+        <string>%u ngôn ngữ đã được cài đặt</string>
+      </dict>
+    </dict>
+    <key>package-default-found-keyboards</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@count@</string>
+      <key>count</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>u</string>
+        <key>other</key>
+        <string>Tìm thấy %u bàn phím trong gói:</string>
+      </dict>
+    </dict>
+    <key>package-default-found-lexical-models</key>
+    <dict>
+      <key>NSStringLocalizedFormatKey</key>
+      <string>%#@count@</string>
+      <key>count</key>
+      <dict>
+        <key>NSStringFormatSpecTypeKey</key>
+        <string>NSStringPluralRuleType</string>
+        <key>NSStringFormatValueTypeKey</key>
+        <string>u</string>
+        <key>other</key>
+        <string>Tìm thấy %u từ điển trong gói:</string>
+      </dict>
+    </dict>
+  </dict>
+</plist>
diff --git a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
index a8b4f8624b..010674c7e0 100644
--- a/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
+++ b/ios/keyman/Keyman/Keyman.xcodeproj/project.pbxproj
@@ -344,6 +344,7 @@
 		CEEF81B92673019600EE6A07 /* es-419 */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-419"; path = "es-419.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		CEF4E55523E95B7B0065B9C7 /* ImageBanner.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ImageBanner.xib; sourceTree = "<group>"; };
 		CEF4E55823E967140065B9C7 /* ImageBannerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageBannerViewController.swift; sourceTree = "<group>"; };
+		D88EC3FC2D785C500022CB80 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -795,6 +796,7 @@
 				uk,
 				ru,
 				el,
+				vi,
 			);
 			mainGroup = 98ABADA7176935E400B62590;
 			productRefGroup = 98ABADB1176935E400B62590 /* Products */;
@@ -1109,6 +1111,7 @@
 				298566D02980D354004ACA95 /* uk */,
 				298566DC2980E416004ACA95 /* ru */,
 				CEAC2A272C2A50E100C99ABD /* el */,
+				D88EC3FC2D785C500022CB80 /* vi */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -1131,7 +1134,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 +1169,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 +1235,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 +1287,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 +1322,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 +1365,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 +1434,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 +1459,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 +1503,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..0a1db264eb 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)
@@ -552,11 +554,7 @@ class MainViewController: UIViewController, TextViewDelegate, UIActionSheetDeleg
       navigationItem.titleView = nil
       navigationItem.rightBarButtonItem = nil
       setNavBarButtons()
-      if shouldShowGetStarted {
-        perform(#selector(self.showGetStartedView), with: nil, afterDelay: 0.75)
-      } else if wasKeyboardVisible {
-        perform(#selector(self.displayKeyboard), with: nil, afterDelay: 0.75)
-      }
+      perform(#selector(self.displayKeyboard), with: nil, afterDelay: 0.75)
     } else {
       _ = dismissDropDownMenu()
       popover?.dismiss(animated: false)
@@ -695,12 +693,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 +702,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/Keyman/vi.lproj/Localizable.strings b/ios/keyman/Keyman/Keyman/vi.lproj/Localizable.strings
new file mode 100644
index 0000000000..8719691bf8
--- /dev/null
+++ b/ios/keyman/Keyman/Keyman/vi.lproj/Localizable.strings
@@ -0,0 +1,81 @@
+/* Title for the bookmarks menu within the embedded browser */
+"browser-bookmarks-add-title" = "Thêm dấu trang";
+
+/* Title for the bookmarks menu within the embedded browser */
+"browser-bookmarks-none" = "Không có dấu trang";
+
+/* Title for the bookmarks menu within the embedded browser */
+"browser-bookmarks-title" = "Dấu trang";
+
+/* Used to confirm a user's desire to install a package */
+"confirm-install" = "Cài đặt";
+
+/* The label for the toggle to stop automatically showing the "Get Started" tutorial popup. */
+"disable-get-started" = "Không hiển thị lại";
+
+/* Indicates an error opening a web page requested by a user */
+"error-opening-page" = "Không thể mở tập tin";
+
+/* Long-form used when installing a font in order to display a language properly. */
+"font-install-description" = "Chạm Cài đặt để làm hiển thị %@ một cách chính xác trên tất cả các ứng dụng của bạn";
+
+/* The name of the iOS Settings menu option for keyboards */
+"ios-settings-keyboards" = "Bàn phím";
+
+/* The name of the iOS Settings menu option for giving the keyboard full access.  (The menu entry
+underneath the app's name within the app-specific keyboard menu.) */
+"ios-settings-allow-full-access" = "Cho phép truy cập đầy đủ";
+
+/* Short-form used when installing a font in order to display a language properly. */
+"language-for-font" = "%@ phông chữ";
+
+/* Used for 'add' options within menus */
+"menu-add" = "Thêm";
+
+/* Used to indicate a sequence of menu options that a user needs to copy.  May be chained.  Example:  "Keyboards (1) > Enable Keyman (2)" */
+"menu-breadcrumbing" = "%1$@ > %2$@";
+
+/* Used to exit a menu without choosing an option */
+"menu-cancel" = "Huỷ";
+
+/* Menu option that erases all previously-typed text. */
+"menu-clear-text" = "Xóa văn bản";
+
+/* Menu option that displays a list designed to help users start using the app */
+"menu-get-started" = "Bắt đầu";
+
+/* Menu option that displays help for the app */
+"menu-help" = "Thông tin";
+
+/* Menu option that displays the main screen's drop-down menu */
+"menu-more" = "Thêm";
+
+/* Menu option used to edit keyboard and dictionary settings */
+"menu-settings" = "Cài đặt";
+
+/* Menu option that displays the iOS Share menu */
+"menu-share" = "Chia sẻ";
+
+/* Menu option that displays an embedded web browser. */
+"menu-show-browser" = "Trình duyệt";
+
+/* Menu option used to control in-app font size. */
+"menu-text-size" = "Cỡ chữ";
+
+/* Used to describe the current font size */
+"text-size-label" = "Cỡ chữ: %i";
+
+/* Text to indicate that a user should set a toggle within iOS Settings to 'active'. */
+"toggle-to-enable" = "Bật %@";
+
+/* First option on the Get Started tutorial - Add a keyboard for your language */
+"tutorial-add-keyboard" = "Thêm bàn phím cho ngôn ngữ của bạn";
+
+/* Third option on the Get Started tutorial - Displays app help. */
+"tutorial-show-help" = "Thông tin thêm";
+
+/* Second option on the Get Started tutorial - Set up Keyman as system-wide keyboard */
+"tutorial-system-keyboard" = "Đặt Keyman làm bàn phím hệ thống";
+
+/* Used to display app version (as in \"Version: 1.0.2\" */
+"version-label" = "Phiên bản: %@";
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/changelog b/linux/debian/changelog
index a15c962527..0487401c59 100644
--- a/linux/debian/changelog
+++ b/linux/debian/changelog
@@ -1,3 +1,17 @@
+keyman (18.0.199-2) unstable; urgency=medium
+
+  * Team upload.
+  * Source-only upload.
+
+ -- Boyuan Yang <byang@debian.org>  Thu, 27 Feb 2025 14:17:40 -0500
+
+keyman (18.0.199-1) unstable; urgency=medium
+
+  * closes: 1092463
+  * New upstream release.
+
+ -- Eberhard Beilharz <eb1@sil.org>  Tue, 25 Feb 2025 14:57:28 +0100
+
 keyman (17.0.335-1) unstable; urgency=medium
 
   * New upstream release.
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/locale/vi_VN.po b/linux/keyman-config/locale/vi_VN.po
new file mode 100644
index 0000000000..f4da1cf217
--- /dev/null
+++ b/linux/keyman-config/locale/vi_VN.po
@@ -0,0 +1,332 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: keyman\n"
+"Report-Msgid-Bugs-To: <support@keyman.com>\n"
+"POT-Creation-Date: 2020-08-19 19:17+0200\n"
+"PO-Revision-Date: 2025-02-22 00:36\n"
+"Last-Translator: \n"
+"Language-Team: Vietnamese\n"
+"Language: vi_VN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Crowdin-Project: keyman\n"
+"X-Crowdin-Project-ID: 386703\n"
+"X-Crowdin-Language: vi\n"
+"X-Crowdin-File: /master/linux/keyman-config.pot\n"
+"X-Crowdin-File-ID: 504\n"
+
+#: keyman_config/__init__.py:68
+msgid "Neither sentry-sdk nor raven is available. Not enabling Sentry error reporting."
+msgstr "Không có sẵn cả sentry-sdk và raven. Không bật báo cáo lỗi Sentry."
+
+#: keyman_config/downloadkeyboard.py:23
+msgid "Download Keyman keyboards"
+msgstr "Tải xuống bàn phím Keyman"
+
+#: keyman_config/downloadkeyboard.py:37 keyman_config/keyboard_details.py:49
+#: keyman_config/keyboard_details.py:340 keyman_config/view_installed.py:205
+msgid "_Close"
+msgstr "_Đóng"
+
+#: keyman_config/install_kmp.py:99
+msgid "You do not have permissions to install the keyboard files to the shared area /usr/local/share/keyman"
+msgstr "Bạn không có quyền cài đặt các tập tin bàn phím vào vùng chia sẻ /usr/local/share/keyman"
+
+#: keyman_config/install_kmp.py:103
+msgid "You do not have permissions to install the documentation to the shared documentation area /usr/local/share/doc/keyman"
+msgstr "Bạn không có quyền cài đặt tài liệu vào vùng tài liệu được chia sẻ /usr/local/share/doc/keyman"
+
+#: keyman_config/install_kmp.py:107
+msgid "You do not have permissions to install the font files to the shared font area /usr/local/share/fonts"
+msgstr "Bạn không có quyền cài đặt các tệp phông chữ vào vùng phông chữ được chia sẻ /usr/local/share/fonts"
+
+#: keyman_config/install_kmp.py:179
+#, python-brace-format
+msgid "install_kmp.py: error: No kmp.json or kmp.inf found in {package}"
+msgstr "install_kmp.py: lỗi: Không có kmp.json hay kmp.inf được tìm thấy {package}"
+
+#: keyman_config/install_kmp.py:246
+#, python-brace-format
+msgid "install_kmp.py: error: No kmp.json or kmp.inf found in {packageFile}"
+msgstr "install_kmp.py: lỗi: Không có kmp.json hay kmp.inf được tìm thấy {packageFile}"
+
+#: keyman_config/install_window.py:54
+#, python-brace-format
+msgid "Installing keyboard/package {keyboardid}"
+msgstr "Đang cài đặt gói/bàn phím {keyboardid}"
+
+#: keyman_config/install_window.py:72 keyman_config/install_window.py:93
+msgid "Keyboard is installed already"
+msgstr "Bàn phím đã được cài đặt rồi"
+
+#: keyman_config/install_window.py:74
+#, python-brace-format
+msgid "The {name} keyboard is already installed at version {version}. Do you want to uninstall then reinstall it?"
+msgstr "Bàn phím {name} đã được cài đặt ở phiên bản {version}. Bạn có muốn gỡ cài đặt rồi cài đặt lại nó chứ?"
+
+#: keyman_config/install_window.py:95
+#, python-brace-format
+msgid "The {name} keyboard is already installed with a newer version {installedversion}. Do you want to uninstall it and install the older version {version}?"
+msgstr "Bàn phím {name} đã được cài đặt với phiên bản mới nhất {installedversion}. Bạn có muốn gỡ cài đặt rồi cài đặt phiên bản cũ nhất {version} không?"
+
+#: keyman_config/install_window.py:128
+msgid "Keyboard layouts:   "
+msgstr "Bố trí bàn phím:   "
+
+#: keyman_config/install_window.py:147
+msgid "Fonts:   "
+msgstr "Phông chữ:   "
+
+#: keyman_config/install_window.py:167 keyman_config/keyboard_details.py:96
+msgid "Package version:   "
+msgstr "Phiên bản gói:   "
+
+#: keyman_config/install_window.py:179
+msgid "Author:   "
+msgstr "Tác giả:   "
+
+#: keyman_config/install_window.py:197
+msgid "Website:   "
+msgstr "Website:   "
+
+#: keyman_config/install_window.py:211
+msgid "Copyright:   "
+msgstr "Bản quyền:   "
+
+#: keyman_config/install_window.py:245
+msgid "Details"
+msgstr "Chi tiết"
+
+#: keyman_config/install_window.py:248
+msgid "README"
+msgstr "README"
+
+#: keyman_config/install_window.py:256 keyman_config/view_installed.py:200
+msgid "_Install"
+msgstr "_Cài đặt"
+
+#: keyman_config/install_window.py:260
+msgid "_Cancel"
+msgstr "_Hủy bỏ"
+
+#: keyman_config/install_window.py:305
+#, python-brace-format
+msgid "Keyboard {name} installed"
+msgstr "Bàn phím {name} đã được cài đặt"
+
+#: keyman_config/install_window.py:310 keyman_config/install_window.py:315
+#, python-brace-format
+msgid "Keyboard {name} could not be installed."
+msgstr "Bàn phím {name} không thể cài đặt được."
+
+#: keyman_config/install_window.py:311
+msgid "Error Message:"
+msgstr "Thông báo lỗi:"
+
+#: keyman_config/install_window.py:316
+msgid "Warning Message:"
+msgstr "Thông báo cảnh báo:"
+
+#: keyman_config/keyboard_details.py:37
+#, python-brace-format
+msgid "{name} keyboard"
+msgstr "Bàn phím {name}"
+
+#: keyman_config/keyboard_details.py:53
+msgid "ERROR: Keyboard metadata is damaged.\n"
+"Please \"Uninstall\" and then \"Install\" the keyboard."
+msgstr "LỖI: Siêu dữ liệu bàn phím bị hỏng.\n"
+"Vui lòng \"Gỡ cài đặt\" rồi \"Cài đặt\" bàn phím."
+
+#: keyman_config/keyboard_details.py:74
+msgid "Package name:   "
+msgstr "Tên gói:   "
+
+#: keyman_config/keyboard_details.py:85
+msgid "Package id:   "
+msgstr "id gói:   "
+
+#: keyman_config/keyboard_details.py:108
+msgid "Package description:   "
+msgstr "Mô tả gói:   "
+
+#: keyman_config/keyboard_details.py:121
+msgid "Package author:   "
+msgstr "Tác giả gói:   "
+
+#: keyman_config/keyboard_details.py:133
+msgid "Package copyright:   "
+msgstr "Bản quyền gói:   "
+
+#: keyman_config/keyboard_details.py:174
+msgid "Keyboard filename:   "
+msgstr "Tên tệp bàn phím:   "
+
+#: keyman_config/keyboard_details.py:187
+msgid "Keyboard name:   "
+msgstr "Tên bàn phím:   "
+
+#: keyman_config/keyboard_details.py:198
+msgid "Keyboard id:   "
+msgstr "id bàn phím:   "
+
+#: keyman_config/keyboard_details.py:209
+msgid "Keyboard version:   "
+msgstr "Phiên bản bàn phím:   "
+
+#: keyman_config/keyboard_details.py:221
+msgid "Keyboard author:   "
+msgstr "Tác giả bàn phím:   "
+
+#: keyman_config/keyboard_details.py:232
+msgid "Keyboard license:   "
+msgstr "Giấy phép bàn phím:   "
+
+#: keyman_config/keyboard_details.py:243
+msgid "Keyboard description:   "
+msgstr "Mô tả bàn phím:   "
+
+#: keyman_config/keyboard_details.py:334
+#, python-brace-format
+msgid "Scan this code to load this keyboard\n"
+"on another device or <a href='{uri}'>share online</a>"
+msgstr "Quét mã này để tải bàn phím này\n"
+"trên thiết bị khác hoặc <a href='{uri}'>chia sẻ trực tuyến</a>"
+
+#: keyman_config/options.py:24
+#, python-brace-format
+msgid "{packageId} Settings"
+msgstr "Cài đặt {packageId}"
+
+#: keyman_config/view_installed.py:30
+msgid "Keyman Configuration"
+msgstr "Cấu hình Keyman"
+
+#: keyman_config/view_installed.py:60
+msgid "Choose a kmp file..."
+msgstr "Chọn một tệp kmp..."
+
+#. i18n: file type in file selection dialog
+#: keyman_config/view_installed.py:65
+msgid "KMP files"
+msgstr "Tệp KMP"
+
+#. i18n: column header in table displaying installed keyboards
+#: keyman_config/view_installed.py:141
+msgid "Icon"
+msgstr "Icon"
+
+#. i18n: column header in table displaying installed keyboards
+#: keyman_config/view_installed.py:145
+msgid "Name"
+msgstr "Tên"
+
+#. i18n: column header in table displaying installed keyboards
+#: keyman_config/view_installed.py:148
+msgid "Version"
+msgstr "Phiên bản"
+
+#: keyman_config/view_installed.py:161
+msgid "_Uninstall"
+msgstr "_Gỡ cài đặt"
+
+#: keyman_config/view_installed.py:162 keyman_config/view_installed.py:304
+msgid "Uninstall keyboard"
+msgstr "_Gỡ cài đặt bàn phím"
+
+#: keyman_config/view_installed.py:167
+msgid "_About"
+msgstr "_Về"
+
+#: keyman_config/view_installed.py:168 keyman_config/view_installed.py:306
+msgid "About keyboard"
+msgstr "Về bàn phím"
+
+#: keyman_config/view_installed.py:173
+msgid "_Help"
+msgstr "_Trợ giúp"
+
+#: keyman_config/view_installed.py:174 keyman_config/view_installed.py:305
+msgid "Help for keyboard"
+msgstr "Trợ giúp cho bàn phím"
+
+#: keyman_config/view_installed.py:179
+msgid "_Options"
+msgstr "_Tùy chọn"
+
+#: keyman_config/view_installed.py:180 keyman_config/view_installed.py:307
+msgid "Settings for keyboard"
+msgstr "Cài đặt cho bàn phím"
+
+#: keyman_config/view_installed.py:190
+msgid "_Refresh"
+msgstr "_Làm mới"
+
+#: keyman_config/view_installed.py:191
+msgid "Refresh keyboard list"
+msgstr "Làm mới danh sách bàn phím"
+
+#: keyman_config/view_installed.py:195
+msgid "_Download"
+msgstr "_Tải xuống"
+
+#: keyman_config/view_installed.py:196
+msgid "Download and install a keyboard from the Keyman website"
+msgstr "Tải xuống rồi cài đặt một bàn phím từ trang Keyman"
+
+#: keyman_config/view_installed.py:201
+msgid "Install a keyboard from a file"
+msgstr "Cài đặt bàn phím từ một tệp"
+
+#: keyman_config/view_installed.py:206
+msgid "Close window"
+msgstr "Đóng cửa sổ"
+
+#: keyman_config/view_installed.py:278
+#, python-brace-format
+msgid "Uninstall keyboard {package}"
+msgstr "Gỡ cài đặt bàn phím {package}"
+
+#: keyman_config/view_installed.py:280
+#, python-brace-format
+msgid "Help for keyboard {package}"
+msgstr "Trợ giúp cho bàn phím {package}"
+
+#: keyman_config/view_installed.py:282
+#, python-brace-format
+msgid "About keyboard {package}"
+msgstr "Về bàn phím {package}"
+
+#: keyman_config/view_installed.py:284
+#, python-brace-format
+msgid "Settings for keyboard {package}"
+msgstr "Cài đặt cho bàn phím {package}"
+
+#: keyman_config/view_installed.py:349
+msgid "Uninstall keyboard package?"
+msgstr "Gỡ cài đặt gói bàn phím?"
+
+#: keyman_config/view_installed.py:351
+#, python-brace-format
+msgid "Are you sure that you want to uninstall the {keyboard} keyboard and its fonts?"
+msgstr "Bạn có chắc rằng muốn gỡ cài đặt bàn phím {keyboard} cùng phông chữ của nó?"
+
+#: keyman_config/welcome.py:22
+#, python-brace-format
+msgid "{name} installed"
+msgstr "{name} đã được cài đặt"
+
+#: keyman_config/welcome.py:40
+msgid "Open in _Web browser"
+msgstr "Mở trong _Trình duyệt"
+
+#: keyman_config/welcome.py:42
+msgid "Open in the default web browser to do things like printing"
+msgstr "Mở trong trình duyệt mặc định để thực hiện những việc như in ấn"
+
+#: keyman_config/welcome.py:45
+msgid "_OK"
+msgstr "_OK"
+
diff --git a/linux/keyman-config/tests/canonical_language_code_utils_tests.py b/linux/keyman-config/tests/canonical_language_code_utils_tests.py
index 87bcf76244..ac75f20eb9 100644
--- a/linux/keyman-config/tests/canonical_language_code_utils_tests.py
+++ b/linux/keyman-config/tests/canonical_language_code_utils_tests.py
@@ -21,8 +21,8 @@ class CanonicalLanguageCodeUtilsTests(unittest.TestCase):
             { 'expected': 'sqt-Arab-YE', 'tags': ['sqt', 'sqt-YE', 'sqt-Arab'] },
             { 'expected': 'sqt-Latn-YE', 'tags': ['sqt-Latn', 'sqt-Latn-YE'] },
 
-            {'expected': 'sa-Latn', 'tags': ['sa-Latn']},
-            {'expected': 'he-Latn', 'tags': ['he-Latn']},
+            {'expected': 'sa-Latn-IN', 'tags': ['sa-Latn']},
+            {'expected': 'he-Latn-IL', 'tags': ['he-Latn']},
             {'expected': 'hi-Latn-IN', 'tags': ['hi-Latn']},
 
             # #1282
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/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj b/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj
index 87b005309c..ad57bfbd66 100644
--- a/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj
+++ b/mac/Keyman4MacIM/Keyman4MacIM.xcodeproj/project.pbxproj
@@ -375,6 +375,12 @@
 		CEFFECDD2A4180FD00D58C36 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
 		D861B03D2C5747F70003675E /* KMSettingsRepository.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KMSettingsRepository.h; sourceTree = "<group>"; };
 		D861B03E2C5747F70003675E /* KMSettingsRepository.m */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = KMSettingsRepository.m; sourceTree = "<group>"; tabWidth = 2; };
+		D88EC4072D7878C10022CB80 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/KMAboutWindowController.strings; sourceTree = "<group>"; };
+		D88EC4082D7878C20022CB80 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/preferences.strings; sourceTree = "<group>"; };
+		D88EC4092D7878C20022CB80 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/KMInfoWindowController.strings; sourceTree = "<group>"; };
+		D88EC40A2D7878C20022CB80 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/KMKeyboardHelpWindowController.strings; sourceTree = "<group>"; };
+		D88EC40B2D7878C30022CB80 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		D88EC40C2D7878ED0022CB80 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E211769B20E1826800F8065D /* NoContextTestClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NoContextTestClient.h; sourceTree = "<group>"; };
 		E211769C20E182DD00F8065D /* NoContextTestClient.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NoContextTestClient.m; sourceTree = "<group>"; };
 		E211769E20E18C0B00F8065D /* AppleCompliantTestClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppleCompliantTestClient.h; sourceTree = "<group>"; };
@@ -838,6 +844,7 @@
 				ru,
 				es,
 				el,
+				vi,
 			);
 			mainGroup = 989C9BFF1A7876DE00A20425;
 			productRefGroup = 989C9C091A7876DE00A20425 /* Products */;
@@ -1105,6 +1112,7 @@
 				298566E02980E579004ACA95 /* ru */,
 				CEFFECD82A417FEA00D58C36 /* es */,
 				29D470942C648D5100224B4F /* el */,
+				D88EC4072D7878C10022CB80 /* vi */,
 			);
 			name = KMAboutWindowController.xib;
 			sourceTree = "<group>";
@@ -1132,6 +1140,7 @@
 				298566E12980E579004ACA95 /* ru */,
 				CEFFECD92A417FEB00D58C36 /* es */,
 				29D470952C648D5100224B4F /* el */,
+				D88EC4082D7878C20022CB80 /* vi */,
 			);
 			name = preferences.xib;
 			path = Keyman4MacIM/KMConfiguration;
@@ -1159,6 +1168,7 @@
 				298566E52980E584004ACA95 /* ru */,
 				CEFFECDD2A4180FD00D58C36 /* es */,
 				29D470992C648D7100224B4F /* el */,
+				D88EC40C2D7878ED0022CB80 /* vi */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -1186,6 +1196,7 @@
 				298566E22980E57A004ACA95 /* ru */,
 				CEFFECDA2A417FEB00D58C36 /* es */,
 				29D470962C648D5200224B4F /* el */,
+				D88EC4092D7878C20022CB80 /* vi */,
 			);
 			name = KMInfoWindowController.xib;
 			path = Keyman4MacIM/KMInfoWindow;
@@ -1214,6 +1225,7 @@
 				298566E32980E57A004ACA95 /* ru */,
 				CEFFECDB2A417FEC00D58C36 /* es */,
 				29D470972C648D5200224B4F /* el */,
+				D88EC40A2D7878C20022CB80 /* vi */,
 			);
 			name = KMKeyboardHelpWindowController.xib;
 			path = Keyman4MacIM/KMKeyboardHelpWindow;
@@ -1242,6 +1254,7 @@
 				298566E42980E57A004ACA95 /* ru */,
 				CEFFECDC2A417FEC00D58C36 /* es */,
 				29D470982C648D5200224B4F /* el */,
+				D88EC40B2D7878C30022CB80 /* vi */,
 			);
 			name = MainMenu.xib;
 			sourceTree = "<group>";
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/vi.lproj/KMAboutWindowController.strings b/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/vi.lproj/KMAboutWindowController.strings
new file mode 100644
index 0000000000..6b0bbcb6b9
--- /dev/null
+++ b/mac/Keyman4MacIM/Keyman4MacIM/KMAboutWindow/vi.lproj/KMAboutWindowController.strings
@@ -0,0 +1,8 @@
+/* button text to close the About window */
+"Kab-Up-fYH.title" = "Đóng";
+
+/* text of link to the license agreement */
+"hYC-Bx-aoP.title" = "Thỏa thuận cấp phép";
+
+/* button text to open Configuration window  */
+"vkh-b5-vO7.title" = "Cấu hình...";
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/vi.lproj/preferences.strings b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/vi.lproj/preferences.strings
new file mode 100644
index 0000000000..f99aa6f525
--- /dev/null
+++ b/mac/Keyman4MacIM/Keyman4MacIM/KMConfiguration/vi.lproj/preferences.strings
@@ -0,0 +1,38 @@
+/* Checkbox text to always show on-screen keyboard */
+"4UX-80-0Vo.title" = "Luôn hiện bàn phím ảo";
+
+/* Checkbox text to enable verbose Console logging */
+"7J6-zy-R20.title" = "Chọn verbose Console logging";
+
+/* Support button text  */
+"93O-x6-RLF.label" = "Hỗ trợ";
+
+/* Download Keyboard button text */
+"CTw-kf-WNS.title" = "Tải về bàn phím...";
+
+/* Keyman Configuration window title */
+"F0z-JX-Cv5.title" = "Cấu hình Keyman";
+
+/* button text to go back to previous page */
+"JOK-JV-n8w.title" = "Quay lại";
+
+/* Keyboards button text */
+"MPN-9N-wWc.label" = "Bàn phím";
+
+/* text to explain verbose Console logging option */
+"MrI-GM-7d6.title" = "Khi tuỳ chọn ghi nhật ký chi tiết được bật, Keyman sẽ ghi các hành động có thể giúp Bộ phận Hỗ trợ Keyman chẩn đoán sự cố. Chương trình Console có thể được sử dụng để xem nhật ký tin nhắn từ Keyman. Trong Console, bộ lọc để hiển thị tất cả tin nhắn từ quá trình \"Keyman\". Nhật ký này có thể được xuất khẩu và gửi cho Bộ phận Hỗ trợ Keyman nếu cần.";
+
+/* button text to move forward to the next page */
+"eXr-8V-h1g.title" = "Chuyển tiếp";
+
+/* button text to return to the home help page */
+"fXS-aC-CMH.title" = "Trang chủ";
+
+/* Options button text */
+"frd-No-seV.label" = "Tùy chỉnh";
+
+/* Installed Keyboard column heading */
+"jex-Nd-Qzg.headerCell.title" = "Bàn phím được tải về";
+
+/* Verbose logging tooltip text */
+"uWx-3J-U0D.ibShadowedToolTip" = "Mở cái này khi bạn có khó khăn với một bàn phím cụ thể nói riêng hoặc với Keyman nói chung.";
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/vi.lproj/KMInfoWindowController.strings b/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/vi.lproj/KMInfoWindowController.strings
new file mode 100644
index 0000000000..1a9024deec
--- /dev/null
+++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInfoWindow/vi.lproj/KMInfoWindowController.strings
@@ -0,0 +1,8 @@
+/* Package Information window title */
+"F0z-JX-Cv5.title" = "Thông tin gói";
+
+/* button text to show Details */
+"Fvy-XJ-s38.label" = "Chi tiết";
+
+/* button text to show Read Me */
+"waA-IW-Qyn.label" = "Đọc tôi";
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m
index 5e88d2b59b..168c0400fa 100644
--- a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m
+++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodAppDelegate.m
@@ -894,7 +894,7 @@ CGEventRef eventTapFunction(CGEventTapProxy proxy, CGEventType type, CGEventRef
   [self setKeyboardName:nil];
   [self setKeyboardIcon:nil];
   [self setContextBuffer:nil];
-  [self setSelectedKeyboard:nil];
+  [self setSelectedKeyboard:@""];
 }
 
 - (void)selectKeyboardFromMenu:(NSInteger)tag {
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodEventHandler.m b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodEventHandler.m
index d4ab67d10f..d693087699 100644
--- a/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodEventHandler.m
+++ b/mac/Keyman4MacIM/Keyman4MacIM/KMInputMethodEventHandler.m
@@ -38,17 +38,21 @@ CGEventSourceRef _sourceForGeneratedEvent = nil;
 
 // This is the public initializer.
 - (instancetype)initWithClient:(NSString *)clientAppId client:(id) sender {
-  _keySender = [[KeySender alloc] init];
-  _clientApplicationId = clientAppId;
-  _generatedBackspaceCount = 0;
-  _lowLevelBackspaceCount = 0;
-  _queuedText = nil;
+  self = [super init];
+  if(self) {
+    _keySender = [[KeySender alloc] init];
+    _clientApplicationId = clientAppId;
+    _generatedBackspaceCount = 0;
+    _lowLevelBackspaceCount = 0;
+    _queuedText = nil;
+ 
+    os_log_debug([KMLogs lifecycleLog], "KMInputMethodEventHandler initWithClient [client: %p] [clientAppId: %{public}@]", sender, clientAppId);
+    [KMSentryHelper addInfoBreadCrumb:@"lifecycle" message:[NSString stringWithFormat:@"KMInputMethodEventHandler initWithClient, clientAppId '%@'", clientAppId]];
 
-  _apiCompliance = [[TextApiCompliance alloc]initWithClient:sender applicationId:clientAppId];
-  os_log_info([KMLogs lifecycleLog], "KMInputMethodEventHandler initWithClient, clientAppId: %{public}@", clientAppId);
-  [KMSentryHelper addInfoBreadCrumb:@"lifecycle" message:[NSString stringWithFormat:@"KMInputMethodEventHandler initWithClient, clientAppId '%@'", clientAppId]];
-
-  [KMSentryHelper addClientAppIdTag:clientAppId];
+    _apiCompliance = [[TextApiCompliance alloc]initWithClient:sender applicationId:clientAppId];
+    
+    [KMSentryHelper addClientAppIdTag:clientAppId];
+  }
   return self;
 }
 
@@ -191,32 +195,34 @@ CGEventSourceRef _sourceForGeneratedEvent = nil;
   // If the TextApiCompliance object is stale, create a new one for the current application and context.
   // The text api compliance may vary from one text field to another of the same app.
   
-  if ([self textApiComplianceIsStale]) {
+  if ([self textApiComplianceIsStale:client]) {
     self.apiCompliance = [[TextApiCompliance alloc]initWithClient:client applicationId:self.clientApplicationId];
     os_log_debug([KMLogs complianceLog], "KMInputMethodHandler initWithClient checkTextApiCompliance: %{public}@", _apiCompliance);
   } else if (self.apiCompliance.isComplianceUncertain) {
     // We have a valid TextApiCompliance object, but compliance is uncertain, so test it
-    [self.apiCompliance checkCompliance:client];
+    [self.apiCompliance checkCompliance];
   }
 }
 
-- (BOOL)textApiComplianceIsStale {
+- (BOOL)textApiComplianceIsStale:(id)client {
   BOOL stale = false;
   NSString *complianceAppId = nil;
   TextApiCompliance *currentApiCompliance = self.apiCompliance;
   
   // test for three scenarios in which the api compliance is stale
   if (currentApiCompliance == nil) { // if we have no previous api compliance object
+    os_log_debug([KMLogs complianceLog], "*** stale: currentApiCompliance == nil");
     stale = true;
   } else { // if we have one but for a different client
-    complianceAppId = self.apiCompliance.clientApplicationId;
-    if ([complianceAppId isNotEqualTo:self.clientApplicationId]) {
-      stale = true;
-    } else {
-      stale = false;
+    stale = ![currentApiCompliance isMatchingClient:client applicationId:self.clientApplicationId];
+    if (stale){
+      os_log_debug([KMLogs complianceLog], "*** stale: due to failed isMatchingClient");
     }
   }
   if (self.contextChanged) { // if the context has changed
+    if(!stale) {
+      os_log_debug([KMLogs complianceLog], "*** stale: due to contextChanged");
+    }
     stale = true;
   }
 
@@ -318,7 +324,7 @@ CGEventSourceRef _sourceForGeneratedEvent = nil;
   // we do this whether the context has changed or not
   if (self.apiCompliance.canReadText) {
     contextString = [self readContext:event forClient:client];
-    os_log_debug([KMLogs eventsLog], "reportContext, setting new context='%{public}@' for compliant app (if needed)", contextString);
+    os_log_debug([KMLogs eventsLog], "reportContext, setting new context for compliant app (if needed)");
     [self.kme setCoreContextIfNeeded:contextString];
   } else if (self.contextChanged) {
     // we cannot read the text but know the context has changed, so we must clear it
@@ -384,15 +390,21 @@ CGEventSourceRef _sourceForGeneratedEvent = nil;
   BOOL handledEvent = YES;
   
   if (output.isInsertOnlyScenario) {
-    os_log_debug([KMLogs keyLog], "applyOutputToTextInputClient, insert only scenario");
+    NSString *message = @"applyOutputToTextInputClient, insert only scenario";
+    os_log_debug([KMLogs keyLog], "%@", message);
+    [KMSentryHelper addDebugBreadCrumb:@"event" message:message];
     [self insertAndReplaceTextForOutput:output client:client];
   } else if (output.isDeleteOnlyScenario) {
     if ((event.keyCode == kVK_Delete) && output.codePointsToDeleteBeforeInsert == 1) {
       // let the delete pass through in the original event rather than sending a new delete
-      os_log_debug([KMLogs keyLog], "applyOutputToTextInputClient, delete only scenario with passthrough");
+      NSString *message = @"applyOutputToTextInputClient, delete only scenario with passthrough";
+      os_log_debug([KMLogs keyLog], "%@", message);
+      [KMSentryHelper addDebugBreadCrumb:@"event" message:message];
       handledEvent = NO;
     } else {
-      os_log_debug([KMLogs keyLog], "applyOutputToTextInputClient, delete only scenario");
+      NSString *message = @"applyOutputToTextInputClient, delete only scenario";
+      os_log_debug([KMLogs keyLog], "%@", message);
+      [KMSentryHelper addDebugBreadCrumb:@"event" message:message];
       [self sendEvents:event forOutput:output];
     }
   } else if (output.isDeleteAndInsertScenario) {
@@ -414,10 +426,14 @@ CGEventSourceRef _sourceForGeneratedEvent = nil;
      */
     
     if (self.apiCompliance.mustBackspaceUsingEvents) {
-      os_log_debug([KMLogs keyLog], "applyOutputToTextInputClient, delete and insert scenario with events");
+      NSString *message = @"applyOutputToTextInputClient, delete and insert scenario with events";
+      os_log_debug([KMLogs keyLog], "%@", message);
+      [KMSentryHelper addDebugBreadCrumb:@"event" message:message];
       [self sendEvents:event forOutput:output];
     } else {
-      os_log_debug([KMLogs keyLog], "applyOutputToTextInputClient, delete and insert scenario with insert API");
+      NSString *message = @"applyOutputToTextInputClient, delete and insert scenario with insert API";
+      os_log_debug([KMLogs keyLog], "%@", message);
+      [KMSentryHelper addDebugBreadCrumb:@"event" message:message];
       // directly insert text and handle backspaces by using replace
       [self insertAndReplaceTextForOutput:output client:client];
     }
@@ -474,13 +490,13 @@ CGEventSourceRef _sourceForGeneratedEvent = nil;
  * this method can only be used if approved by TextApiCompliance
  */
 -(void)insertAndReplaceText:(NSString *)text deleteCount:(int) replacementCount toReplace:(NSString*)textToDelete client:(id) client {
-  os_log_debug([KMLogs keyLog], "insertAndReplaceText, insert: %{public}@, delete: %{public}@, replacementCount: %d", text, textToDelete, replacementCount);
   NSRange selectionRange = [client selectedRange];
   NSRange replacementRange = [self calculateInsertRangeForDeletedText:textToDelete selectionRange:selectionRange];
   
   [client insertText:text replacementRange:replacementRange];
-  if (self.apiCompliance.isComplianceUncertain) {
-    [self.apiCompliance checkComplianceAfterInsert:client delete:textToDelete insert:text];
+  
+  if ((self.apiCompliance.isComplianceUncertain) && (text != nil)) {
+    [self.apiCompliance checkComplianceAfterInsert:text deleted:textToDelete];
   }
 }
 
@@ -531,7 +547,7 @@ CGEventSourceRef _sourceForGeneratedEvent = nil;
 -(void)insertQueuedText: (NSEvent *)event client:(id) client  {
   if (self.queuedText.length> 0) {
     os_log_debug([KMLogs keyLog], "insertQueuedText, inserting %{public}@", self.queuedText);
-    [self insertAndReplaceText:self.queuedText deleteCount:0 toReplace:nil client:client];
+    [self insertAndReplaceText:self.queuedText deleteCount:0 toReplace:@"" client:client];
     self.queuedText = nil;
   } else {
     os_log_debug([KMLogs keyLog], "insertQueuedText called but no text to insert");
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMKeyboardHelpWindow/vi.lproj/KMKeyboardHelpWindowController.strings b/mac/Keyman4MacIM/Keyman4MacIM/KMKeyboardHelpWindow/vi.lproj/KMKeyboardHelpWindowController.strings
new file mode 100644
index 0000000000..e2bc00ca2e
--- /dev/null
+++ b/mac/Keyman4MacIM/Keyman4MacIM/KMKeyboardHelpWindow/vi.lproj/KMKeyboardHelpWindowController.strings
@@ -0,0 +1,8 @@
+/* Keyboard Help window title */
+"F0z-JX-Cv5.title" = "Hướng dẫn bàn phím";
+
+/* OK button text */
+"Zla-QF-m0K.title" = "OK";
+
+/* Print button text */
+"fYY-Uj-y4S.title" = "In...";
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.m b/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.m
index 120c26e2c4..709b1c1d6d 100644
--- a/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.m
+++ b/mac/Keyman4MacIM/Keyman4MacIM/KMSettingsRepository.m
@@ -148,8 +148,10 @@ NSInteger const kCurrentDataModelVersionNumber = kVersionStoreDataInLibraryDirec
 }
 
 - (void)writeSelectedKeyboard:(NSString *)selectedKeyboard {
-  NSUserDefaults *userData = [NSUserDefaults standardUserDefaults];
-  [userData setObject:selectedKeyboard forKey:kSelectedKeyboardKey];
+  if (selectedKeyboard != nil) {
+    NSUserDefaults *userData = [NSUserDefaults standardUserDefaults];
+    [userData setObject:selectedKeyboard forKey:kSelectedKeyboardKey];
+  }
 }
 
 - (NSMutableArray *)activeKeyboards {
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/Privacy/PrivacyWindowController.m b/mac/Keyman4MacIM/Keyman4MacIM/Privacy/PrivacyWindowController.m
index 3b6de585cd..9547d8b558 100644
--- a/mac/Keyman4MacIM/Keyman4MacIM/Privacy/PrivacyWindowController.m
+++ b/mac/Keyman4MacIM/Keyman4MacIM/Privacy/PrivacyWindowController.m
@@ -13,6 +13,7 @@
  */
 
 #import "PrivacyWindowController.h"
+#import "KMLogs.h"
 
 @interface PrivacyWindowController ()
 @end
@@ -25,7 +26,14 @@
   NSString *bundleDisplayName = [[[NSBundle mainBundle] localizedInfoDictionary]
                                  objectForKey:@"CFBundleDisplayName"];
   [self.window setTitle:bundleDisplayName];
-  [_alertText setStringValue:NSLocalizedString(@"privacy-alert-text", nil)];
+
+  if (@available(macOS 13.0, *)) {
+    os_log_info([KMLogs privacyLog], "setting privacy window text for ventura and later");
+    [_alertText setStringValue:NSLocalizedString(@"privacy-alert-text-ventura", nil)];
+  } else {
+    os_log_info([KMLogs privacyLog], "setting privacy window text for pre-ventura");
+   [_alertText setStringValue:NSLocalizedString(@"privacy-alert-text", nil)];
+  }
   
   NSImage *keymanLogo = [NSImage imageNamed:NSImageNameApplicationIcon];
   if (keymanLogo) {
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/TextApiCompliance.h b/mac/Keyman4MacIM/Keyman4MacIM/TextApiCompliance.h
index 81cc4c3b34..1f5b55f17f 100644
--- a/mac/Keyman4MacIM/Keyman4MacIM/TextApiCompliance.h
+++ b/mac/Keyman4MacIM/Keyman4MacIM/TextApiCompliance.h
@@ -13,12 +13,13 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface TextApiCompliance : NSObject
-@property (readonly) NSString *clientApplicationId;
+@property (readonly, copy) NSString *clientApplicationId;
 
--(instancetype)initWithClient:(id) client applicationId:(NSString *)appId;
+-(instancetype)initWithClient:(nullable id) client applicationId:(nullable NSString *)appId;
+-(BOOL)isMatchingClient:(nullable id) otherClient applicationId:(nullable NSString *)otherAppId;
 -(NSString *)description;
--(void)checkCompliance:(id) client;
--(void) checkComplianceAfterInsert:(id) client delete:(NSString *)textToDelete insert:(NSString *)textToInsert;
+-(void)checkCompliance;
+-(void) checkComplianceAfterInsert:(NSString *)insertedText deleted:(NSString *)deletedText;
 -(BOOL)isComplianceUncertain;
 -(BOOL)canReadText;
 -(BOOL)mustBackspaceUsingEvents;
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/TextApiCompliance.m b/mac/Keyman4MacIM/Keyman4MacIM/TextApiCompliance.m
index 81f50c5edd..a9e39c7621 100644
--- a/mac/Keyman4MacIM/Keyman4MacIM/TextApiCompliance.m
+++ b/mac/Keyman4MacIM/Keyman4MacIM/TextApiCompliance.m
@@ -43,7 +43,7 @@ NSString *const kKMLegacyApps = @"KMLegacyApps";
 
 @interface TextApiCompliance()
 
-@property (readonly) id client;
+@property (readonly, weak) id client;
 @property BOOL complianceUncertain;
 @property BOOL hasCompliantSelectionApi;
 @property NSRange initialSelection;
@@ -67,15 +67,54 @@ NSString *const kKMLegacyApps = @"KMLegacyApps";
     NSString *message = [NSString stringWithFormat:@"TextApiCompliance initWithClient, client: %p applicationId: %@", client, appId];
     [KMSentryHelper addDebugBreadCrumb:@"compliance" message:message];
     os_log_debug([KMLogs complianceLog], "%{public}@", message);
-    
+
     // if we do not have hard-coded noncompliance, then test the app
-    if (![self applyNoncompliantAppLists:appId]) {
-      [self checkCompliance:client];
+    if (appId && [self applyNoncompliantAppLists:appId]) {
+      [self checkCompliance];
     }
   }
   return self;
 }
 
+- (BOOL)isEqual:(id)other {
+  // this is the same object
+  if (other == self) {
+    return YES;
+  }
+  // this is an object of another type
+  if (!other || ![other isKindOfClass:[self class]]) {
+    return NO;
+  }
+  // both are unique TextApiCompliance objects, compare what matters
+  return [self isEqualToObject:other];
+}
+
+- (BOOL)isEqualToObject:(TextApiCompliance *)complianceObject {
+  if (self == complianceObject) {
+    return YES;
+  }
+  if (![(id)[self client] isEqual:[complianceObject client]]) {
+    return NO;
+  }
+  if (![[self clientApplicationId] isEqual:[complianceObject clientApplicationId]]) {
+    return NO;
+  }
+  return YES;
+}
+
+-(BOOL)isMatchingClient:(nullable id) otherClient applicationId:(nullable NSString *)otherAppId {
+  BOOL matches = YES;
+  if (![(id)[self client] isEqual:otherClient]) {
+    matches = NO;
+  }
+  if (![[self clientApplicationId] isEqual:otherAppId]) {
+    matches = NO;
+  }
+  
+  os_log_debug([KMLogs complianceLog], "## isMatchingClient = %@", matches?@"YES":@"NO");
+  return matches;
+}
+
 -(NSString *)description
 {
   return [NSString stringWithFormat:@"complianceUncertain: %d, hasCompliantSelectionApi: %d, canReadText: %d, canReplaceText: %d, mustBackspaceUsingEvents: %d, clientApplicationId: %@, client: %@", self.complianceUncertain, self.hasCompliantSelectionApi, [self canReadText], [self canReplaceText], [self mustBackspaceUsingEvents], _clientApplicationId, _client];
@@ -92,20 +131,22 @@ NSString *const kKMLegacyApps = @"KMLegacyApps";
 }
 
 /** test to see if the API selectedRange functions properly for the text input client  */
--(void) checkCompliance:(id) client {
-  // confirm that the API actually exists (this always seems to return true)
-  self.hasCompliantSelectionApi = [client respondsToSelector:@selector(selectedRange)];
+-(void) checkCompliance {
+  // confirm that the API actually exists (always seems to return true unless client is nil)
+  self.hasCompliantSelectionApi = [self.client respondsToSelector:@selector(selectedRange)];
   
   if (!self.hasCompliantSelectionApi) {
     self.complianceUncertain = NO;
   }
   else {
     // if API exists, call it and see if it works as expected
-    self.initialSelection = [client selectedRange];
+    self.initialSelection = [self.client selectedRange];
     os_log_debug([KMLogs complianceLog], "checkCompliance, location = %lu, length = %lu", self.initialSelection.location, self.initialSelection.length);
     [self checkComplianceUsingInitialSelection];
   }
-  os_log_debug([KMLogs complianceLog], "checkCompliance workingSelectionApi for app %{public}@: set to %{public}@", self.clientApplicationId, self.complianceUncertain?@"YES":@"NO");
+  NSString *message = [NSString stringWithFormat:@"checkCompliance workingSelectionApi for app %@: set to %@", self.clientApplicationId, self.complianceUncertain?@"YES":@"NO"];
+  [KMSentryHelper addDebugBreadCrumb:@"compliance" message:message];
+  os_log_debug([KMLogs complianceLog], "%{public}@", message);
   [KMSentryHelper addApiComplianceTag:self.shortSentryTagDescription];
 }
 
@@ -132,10 +173,10 @@ NSString *const kKMLegacyApps = @"KMLegacyApps";
 
 /**
  * If complianceUncertain is true, checking the location after an insert can confirm whether the app is compliant.
- * Delete and insert are what core instructed us to do.
+ * insertedText and deletedText contain the text that Keyman Core instructed us to insert and delete
  * Text that was selected in the client when the key was processed is irrelevant as it does not affect the location.
  */
--(void) checkComplianceAfterInsert:(id) client delete:(NSString *)textToDelete insert:(NSString *)textToInsert {
+-(void) checkComplianceAfterInsert:(NSString *)insertedText deleted:(NSString *)deletedText {
   
   // return if compliance is already certain
   if(!self.complianceUncertain) {
@@ -143,14 +184,16 @@ NSString *const kKMLegacyApps = @"KMLegacyApps";
     return;
   }
   
-  NSRange selectionRange = [client selectedRange];
-  if ([self validateNewLocation:selectionRange.location delete:textToDelete]) {
-    BOOL changeExpected = [self isLocationChangeExpectedOnInsert:textToDelete insert:textToInsert];
+  NSRange selectionRange = [self.client selectedRange];
+  if ([self validateNewLocation:selectionRange.location delete:deletedText]) {
+    BOOL changeExpected = [self isLocationChangeExpectedOnInsert:deletedText insert:insertedText];
     BOOL locationChanged = [self hasLocationChanged:selectionRange];
     [self validateLocationChange:changeExpected hasLocationChanged:locationChanged];
   }
   
-  os_log_info([KMLogs complianceLog], "checkComplianceAfterInsert, self.hasWorkingSelectionApi = %{public}@ for app %{public}@", self.hasCompliantSelectionApi?@"YES":@"NO", self.clientApplicationId);
+  NSString *message = [NSString stringWithFormat:@"checkComplianceAfterInsert, self.hasWorkingSelectionApi = %@ for app %@", self.hasCompliantSelectionApi?@"YES":@"NO", self.clientApplicationId];
+  os_log_debug([KMLogs complianceLog], "%{public}@", message);
+  [KMSentryHelper addDebugBreadCrumb:@"compliance" message:message];
   [KMSentryHelper addApiComplianceTag:self.shortSentryTagDescription];
 }
 
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/en.lproj/Localizable.strings b/mac/Keyman4MacIM/Keyman4MacIM/en.lproj/Localizable.strings
index 6b815a7b17..bb9b4aeca0 100644
--- a/mac/Keyman4MacIM/Keyman4MacIM/en.lproj/Localizable.strings
+++ b/mac/Keyman4MacIM/Keyman4MacIM/en.lproj/Localizable.strings
@@ -68,9 +68,12 @@
 /* copyright label in the Package Information window */
 "copyright-label" = "Copyright:";
 
-/* message displayed to alert user to need grant accessibility permission */
+/* message displayed to alert user to need grant accessibility permission in Preferences, pre-Ventura */
 "privacy-alert-text" = "To function properly, Keyman requires accessibility features:\n\nGrant access in System Preferences, Security & Privacy.\nRestart your system.";
 
+/* message displayed to alert user to need grant accessibility permission in Settings, for macOS Ventura and later */
+"privacy-alert-text-ventura" = "To function properly, Keyman requires accessibility features:\n\nGrant access in System Settings, Privacy & Security.\nRestart your system.";
+
 /* Text of menu item in Input Menu when no Keyboards are configured -- include parentheses  */
 "no-keyboard-configured-menu-placeholder" = "(No Keyboard Configured)";
 
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/vi.lproj/Localizable.strings b/mac/Keyman4MacIM/Keyman4MacIM/vi.lproj/Localizable.strings
new file mode 100644
index 0000000000..a0f3cf9c6c
--- /dev/null
+++ b/mac/Keyman4MacIM/Keyman4MacIM/vi.lproj/Localizable.strings
@@ -0,0 +1,74 @@
+/* Message displayed to confirm delete of the Keyman keyboard selected by the user from the keyboard list  */
+"message-confirm-delete-keyboard" = "Bạn có chắc bạn muốn xóa cái bàn phím này không?";
+
+/* Delete keyboard confirmation info indicating that the delete action cannot be undone  */
+"info-cannot-undo-delete-keyboard" = "Bạn không thể hoàn tác hành động này.";
+
+/* Button text to cancel delete of the specified installed Keyman keyboard  */
+"button-cancel-delete-keyboard" = "Huỷ";
+
+/* Button text to confirm delete of the specified installed Keyman keyboard  */
+"button-delete-keyboard" = "Xóa";
+
+/* Message displayed to confirm installation of a keyboard from the specifed .kmp file double-clicked by the user  */
+"message-confirm-install-keyboard" = "Bạn có muốn tải bàn phím Keyman này không?";
+
+/* Message displayed to confirm installation of a keyboard from the specifed .kmp file double-clicked by the user  */
+"info-install-keyboard-filename" = "Bạn có muốn Keyman tải bàn phím này từ file này '%@' không?";
+
+/* Button text to cancel installation of the double-clicked Keyman file  */
+"button-cancel-install-keyboard" = "Hủy";
+
+/* Button text to confirm installation of the double-clicked Keyman file  */
+"button-install-keyboard" = "Tải về";
+
+/* Message displayed to inform user that .kmp file could not be read/unzipped  */
+"message-keyboard-file-unreadable" = "Không thể đọc file bàn phím này '%@'.";
+
+/* Message displayed in Configuration window when keyboard cannot be loaded */
+"message-error-loading-keyboard" = "(lỗi không tải được bàn phím)";
+
+/* Message displayed in Configuration window when keyboard metadata cannot be loaded */
+"message-error-unknown-metadata" = "không rõ";
+
+/* Button text to acknowledge that .kmp file could not be read  */
+"button-keyboard-file-unreadable" = "OK";
+
+/* label text to identify Keyman version */
+"version-label-text" = "Phiên bản %@";
+
+/* Status text for keyboard downloading  */
+"message-keyboard-downloading" = "Đang tải...";
+
+/* Status text for keyboard download complete  */
+"message-keyboard-download-complete" = "Tải xong bàn phím.";
+
+/* Button text to cancel downloading keyboard  */
+"button-cancel-downloading" = "Hủy";
+
+/* Button text keyboard download complete  */
+"button-download-complete" = "Xong";
+
+/* keyboards label in the Package Information window */
+"keyboards-label" = "Bàn phím:";
+
+/* fonts label in the Package Information window */
+"fonts-label" = "Phông chữ:";
+
+/* package version label in the Package Information window */
+"package-version-label" = "Phiên bản của package:";
+
+/* author label in the Package Information window */
+"author-label" = "Tác giả:";
+
+/* website label in the Package Information window */
+"website-label" = "Trang web:";
+
+/* copyright label in the Package Information window */
+"copyright-label" = "Bản quyền:";
+
+/* message displayed to alert user to need grant accessibility permission */
+"privacy-alert-text" = "Để hoạt động đúng, Keyman yêu cầu tính năng trợ năng:\n\nCấp quyền truy cập trong Thông tin Hệ thống, Bảo mật & Riêng tư.\nKhởi động lại hệ thống của bạn.";
+
+/* Text of menu item in Input Menu when no Keyboards are configured -- include parentheses  */
+"no-keyboard-configured-menu-placeholder" = "(Không có bàn phím được cấu hình)";
diff --git a/mac/Keyman4MacIM/Keyman4MacIM/vi.lproj/MainMenu.strings b/mac/Keyman4MacIM/Keyman4MacIM/vi.lproj/MainMenu.strings
new file mode 100644
index 0000000000..1cfc97bffb
--- /dev/null
+++ b/mac/Keyman4MacIM/Keyman4MacIM/vi.lproj/MainMenu.strings
@@ -0,0 +1,14 @@
+/* Configuration window menu text */
+"P1b-lE-yFw.title" = "Cấu hình...";
+
+/* Keyboards menu text */
+"bQa-j9-nHe.title" = "Bàn phím";
+
+/* Keyboards menu text */
+"goP-aK-3WB.title" = "Bàn phím";
+
+/* About menu text */
+"kb2-ww-RS3.title" = "Thông tin";
+
+/* On-Screen Keyboard menu text */
+"s96-JI-YDh.title" = "Bàn phím ảo";
diff --git a/mac/Keyman4MacIM/KeymanTests/InputMethodTests.m b/mac/Keyman4MacIM/KeymanTests/InputMethodTests.m
index 45e5e9855a..1f599e51c6 100644
--- a/mac/Keyman4MacIM/KeymanTests/InputMethodTests.m
+++ b/mac/Keyman4MacIM/KeymanTests/InputMethodTests.m
@@ -128,7 +128,8 @@ id testClient = nil;
   testEventHandler.contextChanged = YES;
   // second call causes new textApiCompliance object to be created due to setting contextChanged flag
   [testEventHandler checkTextApiCompliance:testClient];
-  XCTAssertNotEqualObjects(originalComplianceObject, testEventHandler.apiCompliance, @"New TextApiCompliance object not created after contextChanged flag set");
+  XCTAssertNotEqual(originalComplianceObject, testEventHandler.apiCompliance, @"New TextApiCompliance object not created after contextChanged flag set");
+  XCTAssertEqualObjects(originalComplianceObject, testEventHandler.apiCompliance, @"New TextApiCompliance object not functionally equal to original object");
 }
 
 @end
diff --git a/mac/Keyman4MacIM/KeymanTests/TextApiComplianceTests.m b/mac/Keyman4MacIM/KeymanTests/TextApiComplianceTests.m
index e0e513af1c..f84b4d735b 100644
--- a/mac/Keyman4MacIM/KeymanTests/TextApiComplianceTests.m
+++ b/mac/Keyman4MacIM/KeymanTests/TextApiComplianceTests.m
@@ -37,6 +37,93 @@
   // Put teardown code here. This method is called after the invocation of each test method in the class.
 }
 
+- (void)testInitComplianceObject_nilClient_returnsInstance {
+  NSString *clientAppId = @"com.compliant.app";
+  TextApiCompliance *apiCompliance = [[TextApiCompliance alloc]initWithClient:nil applicationId:clientAppId];
+  XCTAssertNotNil(apiCompliance, @"New apiCompliance is not nil");
+  os_log_debug([KMLogs testLog], "apiCompliance = %@", apiCompliance);
+}
+
+- (void)testInitComplianceObject_nilApplicationId_returnsInstance {
+  id client = [[AppleCompliantTestClient alloc] init];
+  TextApiCompliance *apiCompliance = [[TextApiCompliance alloc]initWithClient:client applicationId:nil];
+  XCTAssertNotNil(apiCompliance, @"New apiCompliance is nil");
+  os_log_debug([KMLogs testLog], "apiCompliance = %@", apiCompliance);
+}
+
+- (void)testInitComplianceObject_nilInputs_returnsInstance {
+  TextApiCompliance *apiCompliance = [[TextApiCompliance alloc]initWithClient:nil applicationId:nil];
+  XCTAssertNotNil(apiCompliance, @"New apiCompliance is nil");
+  os_log_debug([KMLogs testLog], "apiCompliance = %@", apiCompliance);
+}
+
+- (void)testCheckCompliance_nilClient_returnsNoncompliant {
+  NSString *clientAppId = @"com.compliant.app";
+  TextApiCompliance *apiCompliance = [[TextApiCompliance alloc]initWithClient:nil applicationId:clientAppId];
+  XCTAssertNotNil(apiCompliance, @"New apiCompliance is nil");
+  
+  [apiCompliance checkCompliance];
+  XCTAssertFalse(apiCompliance.isComplianceUncertain, @"ApiCompliance with nil client is uncertain");
+  XCTAssertFalse(apiCompliance.canReadText, @"ApiCompliance with nil client is compliant");
+  os_log_debug([KMLogs testLog], "apiCompliance = %@", apiCompliance);
+}
+
+- (void)testCheckComplianceAfterInsert_nilClient_returnsNoncompliant {
+  NSString *clientAppId = @"com.compliant.app";
+  TextApiCompliance *apiCompliance = [[TextApiCompliance alloc]initWithClient:nil applicationId:clientAppId];
+  XCTAssertNotNil(apiCompliance, @"New apiCompliance is nil");
+  
+  [apiCompliance checkComplianceAfterInsert:@"a" deleted:@"x"];
+  XCTAssertFalse(apiCompliance.isComplianceUncertain, @"ApiCompliance with nil client is uncertain");
+  XCTAssertFalse(apiCompliance.canReadText, @"ApiCompliance with nil client is compliant");
+  os_log_debug([KMLogs testLog], "apiCompliance = %@", apiCompliance);
+}
+
+- (void)testCheckCompliance_nilApplicationId_returnsUncertain {
+  id client = [[AppleCompliantTestClient alloc] init];
+  TextApiCompliance *apiCompliance = [[TextApiCompliance alloc]initWithClient:client applicationId:nil];
+  XCTAssertNotNil(apiCompliance, @"New apiCompliance is nil");
+  
+  [apiCompliance checkCompliance];
+  XCTAssertTrue(apiCompliance.isComplianceUncertain, @"New apiCompliance is not uncertain");
+  os_log_debug([KMLogs testLog], "apiCompliance = %@", apiCompliance);
+}
+
+- (void)testCheckComplianceAfterInsert_nilApplicationId_returnsNotUncertain {
+  id client = [[AppleCompliantTestClient alloc] init];
+  TextApiCompliance *apiCompliance = [[TextApiCompliance alloc]initWithClient:client applicationId:nil];
+  XCTAssertNotNil(apiCompliance, @"New apiCompliance is nil");
+  
+  [apiCompliance checkComplianceAfterInsert:@"a" deleted:@"x"];
+  XCTAssertFalse(apiCompliance.isComplianceUncertain, @"New apiCompliance is uncertain");
+  os_log_debug([KMLogs testLog], "apiCompliance = %@", apiCompliance);
+}
+
+- (void)testMatchingClient_sameClient_returnsTrue {
+  id client = [[AppleCompliantTestClient alloc] init];
+  NSString *clientAppId = @"com.compliant.app";
+  TextApiCompliance *apiCompliance = [[TextApiCompliance alloc]initWithClient:client applicationId:clientAppId];
+  
+  XCTAssertTrue([apiCompliance isMatchingClient:client applicationId:clientAppId], @"Clients do not match");
+}
+
+- (void)testMatchingClient_differentClients_returnsFalse {
+  id client = [[AppleCompliantTestClient alloc] init];
+  id noContextClient = [[NoContextTestClient alloc] init];
+  NSString *clientAppId = @"com.compliant.app";
+  TextApiCompliance *apiCompliance = [[TextApiCompliance alloc]initWithClient:client applicationId:clientAppId];
+  
+  XCTAssertFalse([apiCompliance isMatchingClient:noContextClient applicationId:clientAppId], @"Unique clients match unexpectedly");
+}
+
+- (void)testMatchingClient_differentClientApplicationIDs_returnsFalse {
+  id client = [[AppleCompliantTestClient alloc] init];
+  NSString *clientAppId = @"com.compliant.app";
+  TextApiCompliance *apiCompliance = [[TextApiCompliance alloc]initWithClient:client applicationId:clientAppId];
+  
+  XCTAssertFalse([apiCompliance isMatchingClient:client applicationId:@"com.imaginary.app"], @"Unique client application IDs match unexpectedly");
+}
+
 - (void)testValidateNewLocation_locationNotFound_returnsNo {
   id client = [[AppleCompliantTestClient alloc] init];
   NSString *clientAppId = @"com.compliant.app";
diff --git a/mac/docs/help/about/requirements.md b/mac/docs/help/about/requirements.md
index 07745f9efc..2e3c1f19d3 100644
--- a/mac/docs/help/about/requirements.md
+++ b/mac/docs/help/about/requirements.md
@@ -13,6 +13,7 @@ Keyman supports the following Mac operating systems:
 * macOS Monterey (12.0)
 * macOS Ventura (13.0)
 * macOS Sonoma (14.0)
+* macOS Sequoia (15.0)
 
 Keyman should also work on future releases of macOS, even if they are not yet listed here.
 
diff --git a/mac/docs/help/common/os.md b/mac/docs/help/common/os.md
index 4362eafaa7..4c117c75cb 100644
--- a/mac/docs/help/common/os.md
+++ b/mac/docs/help/common/os.md
@@ -13,3 +13,4 @@ Keyman supports the following Mac operating systems:
 * macOS Monterey (12.0)
 * macOS Ventura (13.0)
 * macOS Sonoma (14.0)
+* macOS Sequoia (15.0)
diff --git a/mac/docs/help/mac_images/keyman-security-prompt-ventura.png b/mac/docs/help/mac_images/keyman-security-prompt-ventura.png
new file mode 100644
index 0000000000..49311ff442
Binary files /dev/null and b/mac/docs/help/mac_images/keyman-security-prompt-ventura.png differ
diff --git a/mac/docs/help/mac_images/open-apple-menu.png b/mac/docs/help/mac_images/open-apple-menu.png
new file mode 100644
index 0000000000..c67597673c
Binary files /dev/null and b/mac/docs/help/mac_images/open-apple-menu.png differ
diff --git a/mac/docs/help/mac_images/privacy-accessibility-enabled.png b/mac/docs/help/mac_images/privacy-accessibility-enabled.png
new file mode 100644
index 0000000000..74d4d44c84
Binary files /dev/null and b/mac/docs/help/mac_images/privacy-accessibility-enabled.png differ
diff --git a/mac/docs/help/mac_images/privacy-and-security-annotated.png b/mac/docs/help/mac_images/privacy-and-security-annotated.png
new file mode 100644
index 0000000000..8fa59af5b7
Binary files /dev/null and b/mac/docs/help/mac_images/privacy-and-security-annotated.png differ
diff --git a/mac/docs/help/mac_images/privacy_accessibility.png b/mac/docs/help/mac_images/privacy_accessibility.png
deleted file mode 100644
index 9af915507d..0000000000
Binary files a/mac/docs/help/mac_images/privacy_accessibility.png and /dev/null differ
diff --git a/mac/docs/help/mac_images/privacy_files_and_folders.png b/mac/docs/help/mac_images/privacy_files_and_folders.png
deleted file mode 100644
index 7ffddb7f73..0000000000
Binary files a/mac/docs/help/mac_images/privacy_files_and_folders.png and /dev/null differ
diff --git a/mac/docs/help/mac_images/privacy_input_monitoring.png b/mac/docs/help/mac_images/privacy_input_monitoring.png
deleted file mode 100644
index 3b4310262b..0000000000
Binary files a/mac/docs/help/mac_images/privacy_input_monitoring.png and /dev/null differ
diff --git a/mac/docs/help/mac_images/privacy_input_monitoring_locked.png b/mac/docs/help/mac_images/privacy_input_monitoring_locked.png
deleted file mode 100644
index e5652b06d7..0000000000
Binary files a/mac/docs/help/mac_images/privacy_input_monitoring_locked.png and /dev/null differ
diff --git a/mac/docs/help/mac_images/system_preferences.png b/mac/docs/help/mac_images/system_preferences.png
deleted file mode 100644
index d6e66dcc77..0000000000
Binary files a/mac/docs/help/mac_images/system_preferences.png and /dev/null differ
diff --git a/mac/docs/help/troubleshooting/configure-security.md b/mac/docs/help/troubleshooting/configure-security.md
index 0365b9962c..b94f6dd172 100644
--- a/mac/docs/help/troubleshooting/configure-security.md
+++ b/mac/docs/help/troubleshooting/configure-security.md
@@ -2,60 +2,41 @@
 title: How to configure macOS security options for Keyman
 ---
 
-Keyman requires access to your keyboard in order to translate input. In macOS Catalina, there
-are three different Privacy settings you will need to configure in order for Keyman to work
-correctly:
+Keyman requires access to your keyboard to translate input. For Keyman to work properly with macOS, you must make a change in System Settings (known as System Preferences prior to macOS 13.0 Ventura).
 
-* **Privacy** / **Input Monitoring**
-* **Privacy** / **Accessibility**
-* **Privacy** / **Files and Folders**
+* **System Settings** >  **Privacy & Security** > **Accessibility**
 
-The Keyman installer will configure these privacy settings for you, and prompt you to allow access for Keyman. If you do not allow access at that time, you will need to follow the steps here in order to use Keyman.
+When you run Keyman for the first time, it will prompt you to enable Accessibility permission for Keyman. When you click the OK button to dismiss the dialog, the System Settings will be automatically be opened to the Accessibility setting.
 
-Symptoms that you may experience if Security & Privacy is not configured correctly include:
+   ![Keyman Security Prompt](../mac_images/keyman-security-prompt-ventura.png)
 
-* Some key combinations may not work
-* You may find that some letters are duplicated or not deleted as you expect
+**Note:** The above prompt may not appear until Keyman has been run at least once. If it does not appear and Keyman is not listed in the relevant panes in System Settings, select Keyman from the Input Sources menu and try typing in an app.
 
-**Note:** Keyman may not appear under these settings until it has been run at least one
-time. If Keyman does not appear in the relevant panes in System Preferences, select Keyman
-from the Input Sources menu and try typing in an app.
+Without Accessibility enabled for Keyman, it may not function as expected:
 
-In some situations, even then, Keyman won't appear in the Accessibility setting. In this case,
-macOS should prompt you the first time that Keyman needs access to Accessibility.
+* Some key combinations may not create the correct output while typing
+* Some letters may be duplicated or not deleted as expected
+* The on-screen keyboard may not produce any output
 
-## Enabling Keyman in macOS Privacy System Preferences
+Follow the steps described below to ensure that Keyman functions properly.
 
-1. Open **System Preferences**:
+## Enabling Keyman in macOS Privacy & Security Settings
 
-   ![System Preferences menu](../mac_images/apple_menu.png)
+1. From the Apple Menu, select **System Settings**:
 
-2. Select **Security & Privacy**, and choose the **Privacy** tab:
+   ![System Settings menu](../mac_images/open-apple-menu.png)
 
-   ![System Preferences](../mac_images/system_preferences.png)
+2. In System Settings, select **Privacy & Security**, and then select **Accessibility** from the displayed list:
 
-3. Select **Input Monitoring** and unlock the settings with the lock icon,
+   ![System Settings](../mac_images/privacy-and-security-annotated.png)
 
-   ![Input Monitoring - not checked](../mac_images/privacy_input_monitoring_locked.png)
+3. In the Accessibility pane, move the control for **Keyman** to the 'on' position to enable access. You will be asked to enter you password to allow this change.
 
-4. Keyman should appear in the list. Tick the Keyman item:
+   ![Accessibility](../mac_images/privacy-accessibility-enabled.png)
 
-   ![Input Monitoring](../mac_images/privacy_input_monitoring.png)
-
-5. Select **Accessibility**, and ensure that Keyman is ticked there as well:
-
-   ![Accessibility](../mac_images/privacy_accessibility.png)
-
-6. Select **Files and Folders**, and ensure that Keyman has access to the **Documents** folder there:
-
-   ![Files and Folders](../mac_images/privacy_files_and_folders.png)
-
-**Note:** You may be prompted to shut down Keyman in order for the changes to take
-effect. If so, follow the prompts to allow the system to close Keyman. You'll need
-to select an alternate input source from the Input Sources, and then switch back to
-Keyman, to start using Keyman again.
+4. After changing these settings, you may need to restart your Mac for them to take effect
 
 ## Upgrading macOS
 
-You should only have to undertake this procedure once. However, if you upgrade your
+You should only need to undertake this procedure once. However, if you upgrade your
 version of macOS, and Keyman stops working, follow these steps to re-enable Keyman.
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/android/app/src/main/java/com/firstvoices/keyboards/SystemKeyboard.java b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/SystemKeyboard.java
index 0e2cffd68e..8483f90fe8 100644
--- a/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/SystemKeyboard.java
+++ b/oem/firstvoices/android/app/src/main/java/com/firstvoices/keyboards/SystemKeyboard.java
@@ -169,9 +169,6 @@ public class SystemKeyboard extends InputMethodService implements OnKeyboardEven
                 }
             }
         }
-
-        if (KMManager.getCurrentKeyboardIndex(this) < 0)
-            KMManager.setKeyboard(this, 0);
     }
 
     @Override
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/resources/build/minimum-versions.inc.sh b/resources/build/minimum-versions.inc.sh
index d8b9e4485e..4e2935f637 100644
--- a/resources/build/minimum-versions.inc.sh
+++ b/resources/build/minimum-versions.inc.sh
@@ -11,7 +11,7 @@
 
 # Target operating system and platform versions
 KEYMAN_MIN_TARGET_VERSION_ANDROID=5.0         # Lollipop
-KEYMAN_MIN_TARGET_VERSION_IOS=12.2            # iOS 12.2
+KEYMAN_MIN_TARGET_VERSION_IOS=15.6            # iOS 15.6
 KEYMAN_MIN_TARGET_VERSION_WINDOWS=10          # Windows 10
 KEYMAN_MIN_TARGET_VERSION_MAC=10.13           # MacOS 10.13 (High Sierra)
 KEYMAN_MIN_TARGET_VERSION_UBUNTU=22.04        # Ubuntu 22.04 Jammy
@@ -45,6 +45,6 @@ KEYMAN_DEFAULT_VERSION_UBUNTU_CONTAINER=noble # Ubuntu 24.04 Noble
 # Data versions -- see resources/standards-data/readme.md
 KEYMAN_VERSION_CLDR=45                        # LDML Keyboards version
 KEYMAN_VERSION_ISO639_3=2024-05-22            # Date of last import
-KEYMAN_VERSION_LANGTAGS=2024-05-22            # Date of last import
-KEYMAN_VERSION_LANGTAGS_SUBTAG_REGISTRY=2024-05-16  # Date of last import
+KEYMAN_VERSION_LANGTAGS=2025-02-18            # Date of last import
+KEYMAN_VERSION_LANGUAGE_SUBTAG_REGISTRY=2024-05-16  # Date of last import
 KEYMAN_VERSION_UNICODE=16.0.0                 # UCD + related data
diff --git a/resources/build/trigger-builds.inc.sh b/resources/build/trigger-builds.inc.sh
index d0ca586398..42de09dae1 100644
--- a/resources/build/trigger-builds.inc.sh
+++ b/resources/build/trigger-builds.inc.sh
@@ -56,13 +56,14 @@ function triggerTeamCityBuild() {
 
   # adjust indentation for output of curl
   echo -n "     "
-  curl -s  --write-out '\n' --header "Authorization: Bearer $TEAMCITY_TOKEN" \
+  call_curl "$TEAMCITY_SERVER/app/rest/buildQueue" \
+    --header "Authorization: Bearer $TEAMCITY_TOKEN" \
     -X POST \
     -H "Content-Type: application/xml" \
     -H "Accept: application/json" \
     -H "Origin: $TEAMCITY_SERVER" \
-    $TEAMCITY_SERVER/app/rest/buildQueue \
     -d "$command"
+  echo
 }
 
 function triggerGitHubActionsBuild() {
@@ -81,7 +82,7 @@ function triggerGitHubActionsBuild() {
     GIT_BASE_REF="$(git rev-parse "${GIT_BUILD_SHA}^")"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: release@${VERSION_WITH_TAG}"
   elif [[ $GIT_BRANCH != stable-* ]] && [[ $GIT_BRANCH =~ [0-9]+ ]]; then
-    JSON=$(curl -s "${GITHUB_SERVER}/pulls/${GIT_BRANCH}")
+    local JSON=$(call_curl "${GITHUB_SERVER}/pulls/${GIT_BRANCH}" --header "Authorization: token $GITHUB_TOKEN")
     GIT_BUILD_SHA="$(echo "$JSON" | $JQ -r '.head.sha')"
     GIT_EVENT_TYPE="${GITHUB_ACTION}: PR #${GIT_BRANCH}"
     GIT_USER="$(echo "$JSON" | $JQ -r '.user.login')"
@@ -107,12 +108,57 @@ function triggerGitHubActionsBuild() {
 
   echo "GitHub Action Data: $DATA"
 
+  if [[ "$GIT_BUILD_SHA" == null ]]; then
+    echo "Invalid GIT_BUILD_SHA"
+    exit 1
+  fi
+
   # adjust indentation for output of curl
   echo -n "     "
-  curl --silent --write-out '\n' \
+  call_curl "${GITHUB_SERVER}/dispatches" \
     --request POST \
     --header "Accept: application/vnd.github+json" \
     --header "Authorization: token $GITHUB_TOKEN" \
-    --data "$DATA" \
-    ${GITHUB_SERVER}/dispatches
+    --data "$DATA"
+  echo
+}
+
+#
+# Error handling and reporting for curl + default parameters
+# We cannot use --fail-with-body yet due to older curl versions
+# on infrastructure
+#
+function call_curl() {
+  local url="$1"
+  shift
+
+  local curl_result
+  local http_code
+  local output_file=$(mktemp)
+
+  set +e
+  if [[ $# -gt 0 ]]; then
+    http_code=$(curl --silent --output $output_file --no-progress-meter --write-out "%{http_code}" "$@" "$url")
+  else
+    http_code=$(curl --silent --output $output_file --no-progress-meter --write-out "%{http_code}" "$url")
+  fi
+  curl_result=$?
+  if [[ ${curl_result} != 0 ]]; then
+    echo "curl call to '${url}' failed with code '${curl_result}'" >& 2
+    >&2 cat $output_file
+    rm -f $output_file
+    exit $curl_result
+  fi
+
+  if [[ ${http_code} -lt 200 || ${http_code} -gt 299 ]] ; then
+    echo "curl call to '${url}' failed with HTTP error code '${http_code}'" >& 2
+    >&2 cat $output_file
+    rm -f $output_file
+    exit 22
+  fi
+
+  set -e
+
+  cat $output_file
+  rm -f $output_file
 }
diff --git a/resources/devbox/iis-https/.gitignore b/resources/devbox/iis-https/.gitignore
deleted file mode 100644
index 8b0c1d1f29..0000000000
--- a/resources/devbox/iis-https/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-rootCA.key
-rootCA.pem
-rootCA.srl
-server.crt
-server.csr
-server.key
-server.pfx
-cacert.pem
\ No newline at end of file
diff --git a/resources/devbox/iis-https/README.md b/resources/devbox/iis-https/README.md
deleted file mode 100644
index f684671c2b..0000000000
--- a/resources/devbox/iis-https/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# IIS local host secure website setup
-
-The setup-iis-https.sh script in this folder automates much of the certificate
-setup required to host secure versions of the Keyman sites on your development
-machine, such as https://keyman.com.local/.
-
-The script must be run as Administrator and can safely be run multiple times.
-
-Once configured, the certificates will work for the following sites (configured in v3.ext):
-- `localhost`
-- `keyman-local.com`
-- `*.keyman-local.com`
-- `keyman.com.local`
-- `*.keyman.com.local`
-- `keymanweb.com.local`
-- `keymankeyboards.com.local`
-- `keyman.dev.local`
-- `*.keymanweb.com.local`
-- `keyman.blog.local`
-- `*.keyman.blog.local`
diff --git a/resources/devbox/iis-https/server.csr.cnf b/resources/devbox/iis-https/server.csr.cnf
deleted file mode 100644
index a414363ec6..0000000000
--- a/resources/devbox/iis-https/server.csr.cnf
+++ /dev/null
@@ -1,8 +0,0 @@
-[req]
-default_bits = 2048
-prompt = no
-default_md = sha256
-distinguished_name = dn
-
-[dn]
-CN = keyman.com.local
diff --git a/resources/devbox/iis-https/setup-iis-https.sh b/resources/devbox/iis-https/setup-iis-https.sh
deleted file mode 100755
index 77bff725f2..0000000000
--- a/resources/devbox/iis-https/setup-iis-https.sh
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -u
-
-## START STANDARD BUILD SCRIPT INCLUDE
-# adjust relative paths as necessary
-THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
-. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
-## END STANDARD BUILD SCRIPT INCLUDE
-
-. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
-
-echo_heading2() {
-  echo ""
-  builder_heading "$*"
-}
-
-if [[ $BUILDER_OS != win ]]; then
-  builder_die "This script can only be run on Windows to setup IIS."
-fi
-
-builder_warn "Warning: this script requires Administrator permissions to install certificates."
-
-# Generate CA key
-echo_heading2 "Generating CA key"
-if [ ! -f rootCA.key ]; then
-  echo "Please create a password for the certification authority key"
-  echo "This should be unique to your setup."
-  winpty openssl genrsa -des3 -out rootCA.key 2048
-else
-  echo "Skipping, rootCA.key already present"
-fi
-
-# Generate CA certificate
-echo_heading2 "Generating CA certificate"
-if [ ! -f rootCA.pem ]; then
-  winpty openssl req -x509 -new -nodes -key rootCA.key -sha256 -days 3650 -out rootCA.pem
-else
-  echo "Skipping, rootCA.pem already present"
-fi
-
-# Generate site certificate signing request
-echo_heading2 "Generating site certificate signing request"
-if [ ! -f server.csr ]; then
-  winpty openssl req -new -sha256 -nodes -out server.csr -newkey rsa:2048 -keyout server.key -config server.csr.cnf
-else
-  echo "Skipping, server.csr already present"
-fi
-
-# Generate site certificate
-echo_heading2 "Generating site certificate"
-if [ ! -f server.crt ]; then
-  winpty openssl x509 -req -in server.csr -CA rootCA.pem -CAkey rootCA.key -CAcreateserial -out server.crt -days 500 -sha256 -extfile v3.ext
-else
-  echo "Skipping, server.crt already present"
-fi
-
-# Convert site certificate to .pfx for IIS
-echo_heading2 "Converting certificate to .pfx for IIS"
-if [ ! -f server.pfx ]; then
-  winpty openssl pkcs12 -export -out server.pfx -inkey server.key -in server.crt
-else
-  echo "Skipping, server.pfx already present"
-fi
-
-# Import the CA certificate into the Trusted Root Certification Authorities
-echo_heading2 "Importing CA certificate to root store"
-certutil -addstore Root rootCA.pem
-
-# Import server.pfx to IIS certficate store
-echo_heading2 "Importing site certificate to WebHosting store"
-certutil -importPFX WebHosting server.pfx
-
-# Add bindings to each site in IIS
-echo_heading2 "Setup IIS bindings"
-echo "Now, add a HTTPS binding for each site in IIS (this is painful to automate):"
-echo "1. Open IIS Manager"
-echo "2. For each site, click Bindings in Actions panel"
-echo "3. Click Add:"
-echo "   Select Type='https'"
-echo "   Select Host name=per the existing binding (e.g. 'keymanweb.com.local')"
-echo "   Select SSL certificate='keyman.com.local'"
-echo "4. Click OK, Close, and repeat for each site."
-echo ""
-echo "This certificate can be used for all keyman.com sites and localhost; see"
-echo "README.md / v3.ext for list of matching domains."
-
-# Update PHP CACert
-echo_heading2 "Setup PHP certificate authority"
-
-curl -s https://curl.se/ca/cacert.pem > cacert.pem
-echo "" >> cacert.pem
-echo "Keyman Localhost CA" >> cacert.pem
-echo "===================" >> cacert.pem
-echo "## This is a local CA for Keyman localhost websites generated by" >> cacert.pem
-echo "## https://github.com/keymanapp/keyman/tree/master/build/devbox/iis-https/setup-iis-https.sh" >> cacert.pem
-cat rootCA.pem >> cacert.pem
-
-echo "We also need to add our CA certificate to PHP so we can access our local"
-echo "https sites from PHP scripts."
-echo "1. Locate php.ini (e.g. C:\\tools\\php74\\php.ini)"
-echo "2. Copy cacert.pem from here and save it alongside your PHP.ini file"
-echo "3. Set curl.cainfo and openssl.cafile in php.ini to cacert.pem location, e.g."
-echo "   curl.cainfo = \"C:\\tools\\php74\\cacert.pem\""
-echo "4. Finally, you may need to restart IIS for changes to take effect."
-
-echo_heading2 "Complete"
-builder_warn "Please check logs above for errors and manual steps"
diff --git a/resources/devbox/iis-https/v3.ext b/resources/devbox/iis-https/v3.ext
deleted file mode 100644
index 5b49ccd106..0000000000
--- a/resources/devbox/iis-https/v3.ext
+++ /dev/null
@@ -1,17 +0,0 @@
-authorityKeyIdentifier=keyid,issuer
-basicConstraints=CA:FALSE
-keyUsage = digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment
-subjectAltName = @alt_names
-
-[alt_names]
-DNS.1 = localhost
-DNS.2 = keyman.com.local
-DNS.3 = *.keyman.com.local
-DNS.4 = keymanweb.com.local
-DNS.5 = keymankeyboards.com.local
-DNS.6 = keyman.dev.local
-DNS.7 = *.keymanweb.com.local
-DNS.8 = *.keyman-local.com
-DNS.9 = keyman.blog.local
-DNS.10 = *.keyman.blog.local
-DNS.11 = keyman-local.com
diff --git a/resources/shellHelperFunctions.sh b/resources/shellHelperFunctions.sh
index 6f60d4484f..ebec70d0b7 100755
--- a/resources/shellHelperFunctions.sh
+++ b/resources/shellHelperFunctions.sh
@@ -342,9 +342,16 @@ builder_do_typescript_tests() {
   if [[ $# -gt 0 ]]; then
     C8_THRESHOLD=$1
     THRESHOLD_PARAMS="--lines $C8_THRESHOLD --statements $C8_THRESHOLD --branches $C8_THRESHOLD --functions $C8_THRESHOLD"
+  else
+    # Seems like a bug in TeamCity reporter if we don't list default thresholds,
+    # see #13418.
+    #
+    # Making branch and function thresholds slightly lower, because the default
+    # for c8 is 0 for these anyway.
+    THRESHOLD_PARAMS="--lines 90 --statements 90 --branches 80 --functions 80"
   fi
 
-  c8 --reporter=lcov --reporter=text --exclude-after-remap --check-coverage=false $THRESHOLD_PARAMS mocha ${MOCHA_FLAGS} "${builder_extra_params[@]}"
+  c8 --reporter=lcov --reporter=text --exclude-after-remap --check-coverage $THRESHOLD_PARAMS mocha ${MOCHA_FLAGS} "${builder_extra_params[@]}"
 
   if [[ ! -z "$C8_THRESHOLD" ]]; then
     builder_echo warning "Coverage thresholds are currently $C8_THRESHOLD%, which is lower than ideal."
diff --git a/resources/standards-data/langtags/langtags.json b/resources/standards-data/langtags/langtags.json
index ab08a8a1c3..d6ded9766b 100644
--- a/resources/standards-data/langtags/langtags.json
+++ b/resources/standards-data/langtags/langtags.json
@@ -1,7 +1,7 @@
 [
     {
         "regions": [ "AA", "AC", "AD", "AN", "AQ", "AS", "AX", "BL", "BU", "BV", "CP", "CQ", "CS", "DD", "EA", "EU", "EZ", "FX", "GS", "HM", "IC", "MC", "MF", "MQ", "NT", "PM", "QM", "QN", "QO", "QP", "QQ", "QR", "QS", "QT", "QU", "QV", "QW", "QX", "QY", "QZ", "SM", "SU", "TA", "TF", "TP", "UM", "UN", "VG", "XA", "XB", "XC", "XD", "XE", "XF", "XG", "XH", "XI", "XJ", "XL", "XM", "XN", "XO", "XP", "XQ", "XR", "XS", "XT", "XU", "XV", "XW", "XY", "XZ", "YD", "YU", "ZR", "ZZ" ],
-        "scripts": [ "Aran", "Cpmn", "Egyd", "Egyh", "Hira", "Hrkt", "Inds", "Jamo", "Mero", "Moon", "Pcun", "Phlv", "Psin", "Qaaa", "Qaab", "Qaac", "Qaad", "Qaae", "Qaaf", "Qaag", "Qaah", "Qaai", "Qaaj", "Qaak", "Qaal", "Qaam", "Qaan", "Qaao", "Qaap", "Qaaq", "Qaar", "Qaas", "Qaat", "Qaau", "Qaav", "Qaaw", "Qaax", "Qaay", "Qaaz", "Qaba", "Qabb", "Qabc", "Qabd", "Qabe", "Qabf", "Qabg", "Qabh", "Qabi", "Qabj", "Qabk", "Qabl", "Qabm", "Qabn", "Qabo", "Qabp", "Qabq", "Qabr", "Qabs", "Qabt", "Qabu", "Qabv", "Qabw", "Qabx", "Roro", "Shui", "Sidt", "Syre", "Syrn", "Todr", "Visp", "Zinh", "Zsye" ],
+        "scripts": [ "Aran", "Cpmn", "Egyd", "Egyh", "Hira", "Hrkt", "Inds", "Jamo", "Mero", "Moon", "Pcun", "Phlv", "Psin", "Qaaa", "Qaab", "Qaac", "Qaad", "Qaae", "Qaaf", "Qaag", "Qaah", "Qaai", "Qaaj", "Qaak", "Qaal", "Qaam", "Qaan", "Qaao", "Qaap", "Qaaq", "Qaar", "Qaas", "Qaat", "Qaau", "Qaav", "Qaaw", "Qaax", "Qaay", "Qaaz", "Qaba", "Qabb", "Qabc", "Qabd", "Qabe", "Qabf", "Qabg", "Qabh", "Qabi", "Qabj", "Qabk", "Qabl", "Qabm", "Qabn", "Qabo", "Qabp", "Qabq", "Qabr", "Qabs", "Qabt", "Qabu", "Qabv", "Qabw", "Qabx", "Roro", "Shui", "Sidt", "Syre", "Syrn", "Visp", "Zinh", "Zsye" ],
         "tag": "_conformance"
     },
     {
@@ -14,7 +14,7 @@
     },
     {
         "api": "1.3.1",
-        "date": "2024-05-22",
+        "date": "2025-02-18",
         "tag": "_version"
     },
     {
@@ -38,6 +38,7 @@
         "iso639_3": "aar",
         "name": "Afar",
         "nophonvars": true,
+        "obsolete": true,
         "region": "ET",
         "regionname": "Ethiopia",
         "regions": [ "DJ", "ER" ],
@@ -50,6 +51,7 @@
         "full": "aa-Latn-DJ",
         "iana": [ "Afar" ],
         "iso639_3": "aar",
+        "localname": "Qafar",
         "localnames": [ "Qafar af" ],
         "name": "Afar",
         "region": "DJ",
@@ -63,6 +65,7 @@
         "full": "aa-Latn-ER",
         "iana": [ "Afar" ],
         "iso639_3": "aar",
+        "localname": "Qafar",
         "localnames": [ "Qafar af" ],
         "name": "Afar",
         "region": "ER",
@@ -78,6 +81,7 @@
         "iso639_3": "aar",
         "name": "Afar",
         "nophonvars": true,
+        "obsolete": true,
         "region": "ET",
         "regionname": "Ethiopia",
         "regions": [ "DJ", "ER" ],
@@ -487,6 +491,7 @@
         "iana": [ "Abkhazian" ],
         "iso639_3": "abk",
         "latnnames": [ "Aṗsua byzšwa", "Aṗsšwa" ],
+        "localname": "Аԥсшәа",
         "localnames": [ "аҧсуа бызшәа", "аҧсшәа" ],
         "name": "Abkhaz",
         "names": [ "Abkhazian", "Abxazo" ],
@@ -494,7 +499,7 @@
         "regionname": "Georgia",
         "regions": [ "DE", "RU", "SY", "TR", "UA" ],
         "script": "Cyrl",
-        "sldr": false,
+        "sldr": true,
         "suppress": true,
         "tag": "ab",
         "tags": [ "ab-Cyrl", "ab-GE" ],
@@ -819,6 +824,7 @@
         "full": "abs-Latn-ID",
         "iana": [ "Ambonese Malay" ],
         "iso639_3": "abs",
+        "localname": "Bahasa Malayu Ambon",
         "localnames": [ "Bahasa Malayu Ambon" ],
         "name": "Malay, Ambonese",
         "names": [ "Ambon Malay", "Ambonese", "Ambonese Malay", "Ambong", "Bahasa Ambon", "Bahasa Malayu Ambon", "Bahasa Malayu Aru", "Bahasa Melaju Ambon", "Bahasa Melayu Ambon", "Malayu Ambon", "Malayu Ambong", "Moluccan (Maluku) Malay" ],
@@ -826,7 +832,7 @@
         "regionname": "Indonesia",
         "regions": [ "NL", "US" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "abs",
         "tags": [ "abs-ID", "abs-Latn" ],
         "windows": "abs-Latn"
@@ -1208,6 +1214,7 @@
         "full": "acr-Latn-GT-x-cubulco",
         "iana": [ "Achi - Cubulco" ],
         "iso639_3": "acr",
+        "localname": "Qachʼaʼteem",
         "localnames": [ "Qachʼaʼteem", "Qachʼaʼteem Achi" ],
         "name": "Achi",
         "names": [ "Achi - Cubulco", "Aʼchaʼteem Achi", "Qachʼaʼteem", "Qachʼaʼteem Achi", "Qachʼaʼtem Achi" ],
@@ -1224,6 +1231,7 @@
         "full": "acr-Latn-GT-x-rabinal",
         "iana": [ "Achi - Rabinal" ],
         "iso639_3": "acr",
+        "localname": "Qachʼaʼteem",
         "localnames": [ "Qachʼaʼteem", "Qachʼaʼteem Achi" ],
         "name": "Achi",
         "names": [ "Achi - Rabinal", "Aʼchaʼteem Achi", "Qachʼaʼteem", "Qachʼaʼteem Achi", "Qachʼaʼtem Achi" ],
@@ -1236,6 +1244,22 @@
         "tags": [ "acr-GT-x-rabinal", "acr-Latn-x-rabinal" ],
         "windows": "acr-Latn-x-rabinal"
     },
+    {
+        "full": "acr-Latn-GT-x-trabinal",
+        "iana": [ "Achi - Traditional Rabinal" ],
+        "iso639_3": "acr",
+        "localname": "Qachʼaʼteem",
+        "localnames": [ "Qachʼaʼteem", "Qachʼaʼteem Achi" ],
+        "name": "Achi",
+        "names": [ "Achi - Traditional Rabinal", "Aʼchaʼteem Achi", "Qachʼaʼteem", "Qachʼaʼteem Achi", "Qachʼaʼtem Achi" ],
+        "region": "GT",
+        "regionname": "Guatemala",
+        "script": "Latn",
+        "sldr": true,
+        "tag": "acr-x-trabinal",
+        "tags": [ "acr-GT-x-trabinal", "acr-Latn-x-trabinal" ],
+        "windows": "acr-Latn-x-trabinal"
+    },
     {
         "full": "acs-Latn-BR",
         "iana": [ "Acroá" ],
@@ -2139,6 +2163,7 @@
         "full": "af-Latn-NA",
         "iana": [ "Afrikaans" ],
         "iso639_3": "afr",
+        "localname": "Afrikaans",
         "localnames": [ "Afrikaans" ],
         "name": "Afrikaans",
         "region": "NA",
@@ -2869,6 +2894,7 @@
         "region": "TH",
         "regionname": "Thailand",
         "regions": [ "CN", "LA", "VN" ],
+        "rod": "03127",
         "script": "Latn",
         "sldr": false,
         "tag": "ahk-TH",
@@ -2884,6 +2910,7 @@
         "region": "TH",
         "regionname": "Thailand",
         "regions": [ "CN", "LA", "MM", "VN" ],
+        "rod": "03127",
         "script": "Thai",
         "sldr": false,
         "tag": "ahk-Thai",
@@ -3365,11 +3392,12 @@
         "full": "aiw-Latn-ET",
         "iana": [ "Aari" ],
         "iso639_3": "aiw",
+        "localname": "Aari",
         "name": "Aari",
         "region": "ET",
         "regionname": "Ethiopia",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "aiw",
         "tags": [ "aiw-ET", "aiw-Latn" ],
         "windows": "aiw-Latn"
@@ -3752,6 +3780,7 @@
         "full": "akl-Latn-PH",
         "iana": [ "Aklanon" ],
         "iso639_3": "akl",
+        "localname": "Inakeanon",
         "localnames": [ "Inakeanon" ],
         "name": "Aklanon",
         "names": [ "Akeanon", "Aklan", "Aklano", "Aklanon-Bisayan", "Inakeanon", "Panay", "Qinakłanón" ],
@@ -3759,7 +3788,7 @@
         "regionname": "Philippines",
         "regions": [ "US" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "akl",
         "tags": [ "akl-Latn", "akl-PH" ],
         "windows": "akl-Latn"
@@ -4144,6 +4173,7 @@
         "name": "Albanian, Gheg",
         "names": [ "Geg", "Gegnisht", "Gegnisht-Shqyp", "Gheg", "Gheg Albanian", "Guegue", "Shopni", "Shqip", "Shqyp" ],
         "region": "XK",
+        "regionname": "Kosovo",
         "regions": [ "AL", "AU", "BG", "CH", "DE", "DK", "ME", "MK", "NO", "RO", "RS", "SI", "TR", "US" ],
         "script": "Latn",
         "sldr": false,
@@ -4277,13 +4307,14 @@
         "full": "alu-Latn-SB",
         "iana": [ "'Are'are" ],
         "iso639_3": "alu",
+        "localname": "Ɂareɂare",
         "localnames": [ "'Are'are" ],
         "name": "’Are’are",
         "names": [ "'Are'are", "Areare", "ɁAreɂare" ],
         "region": "SB",
         "regionname": "Solomon Islands",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "alu",
         "tags": [ "alu-Latn", "alu-SB" ],
         "windows": "alu-Latn"
@@ -4523,6 +4554,7 @@
         "names": [ "Andang", "Andangti", "Biltine", "Mima", "Mime", "Mimi", "Mututu", "Simi Amdangtii" ],
         "region": "TD",
         "regionname": "Chad",
+        "regions": [ "SD" ],
         "script": "Latn",
         "sldr": false,
         "tag": "amj",
@@ -4538,6 +4570,7 @@
         "nophonvars": true,
         "region": "TD",
         "regionname": "Chad",
+        "regions": [ "SD" ],
         "script": "Arab",
         "sldr": false,
         "tag": "amj-Arab",
@@ -4845,13 +4878,14 @@
         "full": "an-Latn-ES",
         "iana": [ "Aragonese" ],
         "iso639_3": "arg",
+        "localname": "aragonés",
         "localnames": [ "aragonés" ],
         "name": "Aragonese",
         "names": [ "Altoaragonés", "Aragoieraz", "Aragonais", "Aragonès", "Fabla", "Fabla Aragonesa", "High Aragonese", "Navarroaragonés", "aragonés" ],
         "region": "ES",
         "regionname": "Spain",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "an",
         "tags": [ "an-ES", "an-Latn" ],
         "windows": "an-Latn"
@@ -5666,7 +5700,7 @@
         "iana": [ "Levantine Arabic" ],
         "iso639_3": "apc",
         "latnnames": [ "Shami" ],
-        "localname": "شامي",
+        "localname": "العامية",
         "localnames": [ "شامي" ],
         "macrolang": "ar",
         "name": "Arabic, Levantine",
@@ -5771,7 +5805,6 @@
         "names": [ "Bukiyip - Mountain Arapesh", "Bukiyúp", "Mountain Arapesh" ],
         "region": "PG",
         "regionname": "Papua New Guinea",
-        "rod": "03286",
         "script": "Latn",
         "sldr": false,
         "tag": "ape-x-mountain",
@@ -5813,13 +5846,14 @@
         "iana": [ "Athpariya" ],
         "iso639_3": "aph",
         "latnnames": [ "Āṭhapahariyā" ],
+        "localname": "आठपहरिया",
         "localnames": [ "आठपहरिया" ],
         "name": "Athpariya",
         "names": [ "Arthare", "Athaphre", "Athapre", "Athpahariya", "Athpare", "Athpre", "Sanango Ring" ],
         "region": "NP",
         "regionname": "Nepal",
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "aph",
         "tags": [ "aph-Deva", "aph-NP" ],
         "windows": "aph-Deva"
@@ -6264,6 +6298,7 @@
         "full": "ar-Arab-AE",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "AE",
         "regionname": "United Arab Emirates",
@@ -6276,6 +6311,7 @@
         "full": "ar-Arab-BH",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "BH",
         "regionname": "Bahrain",
@@ -6304,6 +6340,7 @@
         "full": "ar-Arab-DJ",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "DJ",
         "regionname": "Djibouti",
@@ -6316,6 +6353,7 @@
         "full": "ar-Arab-DZ",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "DZ",
         "regionname": "Algeria",
@@ -6328,6 +6366,7 @@
         "full": "ar-Arab-EH",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "EH",
         "regionname": "Western Sahara",
@@ -6340,6 +6379,7 @@
         "full": "ar-Arab-ER",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "ER",
         "regionname": "Eritrea",
@@ -6367,6 +6407,7 @@
         "full": "ar-Arab-IL",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "IL",
         "regionname": "Israel",
@@ -6379,6 +6420,7 @@
         "full": "ar-Arab-IQ",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "IQ",
         "regionname": "Iraq",
@@ -6391,6 +6433,7 @@
         "full": "ar-Arab-JO",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "JO",
         "regionname": "Jordan",
@@ -6403,6 +6446,7 @@
         "full": "ar-Arab-KM",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "KM",
         "regionname": "Comoros",
@@ -6415,6 +6459,7 @@
         "full": "ar-Arab-KW",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "KW",
         "regionname": "Kuwait",
@@ -6427,6 +6472,7 @@
         "full": "ar-Arab-LB",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "LB",
         "regionname": "Lebanon",
@@ -6439,6 +6485,7 @@
         "full": "ar-Arab-LY",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "LY",
         "regionname": "Libya",
@@ -6451,6 +6498,7 @@
         "full": "ar-Arab-MA",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "MA",
         "regionname": "Morocco",
@@ -6463,6 +6511,7 @@
         "full": "ar-Arab-MR",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "MR",
         "regionname": "Mauritania",
@@ -6475,6 +6524,7 @@
         "full": "ar-Arab-OM",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "OM",
         "regionname": "Oman",
@@ -6487,6 +6537,7 @@
         "full": "ar-Arab-PS",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "PS",
         "regionname": "State of Palestine",
@@ -6499,6 +6550,7 @@
         "full": "ar-Arab-QA",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "QA",
         "regionname": "Qatar",
@@ -6511,6 +6563,7 @@
         "full": "ar-Arab-SA",
         "iana": [ "Arabic" ],
         "latnnames": [ "al-ʻArabīyah" ],
+        "localname": "العربية",
         "localnames": [ "العربية" ],
         "name": "Arabic",
         "names": [ "Al-’Arabiyya", "Arabic, Standard", "Literary Arabic", "árabe" ],
@@ -6527,6 +6580,7 @@
         "full": "ar-Arab-SD",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "SD",
         "regionname": "Sudan",
@@ -6539,6 +6593,7 @@
         "full": "ar-Arab-SO",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "SO",
         "regionname": "Somalia",
@@ -6551,6 +6606,7 @@
         "full": "ar-Arab-SS",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "SS",
         "regionname": "South Sudan",
@@ -6563,6 +6619,7 @@
         "full": "ar-Arab-SY",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "SY",
         "regionname": "Syrian Arab Republic",
@@ -6605,6 +6662,7 @@
         "full": "ar-Arab-TD",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "TD",
         "regionname": "Chad",
@@ -6617,6 +6675,7 @@
         "full": "ar-Arab-TN",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "TN",
         "regionname": "Tunisia",
@@ -6629,6 +6688,7 @@
         "full": "ar-Arab-YE",
         "iana": [ "Arabic" ],
         "iso639_3": "ara",
+        "localname": "العربية",
         "name": "Arabic",
         "region": "YE",
         "regionname": "Yemen",
@@ -6637,42 +6697,6 @@
         "tag": "ar-YE",
         "windows": "ar-Arab-YE"
     },
-    {
-        "full": "arb-Arab-EG",
-        "iana": [ "Standard Arabic" ],
-        "iso639_3": "arb",
-        "latnnames": [ "al-ʻArabīyah" ],
-        "localname": "العربية",
-        "localnames": [ "العربية" ],
-        "macrolang": "ar",
-        "name": "Arabic, Standard",
-        "names": [ "Standard Arabic" ],
-        "region": "EG",
-        "regionname": "Egypt",
-        "script": "Arab",
-        "sldr": true,
-        "tag": "arb-EG",
-        "tags": [ "ar-arb-Arab-EG", "ar-arb-EG" ],
-        "windows": "arb-Arab-EG"
-    },
-    {
-        "full": "arb-Arab-LB",
-        "iana": [ "Standard Arabic" ],
-        "iso639_3": "arb",
-        "latnnames": [ "al-ʻArabīyah" ],
-        "localname": "العربية",
-        "localnames": [ "العربية" ],
-        "macrolang": "ar",
-        "name": "Arabic, Standard",
-        "names": [ "Standard Arabic" ],
-        "region": "LB",
-        "regionname": "Lebanon",
-        "script": "Arab",
-        "sldr": true,
-        "tag": "arb-LB",
-        "tags": [ "ar-arb-Arab-LB", "ar-arb-LB" ],
-        "windows": "arb-Arab-LB"
-    },
     {
         "full": "arc-Armi-IR",
         "iana": [ "Official Aramaic (700-300 BCE)", "Imperial Aramaic (700-300 BCE)" ],
@@ -6964,18 +6988,18 @@
         "windows": "aru-Latn"
     },
     {
-        "full": "arv-Zyyy-ET",
+        "full": "arv-Latn-ET",
         "iana": [ "Arbore" ],
         "iso639_3": "arv",
         "name": "Arbore",
         "region": "ET",
         "regionname": "Ethiopia",
-        "script": "Zyyy",
+        "script": "Latn",
         "sldr": false,
         "tag": "arv",
-        "tags": [ "arv-ET", "arv-Zyyy" ],
+        "tags": [ "arv-ET", "arv-Latn" ],
         "unwritten": true,
-        "windows": "arv-Zyyy"
+        "windows": "arv-Latn"
     },
     {
         "full": "arw-Latn-SR",
@@ -7221,13 +7245,14 @@
         "full": "asj-Latn-CM",
         "iana": [ "Sari" ],
         "iso639_3": "asj",
+        "localname": "Sari",
         "localnames": [ "Sari" ],
         "name": "Sari",
         "names": [ "Akweto", "Nsari", "Pesaa", "Saari", "Sali" ],
         "region": "CM",
         "regionname": "Cameroon",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "asj",
         "tags": [ "asj-CM", "asj-Latn" ],
         "windows": "asj-Latn"
@@ -9109,7 +9134,7 @@
         "names": [ "Azerbaijan", "Azerbaijani, North", "Azerbaydzhani", "Azeri", "Azeri Turk", "Azərbaycan dili", "Azərbaycanca", "Turkler" ],
         "region": "AZ",
         "regionname": "Azerbaijan",
-        "regions": [ "AF", "AM", "DE", "EE", "GE", "IR", "KG", "KZ", "RU", "TM", "UA", "UZ" ],
+        "regions": [ "AF", "AM", "DE", "EE", "GE", "IR", "KG", "KZ", "RU", "TM", "TR", "UA", "UZ" ],
         "script": "Latn",
         "sldr": true,
         "tag": "az",
@@ -9133,28 +9158,16 @@
         "tags": [ "azj-Brai", "azj-Brai-IR" ],
         "windows": "az-Brai"
     },
-    {
-        "full": "az-Cyrl-AZ",
-        "iana": [ "Azerbaijani" ],
-        "iso639_3": "aze",
-        "localname": "azəri",
-        "name": "Azerbaijani",
-        "region": "AZ",
-        "regionname": "Azerbaijan",
-        "script": "Cyrl",
-        "sldr": true,
-        "tag": "az-Cyrl-AZ",
-        "windows": "az-Cyrl-AZ"
-    },
     {
         "full": "az-Arab-IQ",
         "iana": [ "Azerbaijani" ],
         "iso639_3": "aze",
+        "localname": "تۆرکجه",
         "name": "Azerbaijani",
         "region": "IQ",
         "regionname": "Iraq",
         "script": "Arab",
-        "sldr": false,
+        "sldr": true,
         "tag": "az-IQ",
         "windows": "az-Arab-IQ"
     },
@@ -9162,13 +9175,14 @@
         "full": "az-Arab-IR",
         "iana": [ "Azerbaijani" ],
         "iso639_3": "aze",
+        "localname": "تۆرکجه",
         "name": "Azerbaijani",
         "names": [ "Azerbaijan", "Azerbaijani, North", "Azerbaydzhani", "Azeri", "Azeri Turk", "Azərbaycan dili", "Azərbaycanca", "Turkler" ],
         "region": "IR",
         "regionname": "Islamic Republic of Iran",
-        "regions": [ "AF", "AM", "AZ", "DE", "EE", "GE", "KG", "KZ", "RU", "TM", "UA", "UZ" ],
+        "regions": [ "AF", "AM", "AZ", "DE", "EE", "GE", "KG", "KZ", "RU", "TM", "TR", "UA", "UZ" ],
         "script": "Arab",
-        "sldr": false,
+        "sldr": true,
         "tag": "az-IR",
         "tags": [ "az-Arab", "azj-Arab", "azj-Arab-IR" ],
         "windows": "az-Arab"
@@ -9182,7 +9196,7 @@
         "names": [ "Azerbaijan", "Azerbaijani, North", "Azerbaydzhani", "Azeri", "Azeri Turk", "Azərbaycan dili", "Azərbaycanca", "Turkler" ],
         "region": "RU",
         "regionname": "Russian Federation",
-        "regions": [ "AM", "DE", "EE", "GE", "IR", "KG", "KZ", "TM", "UA", "UZ" ],
+        "regions": [ "AM", "AZ", "DE", "EE", "GE", "IR", "KG", "KZ", "TM", "UA", "UZ" ],
         "script": "Cyrl",
         "sldr": true,
         "tag": "az-RU",
@@ -9365,6 +9379,7 @@
         "iana": [ "Bashkir" ],
         "iso639_3": "bak",
         "latnnames": [ "Başqort tele", "Başqortsa" ],
+        "localname": "башҡорт теле",
         "localnames": [ "Башҡорт теле", "Башҡортса" ],
         "name": "Bashkort",
         "names": [ "Bashkir", "Bashqort", "Basquort" ],
@@ -9372,7 +9387,7 @@
         "regionname": "Russian Federation",
         "regions": [ "KG", "KZ", "TJ", "TM", "UA", "UZ" ],
         "script": "Cyrl",
-        "sldr": false,
+        "sldr": true,
         "tag": "ba",
         "tags": [ "ba-Cyrl", "ba-RU" ],
         "windows": "ba-Cyrl"
@@ -9535,7 +9550,7 @@
         "full": "bal-Latn-PK",
         "iana": [ "Baluchi" ],
         "iso639_3": "bal",
-        "localname": "Balóchi",
+        "localname": "Balóchi (Látin)",
         "localnames": [ "Balóchi" ],
         "name": "Baluchi",
         "names": [ "Balochi, Southern", "Baloci", "Baluci", "Balóchi", "Makrani" ],
@@ -10959,7 +10974,6 @@
         "suppress": true,
         "tag": "be",
         "tags": [ "be-BY", "be-Cyrl" ],
-        "variants": [ "1959acad", "tarask" ],
         "windows": "be"
     },
     {
@@ -11006,6 +11020,24 @@
         "tag": "be-Latn",
         "windows": "be-Latn"
     },
+    {
+        "full": "be-Cyrl-BY-tarask",
+        "iana": [ "Belarusian" ],
+        "iso639_3": "bel",
+        "latnnames": [ "Biełaruskaja mova" ],
+        "localnames": [ "беларуская мова" ],
+        "name": "Belarusian",
+        "names": [ "Belarusan", "Belorussian", "Bielorussian", "Byelorussian", "White Russian", "White Ruthenian" ],
+        "region": "BY",
+        "regionname": "Belarus",
+        "regions": [ "AZ", "CA", "CZ", "DE", "EE", "KG", "KZ", "LT", "LV", "PL", "RU", "TJ", "TM", "UA", "US", "UZ" ],
+        "script": "Cyrl",
+        "sldr": false,
+        "tag": "be-tarask",
+        "tags": [ "be-BY-tarask", "be-Cyrl-tarask" ],
+        "variants": [ "1959acad", "tarask" ],
+        "windows": "be-Cyrl-tarask"
+    },
     {
         "full": "bea-Latn-CA",
         "iana": [ "Beaver" ],
@@ -11348,13 +11380,14 @@
         "full": "bew-Latn-ID",
         "iana": [ "Betawi" ],
         "iso639_3": "bew",
+        "localname": "Betawi",
         "localnames": [ "Betawi" ],
         "name": "Betawi",
         "names": [ "Anak Betawi", "Batavi", "Batavian", "Batawi", "Betawi Malay", "Jakarta Malay", "Melayu Betawi", "Melayu Jakarte", "Orang Betawi" ],
         "region": "ID",
         "regionname": "Indonesia",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "bew",
         "tags": [ "bew-ID", "bew-Latn" ],
         "windows": "bew-Latn"
@@ -11906,6 +11939,7 @@
         "iana": [ "Bagheli" ],
         "iso639_3": "bfy",
         "latnnames": [ "Bagheli" ],
+        "localname": "बघेली",
         "localnames": [ "बघेली" ],
         "name": "Bagheli",
         "names": [ "Bagelkhandi", "Bhugelkhud", "Gangai", "Godwani Kawathi", "Kenat", "Kevat Boli", "Kevati", "Kewani", "Kewat", "Kewati", "Kewot", "Kumhari", "Mandal", "Mannadi", "Riwai" ],
@@ -11913,7 +11947,7 @@
         "regionname": "India",
         "regions": [ "NP" ],
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "bfy",
         "tags": [ "bfy-Deva", "bfy-IN", "ppa", "ppa-Deva", "ppa-Deva-IN", "ppa-IN" ],
         "windows": "bfy-Deva"
@@ -12168,15 +12202,16 @@
         "iana": [ "Western Balochi" ],
         "iso639_3": "bgn",
         "latnnames": [ "Balochi" ],
+        "localname": "بلوچی (رخشانی)",
         "localnames": [ "بلوچی" ],
         "macrolang": "bal",
         "name": "Balochi, Western",
         "names": [ "Baloci", "Baluchi", "Baluci", "Western Balochi", "Yarahmadza" ],
         "region": "PK",
         "regionname": "Pakistan",
-        "regions": [ "AF", "IR", "TJ", "TM" ],
+        "regions": [ "AE", "AF", "IR", "OM", "TJ", "TM" ],
         "script": "Arab",
-        "sldr": false,
+        "sldr": true,
         "tag": "bgn",
         "tags": [ "bgn-Arab", "bgn-PK" ],
         "windows": "bgn-Arab"
@@ -12252,6 +12287,7 @@
         "iana": [ "Bagri" ],
         "iso639_3": "bgq",
         "latnnames": [ "Bagri" ],
+        "localname": "बागड़ी",
         "localnames": [ "बागड़ी" ],
         "macrolang": "raj",
         "name": "Bagri",
@@ -12260,7 +12296,7 @@
         "regionname": "India",
         "regions": [ "PK" ],
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "bgq",
         "tags": [ "bgq-Deva", "bgq-IN" ],
         "windows": "bgq-Deva"
@@ -13202,19 +13238,18 @@
         "windows": "biw-Latn"
     },
     {
-        "full": "bix-Zyyy-IN",
+        "full": "bix-Deva-IN",
         "iana": [ "Bijori" ],
         "iso639_3": "bix",
         "name": "Bijori",
         "names": [ "Binjhia", "Birijia", "Birjia", "Brijia", "Burja" ],
         "region": "IN",
         "regionname": "India",
-        "script": "Zyyy",
+        "script": "Deva",
         "sldr": false,
         "tag": "bix",
-        "tags": [ "bix-IN", "bix-Zyyy" ],
-        "unwritten": true,
-        "windows": "bix-Zyyy"
+        "tags": [ "bix-Deva", "bix-IN" ],
+        "windows": "bix-Deva"
     },
     {
         "full": "biy-Deva-IN",
@@ -13400,13 +13435,14 @@
         "full": "bjk-Latn-PG",
         "iana": [ "Barok" ],
         "iso639_3": "bjk",
+        "localname": "Barok",
         "localnames": [ "Barok" ],
         "name": "Barok",
         "names": [ "Kanalu", "Kanapit", "Kolube", "Komalu", "Kulubi" ],
         "region": "PG",
         "regionname": "Papua New Guinea",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "bjk",
         "tags": [ "bjk-Latn", "bjk-PG" ],
         "windows": "bjk-Latn"
@@ -14013,6 +14049,7 @@
         "full": "bkw-Latn-CG",
         "iana": [ "Bekwel" ],
         "iso639_3": "bkw",
+        "localname": "Bɛkwyel",
         "localnames": [ "Bɛkwyel" ],
         "name": "Bekwel",
         "names": [ "Bakwele", "Bakwil", "Bekwie", "Bekwil", "Bɛkwyel", "Okpele" ],
@@ -14020,7 +14057,7 @@
         "regionname": "Congo",
         "regions": [ "CM", "GA" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "bkw",
         "tags": [ "bkw-CG", "bkw-Latn" ],
         "windows": "bkw-Latn"
@@ -14289,7 +14326,7 @@
         "full": "blo-Latn-BJ",
         "iana": [ "Anii" ],
         "iso639_3": "blo",
-        "localname": "Anii",
+        "localname": "anii kagɩja",
         "localnames": [ "Anii" ],
         "name": "Anii",
         "names": [ "Akpe", "Baseca", "Basila", "Bassila", "Basèda", "Giseda", "Gisida", "Gɩsɩda" ],
@@ -14357,6 +14394,7 @@
         "region": "MM",
         "regionname": "Myanmar",
         "regions": [ "CN", "TH" ],
+        "rod": "21276",
         "script": "Latn",
         "sldr": false,
         "tag": "blr-Latn-x-pangpung",
@@ -14413,6 +14451,7 @@
         "full": "blt-Tavt-VN",
         "iana": [ "Tai Dam" ],
         "iso639_3": "blt",
+        "localname": "ꪼꪕꪒꪾ",
         "name": "Tai Dam",
         "names": [ "Black Tai", "Hei Dai", "Jinping Dai", "Tai Do", "Tai Noir", "Tailam", "Tailon", "Thai Den", "Thái Den", "ꞌTáy", "ꞌTáy Ðăm" ],
         "region": "VN",
@@ -14577,7 +14616,7 @@
         "regionname": "Mali",
         "regions": [ "CI", "GM", "MR", "SN" ],
         "script": "Nkoo",
-        "sldr": false,
+        "sldr": true,
         "tag": "bm-Nkoo",
         "windows": "bm-Nkoo"
     },
@@ -14998,6 +15037,7 @@
         "iana": [ "Bengali", "Bangla" ],
         "iso639_3": "ben",
         "latnnames": [ "Bangla" ],
+        "localname": "বাংলা",
         "localnames": [ "বাংলা" ],
         "name": "Bengali",
         "names": [ "Bangla" ],
@@ -15008,6 +15048,20 @@
         "tag": "bn-IN",
         "windows": "bn-Beng-IN"
     },
+    {
+        "full": "bn-Latn-NP",
+        "iana": [ "Bengali", "Bangla" ],
+        "iso639_3": "ben",
+        "name": "Bengali",
+        "names": [ "Bangala", "Bangla", "Bangla-Bhasa" ],
+        "region": "NP",
+        "regionname": "Nepal",
+        "regions": [ "AE", "AU", "BD", "CA", "FI", "GB", "IN", "LK", "MU", "MW", "OM", "SA", "SG", "US" ],
+        "script": "Latn",
+        "sldr": false,
+        "tag": "bn-Latn",
+        "windows": "bn-Latn"
+    },
     {
         "full": "bn-Newa-NP",
         "iana": [ "Bengali", "Bangla" ],
@@ -15022,7 +15076,6 @@
         "script": "Newa",
         "sldr": false,
         "tag": "bn-Newa",
-        "tags": [ "bn-NP" ],
         "windows": "bn-Newa"
     },
     {
@@ -15428,6 +15481,7 @@
         "iana": [ "Tibetan" ],
         "iso639_3": "bod",
         "latnnames": [ "bod.yig", "bod.skad" ],
+        "localname": "བོད་སྐད་",
         "localnames": [ "བོད་ཡིག།", "བོད་སྐད།" ],
         "name": "Tibetan",
         "region": "IN",
@@ -15466,6 +15520,20 @@
         "tag": "bo-Marc",
         "windows": "bo-Marc"
     },
+    {
+        "full": "bo-Mong-CN",
+        "iana": [ "Tibetan" ],
+        "iso639_3": "bod",
+        "name": "Tibetan, Central",
+        "names": [ "Bhotia", "Lhasa Tibetan", "Literary Tibetan", "Phoke", "Tibetan", "Wei", "Weizang", "Zang" ],
+        "nophonvars": true,
+        "region": "CN",
+        "regionname": "China",
+        "script": "Mong",
+        "sldr": false,
+        "tag": "bo-Mong",
+        "windows": "bo-Mong"
+    },
     {
         "full": "bo-Phag-CN",
         "iana": [ "Tibetan" ],
@@ -15481,6 +15549,21 @@
         "tag": "bo-Phag",
         "windows": "bo-Phag"
     },
+    {
+        "full": "bo-Soyo-CN",
+        "iana": [ "Tibetan" ],
+        "iso639_3": "bod",
+        "name": "Tibetan, Central",
+        "names": [ "Bhotia", "Bod", "Bod Skad", "Central Tibetan", "Lhasa Tibetan", "Literary Tibetan", "Phoke", "Pohbetian", "Poke", "Skad", "Tebilian", "Tibate", "Tibetan", "Wei", "Weizang", "Zang", "Zang Wen" ],
+        "nophonvars": true,
+        "region": "CN",
+        "regionname": "China",
+        "regions": [ "CH", "IN", "NO", "NP", "TW", "US" ],
+        "script": "Soyo",
+        "sldr": false,
+        "tag": "bo-Soyo",
+        "windows": "bo-Soyo"
+    },
     {
         "full": "boa-Latn-PE",
         "iana": [ "Bora" ],
@@ -16537,18 +16620,17 @@
         "windows": "bqu-Latn"
     },
     {
-        "full": "bqv-Latn-CI",
+        "full": "bqv-Latn-NG",
         "iana": [ "Koro Wachi", "Begbere-Ejar" ],
         "iso639_3": "bqv",
         "name": "Koro Wachi",
         "names": [ "Agere", "Begbere-Ejar", "Koro Agwe", "Koro Makama" ],
-        "region": "CI",
-        "regionname": "Côte d'Ivoire",
-        "regions": [ "NG" ],
+        "region": "NG",
+        "regionname": "Nigeria",
         "script": "Latn",
         "sldr": false,
         "tag": "bqv",
-        "tags": [ "bqv-CI", "bqv-Latn" ],
+        "tags": [ "bqv-Latn", "bqv-NG" ],
         "windows": "bqv-Latn"
     },
     {
@@ -17061,6 +17143,7 @@
         "region": "TH",
         "regionname": "Thailand",
         "regions": [ "LA", "US" ],
+        "rod": "08379",
         "script": "Thai",
         "sldr": false,
         "tag": "brv-Thai-x-donglng",
@@ -17571,7 +17654,7 @@
         "full": "bss-Latn-CM",
         "iana": [ "Akoose" ],
         "iso639_3": "bss",
-        "localname": "Akɔ́ɔ̄sē",
+        "localname": "Akoose",
         "localnames": [ "Akɔ́ɔ̄sē" ],
         "name": "Akoose",
         "names": [ "Akose", "Akosi", "Akɔɔse", "Akɔ́ɔ̄sē", "Bafaramani", "Bakosi", "Bakossi", "Bekoose", "Koose", "Kosi", "Kosse", "Kossi", "Manenguba", "Ngoe", "Nkoosi", "Nkosi" ],
@@ -17769,6 +17852,19 @@
         "tags": [ "btd-Batk", "btd-ID" ],
         "windows": "btd-Batk"
     },
+    {
+        "full": "btd-Latn-ID",
+        "iana": [ "Batak Dairi" ],
+        "iso639_3": "btd",
+        "name": "Batak Dairi",
+        "names": [ "Pakpak Dairi" ],
+        "region": "ID",
+        "regionname": "Indonesia",
+        "script": "Latn",
+        "sldr": false,
+        "tag": "btd-Latn",
+        "windows": "btd-Latn"
+    },
     {
         "full": "bte-Latn-NG",
         "iana": [ "Gamo-Ningi" ],
@@ -17802,13 +17898,14 @@
         "full": "btg-Latn-CI",
         "iana": [ "Gagnoa Bété" ],
         "iso639_3": "btg",
+        "localname": "Bhete",
         "localnames": [ "Bhete" ],
         "name": "Bété, Gagnoa",
         "names": [ "Bhete", "Bhete of Gagnoa", "Eastern Bété", "Gagnoa Bété", "Gagnoua-Bété", "Shyen" ],
         "region": "CI",
         "regionname": "Côte d'Ivoire",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "btg",
         "tags": [ "btg-CI", "btg-Latn" ],
         "windows": "btg-Latn"
@@ -18088,7 +18185,6 @@
         "sldr": false,
         "tag": "bty",
         "tags": [ "bty-ID", "bty-Latn" ],
-        "unwritten": true,
         "windows": "bty-Latn"
     },
     {
@@ -18428,11 +18524,11 @@
     },
     {
         "full": "buu-Latn-CD-x-bafwa",
-        "iana": [ "Budu" ],
+        "iana": [ "Budu - Bafwa" ],
         "iso639_3": "buu",
         "localnames": [ "Ɨbʉdʉ", "ɨbʉdhʉ" ],
         "name": "Budu",
-        "names": [ "Bodo", "Ebudu", "Kibudu", "Ɨbʉdʉ", "ɨbʉdhʉ", "ɨɓʉdʉ" ],
+        "names": [ "Bodo", "Budu - Bafwa", "Ebudu", "Kibudu", "Ɨbʉdʉ", "ɨbʉdhʉ", "ɨɓʉdʉ" ],
         "region": "CD",
         "regionname": "The Democratic Republic of the Congo",
         "rod": "8404",
@@ -18444,20 +18540,37 @@
     },
     {
         "full": "buu-Latn-CD-x-ineta",
-        "iana": [ "Budu" ],
+        "iana": [ "Budu - Ineta" ],
         "iso639_3": "buu",
+        "localname": "Ɨɓʉdʉ",
         "localnames": [ "Ɨbʉdʉ", "ɨbʉdhʉ" ],
         "name": "Budu",
-        "names": [ "Bodo", "Ebudu", "Kibudu", "Ɨbʉdʉ", "ɨbʉdhʉ", "ɨɓʉdʉ" ],
+        "names": [ "Bodo", "Budu - Ineta", "Ebudu", "Kibudu", "Ɨbʉdʉ", "ɨbʉdhʉ", "ɨɓʉdʉ" ],
         "region": "CD",
         "regionname": "The Democratic Republic of the Congo",
         "rod": "8406",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "buu-x-ineta",
         "tags": [ "buu-CD-x-ineta", "buu-Latn-x-ineta" ],
         "windows": "buu-Latn-x-ineta"
     },
+    {
+        "full": "buu-Latn-CD-x-koya",
+        "iana": [ "Budu - Koya" ],
+        "iso639_3": "buu",
+        "localnames": [ "Ɨbʉdʉ", "ɨbʉdhʉ" ],
+        "name": "Budu",
+        "names": [ "Bodo", "Budu - Koya", "Ebudu", "Kibudu", "Ɨbʉdʉ", "ɨbʉdhʉ", "ɨɓʉdʉ" ],
+        "region": "CD",
+        "regionname": "The Democratic Republic of the Congo",
+        "rod": "19443",
+        "script": "Latn",
+        "sldr": true,
+        "tag": "buu-x-koya",
+        "tags": [ "buu-CD-x-koya", "buu-Latn-x-koya" ],
+        "windows": "buu-Latn-x-koya"
+    },
     {
         "full": "buv-Latn-PG",
         "iana": [ "Bun" ],
@@ -19054,13 +19167,14 @@
         "full": "bwj-Latn-BF",
         "iana": [ "Láá Láá Bwamu" ],
         "iso639_3": "bwj",
+        "localname": "Làa làa Bũamu",
         "localnames": [ "Làa làa Bũamu" ],
         "name": "Bwamu, Láá Láá",
         "names": [ "Buamu Laa", "Buamu-laa", "Bwamu Laa", "Kàdenbà", "Làa làa Bũamu", "Láá Láá Bwamu", "Yere" ],
         "region": "BF",
         "regionname": "Burkina Faso",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "bwj",
         "tags": [ "bwj-BF", "bwj-Latn" ],
         "windows": "bwj-Latn"
@@ -19300,7 +19414,6 @@
         "sldr": false,
         "tag": "bwz",
         "tags": [ "bwz-CG", "bwz-Latn" ],
-        "unwritten": true,
         "windows": "bwz-Latn"
     },
     {
@@ -19946,7 +20059,7 @@
         "full": "byr-Latn-PG",
         "iana": [ "Baruya", "Yipma" ],
         "iso639_3": "byr",
-        "localname": "Yɨꞌmayagaala ",
+        "localname": "Yɨꞌmayagaala",
         "localnames": [ "Yɨꞌmayagaala" ],
         "name": "Yipma",
         "names": [ "Barua", "Baruya", "Yɨꞌmayagaala" ],
@@ -20497,6 +20610,7 @@
         "full": "ca-Latn-FR",
         "iana": [ "Catalan", "Valencian" ],
         "iso639_3": "cat",
+        "localname": "català",
         "localnames": [ "Català" ],
         "name": "Catalan",
         "names": [ "Valencian" ],
@@ -20577,12 +20691,13 @@
         "full": "cad-Latn-US",
         "iana": [ "Caddo" ],
         "iso639_3": "cad",
+        "localname": "Caddo",
         "name": "Caddo",
         "names": [ "Caddoe", "Hasí:nay", "Hatsinai", "Kado", "Kadohadacho" ],
         "region": "US",
         "regionname": "United States",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "cad",
         "tags": [ "cad-Latn", "cad-US" ],
         "unwritten": true,
@@ -20701,6 +20816,7 @@
         "full": "cak-Latn-GT-x-central",
         "iana": [ "Kaqchikel" ],
         "iso639_3": "cak",
+        "localname": "Kaqchikel",
         "localnames": [ "Kaqchikel" ],
         "name": "Kaqchikel",
         "names": [ "Cakchiquel", "Kaqchiquel", "Maya" ],
@@ -20717,6 +20833,7 @@
         "full": "cak-Latn-GT-x-eastern",
         "iana": [ "Kaqchikel" ],
         "iso639_3": "cak",
+        "localname": "Kaqchikel",
         "localnames": [ "Kaqchikel" ],
         "name": "Kaqchikel",
         "names": [ "Cakchiquel", "Kaqchiquel", "Maya" ],
@@ -20749,6 +20866,7 @@
         "full": "cak-Latn-GT-x-subcm",
         "iana": [ "Kaqchikel" ],
         "iso639_3": "cak",
+        "localname": "Kaqchikel",
         "localnames": [ "Kaqchikel" ],
         "name": "Kaqchikel",
         "names": [ "Cakchiquel", "Kaqchiquel", "Maya" ],
@@ -20756,7 +20874,7 @@
         "regionname": "Guatemala",
         "rod": "4023",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "cak-x-subcm",
         "tags": [ "cak-GT-x-subcm", "cak-Latn-x-subcm" ],
         "windows": "cak-Latn-x-subcm"
@@ -20765,6 +20883,7 @@
         "full": "cak-Latn-GT-x-subsa",
         "iana": [ "Kaqchikel" ],
         "iso639_3": "cak",
+        "localname": "Kaqchikel",
         "localnames": [ "Kaqchikel" ],
         "name": "Kaqchikel",
         "names": [ "Cakchiquel", "Kaqchiquel", "Maya" ],
@@ -20781,6 +20900,7 @@
         "full": "cak-Latn-GT-x-subso",
         "iana": [ "Kaqchikel" ],
         "iso639_3": "cak",
+        "localname": "Kaqchikel",
         "localnames": [ "Kaqchikel" ],
         "name": "Kaqchikel",
         "names": [ "Cakchiquel", "Kaqchiquel", "Maya" ],
@@ -20797,6 +20917,7 @@
         "full": "cak-Latn-GT-x-subsu",
         "iana": [ "Kaqchikel" ],
         "iso639_3": "cak",
+        "localname": "Kaqchikel",
         "localnames": [ "Kaqchikel" ],
         "name": "Kaqchikel",
         "names": [ "Cakchiquel", "Kaqchiquel", "Maya" ],
@@ -20813,6 +20934,7 @@
         "full": "cak-Latn-GT-x-swestern",
         "iana": [ "Kaqchikel" ],
         "iso639_3": "cak",
+        "localname": "Kaqchikel",
         "localnames": [ "Kaqchikel" ],
         "name": "Kaqchikel",
         "names": [ "Cakchiquel", "Kaqchiquel", "Maya" ],
@@ -20829,6 +20951,7 @@
         "full": "cak-Latn-GT-x-xenacoj",
         "iana": [ "Kaqchikel" ],
         "iso639_3": "cak",
+        "localname": "Kaqchikel",
         "localnames": [ "Kaqchikel" ],
         "name": "Kaqchikel",
         "names": [ "Cakchiquel", "Kaqchiquel", "Maya" ],
@@ -21241,19 +21364,33 @@
         "full": "cbs-Latn-PE",
         "iana": [ "Cashinahua" ],
         "iso639_3": "cbs",
-        "localname": "Hãtxa Kuī",
+        "localname": "Hantxa Kuin",
         "localnames": [ "Hãtxa Kuī" ],
         "name": "Kashinawa",
         "names": [ "Cashinahua", "Caxinahua", "Caxinauá", "Caxinawá", "Hantxa Kuin", "Huni Kui", "Huni Kuin", "Hãtxa Kuī", "Juni Kuin", "Kashinahua", "Kaxinauá", "Kaxinawá", "Kaxynawa" ],
         "region": "PE",
         "regionname": "Peru",
-        "regions": [ "BR" ],
         "script": "Latn",
         "sldr": true,
         "tag": "cbs",
         "tags": [ "cbs-Latn", "cbs-PE" ],
         "windows": "cbs-Latn"
     },
+    {
+        "full": "cbs-Latn-BR",
+        "iana": [ "Cashinahua" ],
+        "iso639_3": "cbs",
+        "localname": "Hãtxa Kuī",
+        "localnames": [ "Hãtxa Kuī" ],
+        "name": "Kaxinawá",
+        "names": [ "Cashinahua", "Caxinauá", "Caxinawá", "Huni Kui", "Huni Kuin", "Hãtxa Kuī", "Juni Kuin", "Kaxinauá", "Kaxynawa" ],
+        "region": "BR",
+        "regionname": "Brazil",
+        "script": "Latn",
+        "sldr": true,
+        "tag": "cbs-BR",
+        "windows": "cbs-Latn-BR"
+    },
     {
         "full": "cbt-Latn-PE",
         "iana": [ "Chayahuita" ],
@@ -21408,6 +21545,7 @@
         "full": "cch-Latn-NG",
         "iana": [ "Atsam" ],
         "iso639_3": "cch",
+        "localname": "Atsam",
         "name": "Atsam",
         "names": [ "Cawai", "Cawe", "Cawi", "Chawai", "Chawe", "Chawi" ],
         "region": "NG",
@@ -21681,7 +21819,7 @@
         "regionname": "Nepal",
         "rod": "04097",
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "cdm",
         "tags": [ "cdm-Deva", "cdm-NP" ],
         "windows": "cdm-Deva"
@@ -21700,19 +21838,18 @@
         "windows": "cdm-Latn"
     },
     {
-        "full": "cdn-Zyyy-IN",
+        "full": "cdn-Deva-IN",
         "iana": [ "Chaudangsi" ],
         "iso639_3": "cdn",
         "name": "Chaudangsi",
         "names": [ "Bangba Lo", "Bangba-Lwo", "Bangbani", "Chanpa Lo", "Chaudans Lo", "Saukas", "Shaukas", "Tsaudangsi" ],
         "region": "IN",
         "regionname": "India",
-        "script": "Zyyy",
+        "script": "Deva",
         "sldr": false,
         "tag": "cdn",
-        "tags": [ "cdn-IN", "cdn-Zyyy" ],
-        "unwritten": true,
-        "windows": "cdn-Zyyy"
+        "tags": [ "cdn-Deva", "cdn-IN" ],
+        "windows": "cdn-Deva"
     },
     {
         "full": "cdo-Hans-CN",
@@ -21952,6 +22089,7 @@
         "names": [ "Chin, Eastern Khumi Asang (Khongso) dialect", "Khami" ],
         "region": "MM",
         "regionname": "Myanmar",
+        "rod": "23797",
         "script": "Latn",
         "sldr": false,
         "tag": "cek-x-asang",
@@ -21966,6 +22104,7 @@
         "names": [ "Chin, Eastern Khumi Hnise dialect", "Khami" ],
         "region": "MM",
         "regionname": "Myanmar",
+        "rod": "23800",
         "script": "Latn",
         "sldr": false,
         "tag": "cek-x-hnise",
@@ -21980,6 +22119,7 @@
         "names": [ "Chin, Eastern Khumi Kanise dialect", "Khami" ],
         "region": "MM",
         "regionname": "Myanmar",
+        "rod": "23798",
         "script": "Latn",
         "sldr": false,
         "tag": "cek-x-kanise",
@@ -21994,6 +22134,7 @@
         "names": [ "Chin, Eastern Khumi Khawng Tuu dialect", "Khami" ],
         "region": "MM",
         "regionname": "Myanmar",
+        "rod": "23799",
         "script": "Latn",
         "sldr": false,
         "tag": "cek-x-khawngtu",
@@ -22008,6 +22149,7 @@
         "names": [ "Chfin, Eastern Khumi Khong Tu dialect", "Khami" ],
         "region": "MM",
         "regionname": "Myanmar",
+        "rod": "24601",
         "script": "Latn",
         "sldr": false,
         "tag": "cek-x-khongtu",
@@ -22022,6 +22164,7 @@
         "names": [ "Chin, Eastern Khumi Lemi dialect", "Khami" ],
         "region": "MM",
         "regionname": "Myanmar",
+        "rod": "05182",
         "script": "Latn",
         "sldr": false,
         "tag": "cek-x-lemi",
@@ -22036,6 +22179,7 @@
         "names": [ "Chin, Eastern Khumi Likhy dialect", "Khami" ],
         "region": "MM",
         "regionname": "Myanmar",
+        "rod": "22888",
         "script": "Latn",
         "sldr": false,
         "tag": "cek-x-likhy",
@@ -22050,6 +22194,7 @@
         "names": [ "Chin, Eastern Khumi Rengcaa dialect", "Khami" ],
         "region": "MM",
         "regionname": "Myanmar",
+        "rod": "23796",
         "script": "Latn",
         "sldr": false,
         "tag": "cek-x-rengcaa",
@@ -22521,13 +22666,14 @@
         "full": "cho-Latn-US",
         "iana": [ "Choctaw" ],
         "iso639_3": "cho",
+        "localname": "Chahta",
         "localnames": [ "Chahta", "Chahta Anumpa" ],
         "name": "Choctaw",
         "names": [ "Chahta", "Chahta Anumpa" ],
         "region": "US",
         "regionname": "United States",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "cho",
         "tags": [ "cho-Latn", "cho-US" ],
         "windows": "cho-Latn"
@@ -22749,12 +22895,13 @@
         "full": "cic-Latn-US",
         "iana": [ "Chickasaw" ],
         "iso639_3": "cic",
+        "localname": "Chikashshanompaʼ",
         "name": "Chickasaw",
         "names": [ "Chikashshanompa’" ],
         "region": "US",
         "regionname": "United States",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "cic",
         "tags": [ "cic-Latn", "cic-US" ],
         "unwritten": true,
@@ -23220,6 +23367,7 @@
         "iana": [ "Central Kurdish" ],
         "iso639_3": "ckb",
         "latnnames": [ "zimanê soranî" ],
+        "localname": "کوردیی ناوەندی",
         "localnames": [ "زمانی سۆرانی" ],
         "macrolang": "ku",
         "name": "Kurdish, Central",
@@ -24156,13 +24304,14 @@
         "full": "cnq-Latn-CM",
         "iana": [ "Chung" ],
         "iso639_3": "cnq",
+        "localname": "Chuŋ",
         "localnames": [ "Chuŋ" ],
         "name": "Chung",
         "names": [ "Chungmboko", "Chuŋ", "Cung" ],
         "region": "CM",
         "regionname": "Cameroon",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "cnq",
         "tags": [ "cnq-CM", "cnq-Latn", "cug", "cug-CM", "cug-Latn", "cug-Latn-CM" ],
         "windows": "cnq-Latn"
@@ -24277,6 +24426,7 @@
         "full": "co-Latn-FR",
         "iana": [ "Corsican" ],
         "iso639_3": "cos",
+        "localname": "corsu",
         "localnames": [ "Corsu" ],
         "name": "Corsican",
         "names": [ "Corse", "Corsi", "Corso", "Corsu", "Còrso" ],
@@ -24284,7 +24434,7 @@
         "regionname": "France",
         "regions": [ "CA", "CU", "IT", "PR", "US", "UY", "VE" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "co",
         "tags": [ "co-FR", "co-Latn" ],
         "windows": "co-Latn"
@@ -25803,6 +25953,7 @@
         "iana": [ "Swampy Cree" ],
         "iso639_3": "csw",
         "latnnames": [ "nêhinawêwin" ],
+        "localname": "ᓀᐦᐃᓇᐍᐏᐣ",
         "localnames": [ "ᓀᐦᐃᓇᐍᐏᐣ" ],
         "macrolang": "cr",
         "name": "Cree, Swampy",
@@ -25810,7 +25961,7 @@
         "region": "CA",
         "regionname": "Canada",
         "script": "Cans",
-        "sldr": false,
+        "sldr": true,
         "tag": "csw",
         "tags": [ "csw-CA", "csw-Cans" ],
         "windows": "csw-Cans"
@@ -26041,6 +26192,7 @@
         "full": "cto-Latn-CO",
         "iana": [ "Emberá-Catío" ],
         "iso639_3": "cto",
+        "localname": "Ẽ́bẽra Katío",
         "localnames": [ "Ẽ́bẽra Katío" ],
         "name": "Embera Catío",
         "names": [ "Catio", "Catío", "Catío Emberá", "Embena", "Embera", "Embera Bedea Katío", "Emberá-Catío", "Emberá-Katío", "Epena", "Epera", "Epẽrã", "Eyabida", "Katio", "Ẽ́bẽra Katío", "ẽbẽrã bed’ea–Katío" ],
@@ -26048,7 +26200,7 @@
         "regionname": "Colombia",
         "regions": [ "PA" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "cto",
         "tags": [ "cto-CO", "cto-Latn" ],
         "windows": "cto-Latn"
@@ -26119,6 +26271,7 @@
         "full": "ctu-Latn-MX-x-tila",
         "iana": [ "Chol - Tila" ],
         "iso639_3": "ctu",
+        "localname": "Lakty’añ",
         "localnames": [ "Ch'ol", "Lakty’añ" ],
         "name": "Chol",
         "names": [ "Chol - Tila", "Ch’ol", "Lak ty’añ", "Lak t’an", "Lakty’añ", "Lakty’añ Ch’ol" ],
@@ -26135,6 +26288,7 @@
         "full": "ctu-Latn-MX-x-tumbala",
         "iana": [ "Chol - Tumala" ],
         "iso639_3": "ctu",
+        "localname": "Lakty’añ",
         "localnames": [ "Ch'ol", "Lakty’añ" ],
         "name": "Chol",
         "names": [ "Chol - Tumala", "Ch’ol", "Lak ty’añ", "Lak t’an", "Lakty’añ", "Lakty’añ Ch’ol" ],
@@ -26580,13 +26734,14 @@
         "full": "cwa-Latn-TZ",
         "iana": [ "Kabwa" ],
         "iso639_3": "cwa",
+        "localname": "Ekikabhwa",
         "localnames": [ "Ekikabhwa" ],
         "name": "Kabwa",
         "names": [ "Ekikabhwa", "Ekikabwa", "Kikabhwa", "Kikabwa" ],
         "region": "TZ",
         "regionname": "United Republic of Tanzania",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "cwa",
         "tags": [ "cwa-Latn", "cwa-TZ" ],
         "windows": "cwa-Latn"
@@ -27824,6 +27979,7 @@
         "full": "de-Latn-AT",
         "iana": [ "German" ],
         "iso639_3": "deu",
+        "localname": "Deutsch",
         "localnames": [ "Deutsch" ],
         "name": "German",
         "region": "AT",
@@ -27853,6 +28009,7 @@
         "full": "de-Latn-CH",
         "iana": [ "German" ],
         "iso639_3": "deu",
+        "localname": "Deutsch",
         "localnames": [ "Deutsch" ],
         "name": "German",
         "region": "CH",
@@ -27882,6 +28039,7 @@
         "full": "de-Latn-IT",
         "iana": [ "German" ],
         "iso639_3": "deu",
+        "localname": "Deutsch",
         "localnames": [ "Deutsch" ],
         "name": "German",
         "region": "IT",
@@ -27896,6 +28054,7 @@
         "full": "de-Latn-LI",
         "iana": [ "German" ],
         "iso639_3": "deu",
+        "localname": "Deutsch",
         "localnames": [ "Deutsch" ],
         "name": "German",
         "region": "LI",
@@ -27910,6 +28069,7 @@
         "full": "de-Latn-LU",
         "iana": [ "German" ],
         "iso639_3": "deu",
+        "localname": "Deutsch",
         "localnames": [ "Deutsch" ],
         "name": "German",
         "region": "LU",
@@ -28459,7 +28619,7 @@
     },
     {
         "full": "dgr-Latn-CA",
-        "iana": [ "Dogrib", "Tłı̨chǫ" ],
+        "iana": [ "Tlicho", "Dogrib", "Tłı̨chǫ" ],
         "iso639_3": "dgr",
         "localname": "Tłı̨chǫ Yatıì",
         "localnames": [ "Tłı̨chǫ Yatıì" ],
@@ -28583,6 +28743,7 @@
         "full": "dhg-Latn-AU-x-wangurri",
         "iana": [ "Dhangu-Djangu" ],
         "iso639_3": "dhg",
+        "localname": "Dhangu-Djangu",
         "localnames": [ "Dhangu-Djangu" ],
         "name": "Dhangu-Djangu",
         "names": [ "Budalpudal", "Burada", "Buralbural", "Buratha", "Dangu", "Dhaangu", "Dhangu", "Dhangu’mi", "Djangu", "War-ramirri", "Warameri", "Waramiri", "Warramiri", "Warumeri", "Yolngu-Matha", "Yuulngu" ],
@@ -28599,6 +28760,7 @@
         "iana": [ "Dhimal" ],
         "iso639_3": "dhi",
         "latnnames": [ "Dhimal" ],
+        "localname": "धिमाल",
         "localnames": [ "धिमाल" ],
         "name": "Dhimal",
         "names": [ "Dhemal" ],
@@ -28606,7 +28768,7 @@
         "regionname": "Nepal",
         "regions": [ "IN" ],
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "dhi",
         "tags": [ "dhi-Deva", "dhi-NP" ],
         "windows": "dhi-Deva"
@@ -29912,7 +30074,6 @@
         "full": "dnj-Latn-LR",
         "iana": [ "Dan" ],
         "iso639_3": "dnj",
-        "localname": "Dã̀ã̀",
         "localnames": [ "Dã̀ã̀" ],
         "name": "Dan",
         "names": [ "Da", "Dàn", "Dã̀ã̀", "Gio", "Gio-Dan", "Guio", "Gyo", "Ya", "Yacouba", "Yakuba" ],
@@ -29920,7 +30081,7 @@
         "regionname": "Liberia",
         "regions": [ "GN" ],
         "script": "Latn",
-        "sldr": true,
+        "sldr": false,
         "tag": "dnj-LR",
         "windows": "dnj-Latn-LR"
     },
@@ -29944,6 +30105,7 @@
         "full": "dnj-Latn-CI-x-western",
         "iana": [ "Dan" ],
         "iso639_3": "dnj",
+        "localname": "Dã̀ã̀",
         "localnames": [ "Dã̀ã̀" ],
         "name": "Dan",
         "names": [ "Da", "Dàn", "Dã̀ã̀", "Gio", "Gio-Dan", "Ya", "Yacouba", "Yakuba" ],
@@ -29951,7 +30113,7 @@
         "regionname": "Côte d'Ivoire",
         "rod": "6310",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "dnj-x-western",
         "tags": [ "dnj-CI-x-western", "dnj-Latn-x-western" ],
         "windows": "dnj-Latn-x-western"
@@ -30938,13 +31100,14 @@
         "full": "dtb-Latn-MY",
         "iana": [ "Labuk-Kinabatangan Kadazan" ],
         "iso639_3": "dtb",
+        "localname": "Tinangaran Kadajan",
         "localnames": [ "Tinangaran Kadajan" ],
         "name": "Kadazan, Labuk-Kinabatangan",
         "names": [ "Eastern Kadazan", "Labuk Kadazan", "Labuk-Kinabatangan Kadazan", "Sogilitan", "Sungai", "Sungai Kinabatangan", "Tinangaran Kadajan", "Tindakon", "Tompulung" ],
         "region": "MY",
         "regionname": "Malaysia",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "dtb",
         "tags": [ "dtb-Latn", "dtb-MY" ],
         "windows": "dtb-Latn"
@@ -32198,7 +32361,7 @@
         "iana": [ "Ewe" ],
         "iso639_3": "ewe",
         "latnnames": [ "Èwegbe" ],
-        "localname": "Eʋegbe",
+        "localname": "eʋegbe",
         "localnames": [ "Èʋegbe" ],
         "name": "Éwé",
         "names": [ "Ebwe", "Efe", "Ehwe", "Eibe", "Eue", "Eve", "Ewe", "Gbe", "Krepe", "Krepi", "Popo", "Vhe" ],
@@ -32231,6 +32394,7 @@
         "iana": [ "Ewe" ],
         "iso639_3": "ewe",
         "latnnames": [ "Èwegbe" ],
+        "localname": "eʋegbe",
         "localnames": [ "Èʋegbe" ],
         "name": "Ewe",
         "region": "TG",
@@ -32408,13 +32572,14 @@
         "full": "eip-Latn-ID",
         "iana": [ "Eipomek" ],
         "iso639_3": "eip",
+        "localname": "Lik",
         "localnames": [ "Lik" ],
         "name": "Lik",
         "names": [ "Eipo", "Eipomek", "T-Valley" ],
         "region": "ID",
         "regionname": "Indonesia",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "eip",
         "tags": [ "eip-ID", "eip-Latn" ],
         "windows": "eip-Latn"
@@ -32621,7 +32786,6 @@
         "sldr": false,
         "tag": "ekp",
         "tags": [ "ekp-Latn", "ekp-NG" ],
-        "unwritten": true,
         "windows": "ekp-Latn"
     },
     {
@@ -33076,13 +33240,13 @@
         "full": "en-Latn-US",
         "iana": [ "English" ],
         "iso639_3": "eng",
-        "localname": "American English",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "names": [ "Anglais", "Angleščina", "Anglisy", "Angličtina", "Anglų", "Angol", "Angļu", "Engels", "Engelsk", "Engelska", "Engelski", "Englaisa", "Englanti", "Englesch", "Engleză", "Englisch", "Ingilizce", "Inglese", "Ingliż", "Inglés", "Inglês", "Język angielski", "Kiingereza", "anglais", "inglés" ],
         "region": "US",
         "regionname": "United States",
-        "regions": [ "AD", "AF", "AR", "AS", "AW", "BD", "BG", "BH", "BL", "BN", "BQ", "BR", "BT", "BY", "CL", "CN", "CO", "CR", "CW", "CY", "CZ", "DO", "DZ", "EC", "EE", "EG", "ES", "ET", "FM", "FR", "GQ", "GR", "GW", "HN", "HR", "HU", "ID", "IQ", "IS", "IT", "JO", "JP", "KH", "KR", "KW", "KZ", "LB", "LK", "LT", "LU", "LV", "LY", "MA", "MC", "ME", "MF", "MM", "MX", "NO", "NP", "OM", "PA", "PL", "PM", "PR", "PT", "RO", "RS", "RU", "SA", "SK", "SO", "SR", "ST", "SV", "TC", "TH", "TN", "TW", "UA", "UM", "UY", "VE", "VG", "VI", "YE" ],
+        "regions": [ "AD", "AF", "AR", "AS", "AW", "BD", "BG", "BH", "BL", "BN", "BQ", "BR", "BT", "BY", "CL", "CN", "CO", "CR", "CW", "CY", "CZ", "DO", "DZ", "EC", "EE", "EG", "ES", "ET", "FM", "FR", "GQ", "GR", "GW", "HN", "HR", "HU", "IQ", "IS", "IT", "JO", "JP", "KH", "KR", "KW", "KZ", "LB", "LK", "LT", "LU", "LV", "LY", "MA", "MC", "ME", "MF", "MM", "MX", "NO", "NP", "OM", "PA", "PL", "PM", "PR", "PT", "RO", "RS", "RU", "SA", "SK", "SO", "SR", "ST", "SV", "TC", "TH", "TN", "TW", "UA", "UM", "UY", "VE", "VG", "VI", "YE" ],
         "script": "Latn",
         "sldr": true,
         "suppress": true,
@@ -33095,6 +33259,7 @@
         "full": "en-Latn-001",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "001",
@@ -33109,6 +33274,7 @@
         "full": "en-Latn-150",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "150",
@@ -33123,6 +33289,7 @@
         "full": "en-Latn-AE",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "AE",
@@ -33137,6 +33304,7 @@
         "full": "en-Latn-AG",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "AG",
@@ -33151,6 +33319,7 @@
         "full": "en-Latn-AI",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "AI",
@@ -33165,6 +33334,7 @@
         "full": "en-Latn-AT",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "AT",
@@ -33179,7 +33349,7 @@
         "full": "en-Latn-AU",
         "iana": [ "English" ],
         "iso639_3": "eng",
-        "localname": "Australian English",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "AU",
@@ -33194,6 +33364,7 @@
         "full": "en-Latn-BB",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "BB",
@@ -33208,6 +33379,7 @@
         "full": "en-Latn-BE",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "BE",
@@ -33222,6 +33394,7 @@
         "full": "en-Latn-BI",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "BI",
@@ -33236,6 +33409,7 @@
         "full": "en-Latn-BM",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "BM",
@@ -33250,6 +33424,7 @@
         "full": "en-Latn-BS",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "BS",
@@ -33264,6 +33439,7 @@
         "full": "en-Latn-BW",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "BW",
@@ -33278,6 +33454,7 @@
         "full": "en-Latn-BZ",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "BZ",
@@ -33307,6 +33484,7 @@
         "full": "en-Latn-CA",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "names": [ "Anglais" ],
@@ -33322,6 +33500,7 @@
         "full": "en-Latn-CC",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "CC",
@@ -33336,6 +33515,7 @@
         "full": "en-Latn-CH",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "CH",
@@ -33350,6 +33530,7 @@
         "full": "en-Latn-CK",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "CK",
@@ -33364,6 +33545,7 @@
         "full": "en-Latn-CM",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "CM",
@@ -33378,6 +33560,7 @@
         "full": "en-Latn-CX",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "CX",
@@ -33392,6 +33575,7 @@
         "full": "en-Latn-DE",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "DE",
@@ -33406,6 +33590,7 @@
         "full": "en-Latn-DG",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "DG",
@@ -33420,6 +33605,7 @@
         "full": "en-Latn-DK",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "DK",
@@ -33434,6 +33620,7 @@
         "full": "en-Latn-DM",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "DM",
@@ -33448,6 +33635,7 @@
         "full": "en-Dsrt-US",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "𐐀𐑍𐑊𐐮𐑇",
         "name": "English",
         "names": [ "Anglais", "Angleščina", "Anglisy", "Angličtina", "Anglų", "Angol", "Angļu", "Engels", "Engelsk", "Engelska", "Engelski", "Englaisa", "Englanti", "Englesch", "Engleză", "Englisch", "Ingilizce", "Inglese", "Ingliż", "Inglés", "Inglês", "Język angielski", "Kiingereza", "anglais", "inglés" ],
         "nophonvars": true,
@@ -33455,7 +33643,7 @@
         "regionname": "United States",
         "regions": [ "AC", "AD", "AE", "AF", "AG", "AI", "AR", "AS", "AT", "AU", "AW", "BA", "BB", "BD", "BE", "BG", "BH", "BI", "BL", "BM", "BN", "BQ", "BR", "BS", "BT", "BW", "BY", "BZ", "CA", "CC", "CH", "CK", "CL", "CM", "CN", "CO", "CR", "CW", "CX", "CY", "CZ", "DE", "DG", "DK", "DM", "DO", "DZ", "EC", "EE", "EG", "ER", "ES", "ET", "FI", "FJ", "FK", "FM", "FR", "GB", "GD", "GG", "GH", "GI", "GM", "GQ", "GR", "GU", "GW", "GY", "HK", "HN", "HR", "HU", "ID", "IE", "IL", "IM", "IN", "IO", "IQ", "IS", "IT", "JE", "JM", "JO", "JP", "KE", "KH", "KI", "KN", "KR", "KW", "KY", "KZ", "LB", "LC", "LK", "LR", "LS", "LT", "LU", "LV", "LY", "MA", "MC", "ME", "MF", "MG", "MH", "MM", "MO", "MP", "MS", "MT", "MU", "MV", "MW", "MX", "MY", "NA", "NF", "NG", "NL", "NO", "NP", "NR", "NU", "NZ", "OM", "PA", "PG", "PH", "PK", "PL", "PM", "PN", "PR", "PT", "PW", "RO", "RS", "RU", "RW", "SA", "SB", "SC", "SD", "SE", "SG", "SH", "SI", "SK", "SL", "SO", "SR", "SS", "ST", "SV", "SX", "SZ", "TA", "TC", "TH", "TK", "TN", "TO", "TR", "TT", "TV", "TW", "TZ", "UA", "UG", "UM", "UY", "VC", "VE", "VG", "VI", "VU", "WS", "YE", "ZA", "ZM", "ZW" ],
         "script": "Dsrt",
-        "sldr": false,
+        "sldr": true,
         "tag": "en-Dsrt",
         "windows": "en-Dsrt"
     },
@@ -33476,6 +33664,7 @@
         "full": "en-Latn-ER",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "ER",
@@ -33490,6 +33679,7 @@
         "full": "en-Latn-FI",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "FI",
@@ -33504,6 +33694,7 @@
         "full": "en-Latn-FJ",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "FJ",
@@ -33518,6 +33709,7 @@
         "full": "en-Latn-FK",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "FK",
@@ -33532,7 +33724,7 @@
         "full": "en-Latn-GB",
         "iana": [ "English" ],
         "iso639_3": "eng",
-        "localname": "British English",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "GB",
@@ -33547,6 +33739,7 @@
         "full": "en-Latn-GD",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "GD",
@@ -33561,6 +33754,7 @@
         "full": "en-Latn-GG",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "GG",
@@ -33575,6 +33769,7 @@
         "full": "en-Latn-GH",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "GH",
@@ -33589,6 +33784,7 @@
         "full": "en-Latn-GI",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "GI",
@@ -33603,6 +33799,7 @@
         "full": "en-Latn-GM",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "GM",
@@ -33617,6 +33814,7 @@
         "full": "en-Latn-GU",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "GU",
@@ -33631,6 +33829,7 @@
         "full": "en-Latn-GY",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "GY",
@@ -33645,6 +33844,7 @@
         "full": "en-Latn-HK",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "HK",
@@ -33655,10 +33855,26 @@
         "variants": [ "basiceng", "boont", "cornu", "emodeng", "oxendict", "scotland", "scouse", "spanglis", "unifon" ],
         "windows": "en-Latn-HK"
     },
+    {
+        "full": "en-Latn-ID",
+        "iana": [ "English" ],
+        "iso639_3": "eng",
+        "localname": "English",
+        "localnames": [ "English" ],
+        "name": "English",
+        "region": "ID",
+        "regionname": "Indonesia",
+        "script": "Latn",
+        "sldr": true,
+        "tag": "en-ID",
+        "variants": [ "basiceng", "boont", "cornu", "emodeng", "oxendict", "scotland", "scouse", "spanglis", "unifon" ],
+        "windows": "en-Latn-ID"
+    },
     {
         "full": "en-Latn-IE",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "IE",
@@ -33673,6 +33889,7 @@
         "full": "en-Latn-IL",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "IL",
@@ -33687,6 +33904,7 @@
         "full": "en-Latn-IM",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "IM",
@@ -33701,6 +33919,7 @@
         "full": "en-Latn-IN",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "IN",
@@ -33715,6 +33934,7 @@
         "full": "en-Latn-IO",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "IO",
@@ -33729,6 +33949,7 @@
         "full": "en-Latn-JE",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "JE",
@@ -33743,6 +33964,7 @@
         "full": "en-Latn-JM",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "JM",
@@ -33757,6 +33979,7 @@
         "full": "en-Latn-KE",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "KE",
@@ -33771,6 +33994,7 @@
         "full": "en-Latn-KI",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "KI",
@@ -33785,6 +34009,7 @@
         "full": "en-Latn-KN",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "KN",
@@ -33799,6 +34024,7 @@
         "full": "en-Latn-KY",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "KY",
@@ -33813,6 +34039,7 @@
         "full": "en-Latn-LC",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "LC",
@@ -33827,6 +34054,7 @@
         "full": "en-Latn-LR",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "LR",
@@ -33841,6 +34069,7 @@
         "full": "en-Latn-LS",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "LS",
@@ -33855,6 +34084,7 @@
         "full": "en-Latn-MG",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "MG",
@@ -33869,6 +34099,7 @@
         "full": "en-Latn-MH",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "MH",
@@ -33883,6 +34114,7 @@
         "full": "en-Latn-MO",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "MO",
@@ -33897,6 +34129,7 @@
         "full": "en-Latn-MP",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "MP",
@@ -33911,6 +34144,7 @@
         "full": "en-Latn-MS",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "MS",
@@ -33925,6 +34159,7 @@
         "full": "en-Latn-MT",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "MT",
@@ -33939,6 +34174,7 @@
         "full": "en-Latn-MU",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "MU",
@@ -33953,6 +34189,7 @@
         "full": "en-Latn-MV",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "MV",
@@ -33967,6 +34204,7 @@
         "full": "en-Latn-MW",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "MW",
@@ -33981,6 +34219,7 @@
         "full": "en-Latn-MY",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "MY",
@@ -33995,6 +34234,7 @@
         "full": "en-Latn-NA",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "NA",
@@ -34009,6 +34249,7 @@
         "full": "en-Latn-NF",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "NF",
@@ -34023,6 +34264,7 @@
         "full": "en-Latn-NG",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "NG",
@@ -34037,6 +34279,7 @@
         "full": "en-Latn-NL",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "NL",
@@ -34051,6 +34294,7 @@
         "full": "en-Latn-NR",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "NR",
@@ -34065,6 +34309,7 @@
         "full": "en-Latn-NU",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "NU",
@@ -34079,6 +34324,7 @@
         "full": "en-Latn-NZ",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "NZ",
@@ -34093,6 +34339,7 @@
         "full": "en-Latn-PG",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "PG",
@@ -34107,6 +34354,7 @@
         "full": "en-Latn-PH",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "PH",
@@ -34121,6 +34369,7 @@
         "full": "en-Latn-PK",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "PK",
@@ -34135,6 +34384,7 @@
         "full": "en-Latn-PN",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "PN",
@@ -34149,6 +34399,7 @@
         "full": "en-Latn-PW",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "PW",
@@ -34163,6 +34414,7 @@
         "full": "en-Latn-RW",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "RW",
@@ -34190,6 +34442,7 @@
         "full": "en-Latn-SB",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "SB",
@@ -34204,6 +34457,7 @@
         "full": "en-Latn-SC",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "SC",
@@ -34218,6 +34472,7 @@
         "full": "en-Latn-SD",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "SD",
@@ -34232,6 +34487,7 @@
         "full": "en-Latn-SE",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "SE",
@@ -34246,6 +34502,7 @@
         "full": "en-Latn-SG",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "SG",
@@ -34260,6 +34517,7 @@
         "full": "en-Latn-SH",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "SH",
@@ -34274,6 +34532,7 @@
         "full": "en-Latn-SI",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "SI",
@@ -34288,6 +34547,7 @@
         "full": "en-Latn-SL",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "SL",
@@ -34302,6 +34562,7 @@
         "full": "en-Latn-SS",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "SS",
@@ -34316,6 +34577,7 @@
         "full": "en-Latn-SX",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "SX",
@@ -34330,6 +34592,7 @@
         "full": "en-Latn-SZ",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "SZ",
@@ -34352,7 +34615,7 @@
         "regionname": "United Kingdom",
         "regions": [ "AC", "AD", "AE", "AF", "AG", "AI", "AR", "AS", "AT", "AU", "AW", "BA", "BB", "BD", "BE", "BG", "BH", "BI", "BL", "BM", "BN", "BQ", "BR", "BS", "BT", "BW", "BY", "BZ", "CA", "CC", "CH", "CK", "CL", "CM", "CN", "CO", "CR", "CW", "CX", "CY", "CZ", "DE", "DG", "DK", "DM", "DO", "DZ", "EC", "EE", "EG", "ER", "ES", "ET", "FI", "FJ", "FK", "FM", "FR", "GD", "GG", "GH", "GI", "GM", "GQ", "GR", "GU", "GW", "GY", "HK", "HN", "HR", "HU", "ID", "IE", "IL", "IM", "IN", "IO", "IQ", "IS", "IT", "JE", "JM", "JO", "JP", "KE", "KH", "KI", "KN", "KR", "KW", "KY", "KZ", "LB", "LC", "LK", "LR", "LS", "LT", "LU", "LV", "LY", "MA", "MC", "ME", "MF", "MG", "MH", "MM", "MO", "MP", "MS", "MT", "MU", "MV", "MW", "MX", "MY", "NA", "NF", "NG", "NL", "NO", "NP", "NR", "NU", "NZ", "OM", "PA", "PG", "PH", "PK", "PL", "PM", "PN", "PR", "PT", "PW", "RO", "RS", "RU", "RW", "SA", "SB", "SC", "SD", "SE", "SG", "SH", "SI", "SK", "SL", "SO", "SR", "SS", "ST", "SV", "SX", "SZ", "TA", "TC", "TH", "TK", "TN", "TO", "TR", "TT", "TV", "TW", "TZ", "UA", "UG", "UM", "US", "UY", "VC", "VE", "VG", "VI", "VU", "WS", "YE", "ZA", "ZM", "ZW" ],
         "script": "Shaw",
-        "sldr": false,
+        "sldr": true,
         "tag": "en-Shaw",
         "windows": "en-Shaw"
     },
@@ -34360,6 +34623,7 @@
         "full": "en-Latn-TK",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "TK",
@@ -34374,6 +34638,7 @@
         "full": "en-Latn-TO",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "TO",
@@ -34388,6 +34653,7 @@
         "full": "en-Latn-TT",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "TT",
@@ -34402,6 +34668,7 @@
         "full": "en-Latn-TV",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "TV",
@@ -34416,6 +34683,7 @@
         "full": "en-Latn-TZ",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "TZ",
@@ -34430,6 +34698,7 @@
         "full": "en-Latn-UG",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "UG",
@@ -34444,6 +34713,7 @@
         "full": "en-Latn-VC",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "VC",
@@ -34458,6 +34728,7 @@
         "full": "en-Latn-VU",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "VU",
@@ -34472,6 +34743,7 @@
         "full": "en-Latn-WS",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "WS",
@@ -34486,6 +34758,7 @@
         "full": "en-Latn-ZA",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "ZA",
@@ -34500,6 +34773,7 @@
         "full": "en-Latn-ZM",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "ZM",
@@ -34514,6 +34788,7 @@
         "full": "en-Latn-ZW",
         "iana": [ "English" ],
         "iso639_3": "eng",
+        "localname": "English",
         "localnames": [ "English" ],
         "name": "English",
         "region": "ZW",
@@ -34782,7 +35057,7 @@
         "full": "eo-Latn-001",
         "iana": [ "Esperanto" ],
         "iso639_3": "epo",
-        "localname": "esperanto",
+        "localname": "Esperanto",
         "localnames": [ "Esperanto", "Lingvo Internacia" ],
         "name": "Esperanto",
         "names": [ "Lingvo Internacia" ],
@@ -35011,7 +35286,7 @@
         "full": "es-Latn-ES",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
-        "localname": "español de España",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castellano", "Castilian", "Castillan", "Espagnol", "Español", "castellano", "español" ],
@@ -35030,7 +35305,7 @@
         "full": "es-Latn-419",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
-        "localname": "español latinoamericano",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35046,6 +35321,7 @@
         "full": "es-Latn-AR",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35061,6 +35337,7 @@
         "full": "es-Latn-BO",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35076,6 +35353,7 @@
         "full": "es-Latn-BR",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35091,6 +35369,7 @@
         "full": "es-Latn-BZ",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35121,6 +35400,7 @@
         "full": "es-Latn-CL",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35136,6 +35416,7 @@
         "full": "es-Latn-CO",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35151,6 +35432,7 @@
         "full": "es-Latn-CR",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35166,6 +35448,7 @@
         "full": "es-Latn-CU",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35181,6 +35464,7 @@
         "full": "es-Latn-DO",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35211,6 +35495,7 @@
         "full": "es-Latn-EC",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35226,6 +35511,7 @@
         "full": "es-Latn-GQ",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35241,6 +35527,7 @@
         "full": "es-Latn-GT",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35256,6 +35543,7 @@
         "full": "es-Latn-HN",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35271,6 +35559,7 @@
         "full": "es-Latn-MX",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35286,6 +35575,7 @@
         "full": "es-Latn-NI",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35301,6 +35591,7 @@
         "full": "es-Latn-PA",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35316,6 +35607,7 @@
         "full": "es-Latn-PE",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35331,6 +35623,7 @@
         "full": "es-Latn-PH",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35346,6 +35639,7 @@
         "full": "es-Latn-PR",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35361,6 +35655,7 @@
         "full": "es-Latn-PY",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35376,6 +35671,7 @@
         "full": "es-Latn-SV",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35391,6 +35687,7 @@
         "full": "es-Latn-US",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35406,6 +35703,7 @@
         "full": "es-Latn-UY",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35421,6 +35719,7 @@
         "full": "es-Latn-VE",
         "iana": [ "Spanish", "Castilian" ],
         "iso639_3": "spa",
+        "localname": "español",
         "localnames": [ "castellano", "español" ],
         "name": "Spanish",
         "names": [ "Castilian" ],
@@ -35459,7 +35758,7 @@
         "region": "IN",
         "regionname": "India",
         "script": "Gonm",
-        "sldr": true,
+        "sldr": false,
         "tag": "esg",
         "tags": [ "esg-Gonm", "esg-IN" ],
         "windows": "esg-Gonm"
@@ -35477,7 +35776,7 @@
         "region": "IN",
         "regionname": "India",
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "esg-Deva",
         "windows": "esg-Deva"
     },
@@ -35626,7 +35925,7 @@
         "regionname": "United States",
         "regions": [ "RU" ],
         "script": "Cyrl",
-        "sldr": false,
+        "sldr": true,
         "tag": "ess-Cyrl",
         "windows": "ess-Cyrl"
     },
@@ -36138,6 +36437,7 @@
         "full": "fa-Arab-AF",
         "iana": [ "Persian" ],
         "iso639_3": "fas",
+        "localname": "فارسی",
         "name": "Persian",
         "region": "AF",
         "regionname": "Afghanistan",
@@ -36182,7 +36482,7 @@
         "full": "fab-Latn-GQ",
         "iana": [ "Fa d'Ambu" ],
         "iso639_3": "fab",
-        "localname": "Fa d'Ambu",
+        "localname": "Fa d'Ambö",
         "localnames": [ "Fa d'Ambu" ],
         "name": "Fa d’Ambu",
         "names": [ "Annobonense", "Annobonese", "Fa d'Ambu", "Fa d’Ambô", "annobonés" ],
@@ -36514,6 +36814,7 @@
         "full": "ff-Adlm-BF",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "𞤆𞤵𞤤𞤢𞤪",
         "name": "Fulah",
         "region": "BF",
         "regionname": "Burkina Faso",
@@ -36526,6 +36827,7 @@
         "full": "ff-Adlm-CM",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "𞤆𞤵𞤤𞤢𞤪",
         "name": "Fulah",
         "region": "CM",
         "regionname": "Cameroon",
@@ -36538,6 +36840,7 @@
         "full": "ff-Adlm-GH",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "𞤆𞤵𞤤𞤢𞤪",
         "name": "Fulah",
         "region": "GH",
         "regionname": "Ghana",
@@ -36550,6 +36853,7 @@
         "full": "ff-Adlm-GM",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "𞤆𞤵𞤤𞤢𞤪",
         "name": "Fulah",
         "region": "GM",
         "regionname": "Gambia",
@@ -36562,6 +36866,7 @@
         "full": "ff-Adlm-GW",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "𞤆𞤵𞤤𞤢𞤪",
         "name": "Fulah",
         "region": "GW",
         "regionname": "Guinea-Bissau",
@@ -36574,6 +36879,7 @@
         "full": "ff-Adlm-LR",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "𞤆𞤵𞤤𞤢𞤪",
         "name": "Fulah",
         "region": "LR",
         "regionname": "Liberia",
@@ -36586,6 +36892,7 @@
         "full": "ff-Adlm-MR",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "Pulaar",
         "name": "Fulah",
         "region": "MR",
         "regionname": "Mauritania",
@@ -36598,6 +36905,7 @@
         "full": "ff-Adlm-NE",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "𞤆𞤵𞤤𞤢𞤪",
         "name": "Fulah",
         "region": "NE",
         "regionname": "Niger",
@@ -36610,6 +36918,7 @@
         "full": "ff-Adlm-NG",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "𞤆𞤵𞤤𞤢𞤪",
         "name": "Fulah",
         "region": "NG",
         "regionname": "Nigeria",
@@ -36622,6 +36931,7 @@
         "full": "ff-Adlm-SL",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "𞤆𞤵𞤤𞤢𞤪",
         "name": "Fulah",
         "region": "SL",
         "regionname": "Sierra Leone",
@@ -36634,6 +36944,7 @@
         "full": "ff-Adlm-SN",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "𞤆𞤵𞤤𞤢𞤪",
         "name": "Fulah",
         "region": "SN",
         "regionname": "Senegal",
@@ -36663,6 +36974,7 @@
         "full": "ff-Latn-GH",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "Pulaar",
         "name": "Fulah",
         "region": "GH",
         "regionname": "Ghana",
@@ -36675,6 +36987,7 @@
         "full": "ff-Latn-GM",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "Pulaar",
         "name": "Fulah",
         "region": "GM",
         "regionname": "Gambia",
@@ -36687,6 +37000,7 @@
         "full": "ff-Latn-GN",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "Pulaar",
         "name": "Fulah",
         "region": "GN",
         "regionname": "Guinea",
@@ -36699,6 +37013,7 @@
         "full": "ff-Latn-LR",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "Pulaar",
         "name": "Fulah",
         "region": "LR",
         "regionname": "Liberia",
@@ -36711,6 +37026,7 @@
         "full": "ff-Latn-MR",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "Pulaar",
         "name": "Fulah",
         "region": "MR",
         "regionname": "Mauritania",
@@ -36723,6 +37039,7 @@
         "full": "ff-Latn-NG",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "Pulaar",
         "name": "Fulah",
         "region": "NG",
         "regionname": "Nigeria",
@@ -36735,6 +37052,7 @@
         "full": "ff-Latn-SL",
         "iana": [ "Fulah" ],
         "iso639_3": "ful",
+        "localname": "Pulaar",
         "name": "Fulah",
         "region": "SL",
         "regionname": "Sierra Leone",
@@ -37201,7 +37519,7 @@
         "region": "IN",
         "regionname": "India",
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "fmu",
         "tags": [ "fmu-Deva", "fmu-IN" ],
         "windows": "fmu-Deva"
@@ -37289,6 +37607,7 @@
         "full": "fo-Latn-DK",
         "iana": [ "Faroese" ],
         "iso639_3": "fao",
+        "localname": "føroyskt",
         "localnames": [ "Føroyskt" ],
         "name": "Faroese",
         "region": "DK",
@@ -37457,6 +37776,7 @@
         "full": "fr-Latn-BE",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "BE",
@@ -37471,6 +37791,7 @@
         "full": "fr-Latn-BI",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "BI",
@@ -37500,7 +37821,7 @@
         "full": "fr-Latn-CA",
         "iana": [ "French" ],
         "iso639_3": "fra",
-        "localname": "français canadien",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "CA",
@@ -37515,6 +37836,7 @@
         "full": "fr-Latn-CD",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "CD",
@@ -37529,6 +37851,7 @@
         "full": "fr-Latn-CH",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "CH",
@@ -37543,6 +37866,7 @@
         "full": "fr-Latn-CI",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "CI",
@@ -37557,6 +37881,7 @@
         "full": "fr-Latn-CM",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "CM",
@@ -37571,6 +37896,7 @@
         "full": "fr-Latn-DJ",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "DJ",
@@ -37585,6 +37911,7 @@
         "full": "fr-Latn-DZ",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "DZ",
@@ -37614,6 +37941,7 @@
         "full": "fr-Latn-GF",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "GF",
@@ -37628,6 +37956,7 @@
         "full": "fr-Latn-GN",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "GN",
@@ -37642,6 +37971,7 @@
         "full": "fr-Latn-HT",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "HT",
@@ -37656,6 +37986,7 @@
         "full": "fr-Latn-KM",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "KM",
@@ -37670,6 +38001,7 @@
         "full": "fr-Latn-LU",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "LU",
@@ -37684,6 +38016,7 @@
         "full": "fr-Latn-MA",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "MA",
@@ -37698,6 +38031,7 @@
         "full": "fr-Latn-MG",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "MG",
@@ -37712,6 +38046,7 @@
         "full": "fr-Latn-ML",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "ML",
@@ -37726,6 +38061,7 @@
         "full": "fr-Latn-MR",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "MR",
@@ -37740,6 +38076,7 @@
         "full": "fr-Latn-MU",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "MU",
@@ -37754,6 +38091,7 @@
         "full": "fr-Latn-RE",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "RE",
@@ -37768,6 +38106,7 @@
         "full": "fr-Latn-RW",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "RW",
@@ -37782,6 +38121,7 @@
         "full": "fr-Latn-SC",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "SC",
@@ -37796,6 +38136,7 @@
         "full": "fr-Latn-SN",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "SN",
@@ -37810,6 +38151,7 @@
         "full": "fr-Latn-SY",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "SY",
@@ -37824,6 +38166,7 @@
         "full": "fr-Latn-TD",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "TD",
@@ -37838,6 +38181,7 @@
         "full": "fr-Latn-TN",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "TN",
@@ -37852,6 +38196,7 @@
         "full": "fr-Latn-VU",
         "iana": [ "French" ],
         "iso639_3": "fra",
+        "localname": "français",
         "localnames": [ "français" ],
         "name": "French",
         "region": "VU",
@@ -38541,7 +38886,7 @@
         "full": "gaa-Latn-GH",
         "iana": [ "Ga" ],
         "iso639_3": "gaa",
-        "localname": "Ga",
+        "localname": "Gã",
         "localnames": [ "Ga" ],
         "name": "Ga",
         "names": [ "Accra", "Acra", "Amina", "Gain", "Gamei" ],
@@ -38585,13 +38930,14 @@
         "full": "gab-Latn-TD",
         "iana": [ "Gabri" ],
         "iso639_3": "gab",
+        "localname": "Maja",
         "localnames": [ "Maja" ],
         "name": "Gabri",
         "names": [ "Gabere", "Gaberi", "Gabri Darbé-Dormon", "Gabri Maja", "Maja", "Ngabre", "Southern Gabri" ],
         "region": "TD",
         "regionname": "Chad",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "gab",
         "tags": [ "gab-Latn", "gab-TD" ],
         "windows": "gab-Latn"
@@ -38956,7 +39302,7 @@
         "region": "IN",
         "regionname": "India",
         "script": "Telu",
-        "sldr": false,
+        "sldr": true,
         "tag": "gau",
         "tags": [ "gau-IN", "gau-Telu" ],
         "windows": "gau-Telu"
@@ -40226,18 +40572,33 @@
         "iana": [ "Geez" ],
         "iso639_3": "gez",
         "latnnames": [ "Gəʿəz" ],
-        "localname": "ግዕዝ",
+        "localname": "ግዕዝኛ",
         "localnames": [ "ግዕዝ" ],
         "name": "Geez",
         "region": "ET",
         "regionname": "Ethiopia",
-        "regions": [ "ER" ],
         "script": "Ethi",
         "sldr": true,
         "tag": "gez",
         "tags": [ "gez-ET", "gez-Ethi" ],
         "windows": "gez-Ethi"
     },
+    {
+        "full": "gez-Ethi-ER",
+        "iana": [ "Geez" ],
+        "iso639_3": "gez",
+        "latnnames": [ "Gəʿəz" ],
+        "localname": "ግዕዝኛ",
+        "localnames": [ "ግዕዝ" ],
+        "name": "Geez",
+        "names": [ "Ancient Ethiopic", "Ethiopic", "Ge’ez", "Giiz" ],
+        "region": "ER",
+        "regionname": "Eritrea",
+        "script": "Ethi",
+        "sldr": true,
+        "tag": "gez-ER",
+        "windows": "gez-Ethi-ER"
+    },
     {
         "full": "gfk-Latn-PG",
         "iana": [ "Patpatar" ],
@@ -40254,6 +40615,38 @@
         "tags": [ "gfk-Latn", "gfk-PG" ],
         "windows": "gfk-Latn"
     },
+    {
+        "full": "gfk-Latn-PG-x-hinsaal",
+        "iana": [ "Patpatar - Hinsaal" ],
+        "iso639_3": "gfk",
+        "localnames": [ "Patpatar" ],
+        "name": "Patpatar",
+        "names": [ "Gelik", "Pala", "Patpari", "Patpatar - Hinsaal" ],
+        "region": "PG",
+        "regionname": "Papua New Guinea",
+        "rod": "21926",
+        "script": "Latn",
+        "sldr": true,
+        "tag": "gfk-x-hinsaal",
+        "tags": [ "gfk-Latn-x-hinsaal", "gfk-PG-x-hinsaal" ],
+        "windows": "gfk-Latn-x-hinsaal"
+    },
+    {
+        "full": "gfk-Latn-PG-x-sokarek",
+        "iana": [ "Patpatar - Sokarek" ],
+        "iso639_3": "gfk",
+        "localnames": [ "Patpatar" ],
+        "name": "Patpatar",
+        "names": [ "Gelik", "Pala", "Patpari", "Patpatar - Sokarek" ],
+        "region": "PG",
+        "regionname": "Papua New Guinea",
+        "rod": "21925",
+        "script": "Latn",
+        "sldr": true,
+        "tag": "gfk-x-sokarek",
+        "tags": [ "gfk-Latn-x-sokarek", "gfk-PG-x-sokarek" ],
+        "windows": "gfk-Latn-x-sokarek"
+    },
     {
         "full": "gft-Zyyy-ET",
         "iana": [ "Gafat" ],
@@ -40542,7 +40935,6 @@
         "sldr": false,
         "tag": "ghn",
         "tags": [ "ghn-Latn", "ghn-SB" ],
-        "unwritten": true,
         "windows": "ghn-Latn"
     },
     {
@@ -40554,7 +40946,7 @@
         "region": "MA",
         "regionname": "Morocco",
         "script": "Tfng",
-        "sldr": false,
+        "sldr": true,
         "tag": "gho",
         "tags": [ "gho-MA", "gho-Tfng" ],
         "windows": "gho-Tfng"
@@ -41632,6 +42024,7 @@
         "full": "gn-Latn-PY",
         "iana": [ "Guarani" ],
         "iso639_3": "grn",
+        "localname": "avañe’ẽ",
         "localnames": [ "Avañe'ẽ" ],
         "name": "Guarani",
         "names": [ "Avanye’e", "Avañee", "Avañe’ẽ", "Guaraní", "Guaraní paraguaio", "Guaraní, Paraguayan" ],
@@ -41639,7 +42032,7 @@
         "regionname": "Paraguay",
         "regions": [ "AR", "BO", "BR" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "suppress": true,
         "tag": "gn",
         "tags": [ "gn-Latn", "gn-PY", "gug", "gug-Latn", "gug-Latn-PY", "gug-PY" ],
@@ -42587,21 +42980,6 @@
         "tags": [ "gbo", "gbo-LR", "gbo-Latn", "gbo-Latn-LR", "grb-LR", "grb-Latn" ],
         "windows": "grb-Latn"
     },
-    {
-        "full": "grc-Cprt-CY",
-        "iana": [ "Ancient Greek (to 1453)" ],
-        "iso639_3": "grc",
-        "name": "Greek, Ancient",
-        "names": [ "Ancient Greek (to 1453)" ],
-        "region": "CY",
-        "regionname": "Cyprus",
-        "regions": [ "GR" ],
-        "script": "Cprt",
-        "sldr": false,
-        "tag": "grc",
-        "tags": [ "grc-CY", "grc-Cprt" ],
-        "windows": "grc-Cprt"
-    },
     {
         "full": "grc-Grek-GR",
         "iana": [ "Ancient Greek (to 1453)" ],
@@ -42610,27 +42988,26 @@
         "localnames": [ "Ἑλληνική" ],
         "name": "Greek, Ancient",
         "names": [ "Ancient Greek (to 1453)" ],
-        "nophonvars": true,
         "region": "GR",
         "regionname": "Greece",
         "script": "Grek",
         "sldr": false,
-        "tag": "grc-Grek",
+        "tag": "grc",
+        "tags": [ "grc-GR", "grc-Grek" ],
         "windows": "grc-Grek"
     },
     {
-        "full": "grc-Linb-GR",
+        "full": "grc-Latn-GR",
         "iana": [ "Ancient Greek (to 1453)" ],
         "iso639_3": "grc",
         "name": "Greek, Ancient",
         "names": [ "Ancient Greek (to 1453)" ],
-        "nophonvars": true,
         "region": "GR",
         "regionname": "Greece",
-        "script": "Linb",
+        "script": "Latn",
         "sldr": false,
-        "tag": "grc-Linb",
-        "windows": "grc-Linb"
+        "tag": "grc-Latn",
+        "windows": "grc-Latn"
     },
     {
         "full": "grd-Latn-NG",
@@ -42978,13 +43355,14 @@
         "full": "gsl-Latn-SN",
         "iana": [ "Gusilay" ],
         "iso639_3": "gsl",
+        "localname": "Gusiilaay",
         "localnames": [ "Gusiilaay" ],
         "name": "Gusilay",
         "names": [ "Gusiilaay", "Gusiilay", "Gusilaay", "Kusiilaay", "Kusilay" ],
         "region": "SN",
         "regionname": "Senegal",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "gsl",
         "tags": [ "gsl-Latn", "gsl-SN" ],
         "windows": "gsl-Latn"
@@ -44312,7 +44690,7 @@
         "names": [ "Abakwariga", "Haoussa", "Harshen Hausa", "Hausawa", "Haussa", "Hawsa", "Mgbakpa" ],
         "region": "NG",
         "regionname": "Nigeria",
-        "regions": [ "BF", "BJ", "CF", "CG", "CI", "CM", "DE", "ER", "NE", "SD", "TD", "TG" ],
+        "regions": [ "BF", "BJ", "CF", "CG", "CI", "CM", "DE", "ER", "SD", "TD", "TG" ],
         "script": "Latn",
         "sldr": true,
         "tag": "ha",
@@ -44336,6 +44714,22 @@
         "tag": "ha-Arab",
         "windows": "ha-Arab"
     },
+    {
+        "full": "ha-Arab-NE",
+        "iana": [ "Hausa" ],
+        "iso639_3": "hau",
+        "latnnames": [ "haūْsa" ],
+        "localnames": [ "هَوْسَ" ],
+        "name": "Hausa",
+        "names": [ "Haoussa", "Harshen Hausa", "Hausawa", "Haussa" ],
+        "nophonvars": true,
+        "region": "NE",
+        "regionname": "Niger",
+        "script": "Arab",
+        "sldr": false,
+        "tag": "ha-Arab-NE",
+        "windows": "ha-Arab-NE"
+    },
     {
         "full": "ha-Brai-NG",
         "iana": [ "Hausa" ],
@@ -44370,6 +44764,7 @@
         "full": "ha-Latn-GH",
         "iana": [ "Hausa" ],
         "iso639_3": "hau",
+        "localname": "Hausa",
         "localnames": [ "Hausa" ],
         "name": "Hausa",
         "region": "GH",
@@ -44380,20 +44775,19 @@
         "windows": "ha-Latn-GH"
     },
     {
-        "full": "ha-Arab-NE",
+        "full": "ha-Latn-NE",
         "iana": [ "Hausa" ],
         "iso639_3": "hau",
-        "latnnames": [ "haūْsa" ],
         "localname": "Hausa",
-        "localnames": [ "هَوْسَ" ],
+        "localnames": [ "Hausa" ],
         "name": "Hausa",
         "names": [ "Haoussa", "Harshen Hausa", "Hausawa", "Haussa" ],
         "region": "NE",
         "regionname": "Niger",
-        "script": "Arab",
+        "script": "Latn",
         "sldr": true,
         "tag": "ha-NE",
-        "windows": "ha-Arab-NE"
+        "windows": "ha-Latn-NE"
     },
     {
         "full": "ha-Arab-SD",
@@ -44405,7 +44799,7 @@
         "region": "SD",
         "regionname": "Sudan",
         "script": "Arab",
-        "sldr": false,
+        "sldr": true,
         "tag": "ha-SD",
         "windows": "ha-Arab-SD"
     },
@@ -44923,6 +45317,19 @@
         "tags": [ "hbo-Hebr", "hbo-IL" ],
         "windows": "hbo-Hebr"
     },
+    {
+        "full": "hbo-Latn-IL",
+        "iana": [ "Ancient Hebrew" ],
+        "iso639_3": "hbo",
+        "name": "Hebrew, Ancient",
+        "names": [ "Ancient Hebrew", "Old Hebrew" ],
+        "region": "IL",
+        "regionname": "Israel",
+        "script": "Latn",
+        "sldr": false,
+        "tag": "hbo-Latn",
+        "windows": "hbo-Latn"
+    },
     {
         "full": "hbu-Latn-TL",
         "iana": [ "Habu" ],
@@ -45044,6 +45451,20 @@
         "tag": "he-Brai",
         "windows": "he-Brai"
     },
+    {
+        "full": "he-Latn-IL",
+        "iana": [ "Hebrew" ],
+        "iso639_3": "heb",
+        "name": "Hebrew",
+        "names": [ "Contemporary Hebrew", "Israeli", "Israeli Hebrew", "Modern Hebrew" ],
+        "region": "IL",
+        "regionname": "Israel",
+        "regions": [ "AO", "CA", "DE", "PA", "PS", "RU", "TR", "US" ],
+        "script": "Latn",
+        "sldr": false,
+        "tag": "he-Latn",
+        "windows": "he-Latn"
+    },
     {
         "full": "hed-Latn-TD",
         "iana": [ "Herdé" ],
@@ -45232,7 +45653,7 @@
         "full": "hi-Latn-IN",
         "iana": [ "Hindi" ],
         "iso639_3": "hin",
-        "localname": "Hindi",
+        "localname": "Hindi (Latin)",
         "name": "Hindi",
         "names": [ "Dakhini", "Hindi-Urdu", "Hindustani", "Modern Standard Hindi" ],
         "region": "IN",
@@ -46212,7 +46633,7 @@
         "regionname": "China",
         "regions": [ "VN" ],
         "script": "Plrd",
-        "sldr": false,
+        "sldr": true,
         "tag": "hmz-Plrd",
         "windows": "hmz-Plrd"
     },
@@ -46314,13 +46735,14 @@
         "full": "hnj-Hmnp-US",
         "iana": [ "Hmong Njua", "Mong Leng", "Mong Njua" ],
         "iso639_3": "hnj",
+        "localname": "𞄀𞄄𞄰𞄩𞄍𞄜𞄰",
         "macrolang": "hmn",
         "name": "Hmong Njua",
         "names": [ "Mong Leng", "Mong Njua" ],
         "region": "US",
         "regionname": "United States",
         "script": "Hmnp",
-        "sldr": false,
+        "sldr": true,
         "tag": "hnj",
         "tags": [ "hnj-Hmnp", "hnj-US" ],
         "variants": [ "pahawh2", "pahawh3", "pahawh4" ],
@@ -46785,6 +47207,20 @@
         "tags": [ "hop-Latn", "hop-US" ],
         "windows": "hop-Latn"
     },
+    {
+        "full": "hop-Dsrt-US",
+        "iana": [ "Hopi" ],
+        "iso639_3": "hop",
+        "name": "Hopi",
+        "names": [ "Hopílavayi" ],
+        "nophonvars": true,
+        "region": "US",
+        "regionname": "United States",
+        "script": "Dsrt",
+        "sldr": false,
+        "tag": "hop-Dsrt",
+        "windows": "hop-Dsrt"
+    },
     {
         "full": "hor-Latn-TD",
         "iana": [ "Horo" ],
@@ -46940,6 +47376,7 @@
         "full": "hr-Latn-BA",
         "iana": [ "Croatian" ],
         "iso639_3": "hrv",
+        "localname": "hrvatski",
         "localnames": [ "Hrvatski" ],
         "macrolang": "sh",
         "name": "Croatian",
@@ -47697,6 +48134,7 @@
         "full": "hus-Latn-MX-x-potosino",
         "iana": [ "Huastec" ],
         "iso639_3": "hus",
+        "localname": "Teenek",
         "localnames": [ "Teenek" ],
         "name": "Huastec",
         "names": [ "Teenek", "Tenek", "Tének" ],
@@ -48402,6 +48840,22 @@
         "tag": "id-Brai",
         "windows": "id-Brai"
     },
+    {
+        "full": "id-Java-ID",
+        "iana": [ "Indonesian" ],
+        "iso639_3": "ind",
+        "macrolang": "ms",
+        "name": "Indonesian",
+        "names": [ "Bahasa Indonesia" ],
+        "nophonvars": true,
+        "region": "ID",
+        "regionname": "Indonesia",
+        "regions": [ "AU", "HK", "NL", "PH", "SG", "SR", "SX", "US" ],
+        "script": "Java",
+        "sldr": false,
+        "tag": "id-Java",
+        "windows": "id-Java"
+    },
     {
         "full": "ida-Latn-KE",
         "iana": [ "Idakho-Isukha-Tiriki", "Luidakho-Luisukha-Lutirichi" ],
@@ -48554,13 +49008,14 @@
         "full": "ie-Latn-001",
         "iana": [ "Interlingue", "Occidental" ],
         "iso639_3": "ile",
+        "localname": "Interlingue",
         "name": "Interlingue",
         "names": [ "Occidental" ],
         "region": "001",
         "regionname": "World",
         "regions": [ "EE" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "ie",
         "tags": [ "ie-001", "ie-Latn" ],
         "windows": "ie-Latn"
@@ -48709,7 +49164,7 @@
         "full": "ig-Latn-NG",
         "iana": [ "Igbo" ],
         "iso639_3": "ibo",
-        "localname": "Asụsụ Igbo",
+        "localname": "Igbo",
         "localnames": [ "Asụsụ Igbo" ],
         "name": "Igbo",
         "names": [ "Asụsụ Igbo", "Ebo", "Ibo", "Unege" ],
@@ -49062,7 +49517,7 @@
         "full": "ik-Latn-US",
         "iana": [ "Inupiaq" ],
         "iso639_3": "ipk",
-        "localname": "Inupiatun, Northwest Alaska",
+        "localname": "Iñupiatun",
         "localnames": [ "Iñupiatun" ],
         "name": "Inupiaq",
         "names": [ "Eskimo", "Ieupiaq", "Inupiatun, Northwest Alaska", "Iñupiaq", "Iñupiatun", "Northwest Alaska Inupiat", "Seward Peninsula Inupiaq" ],
@@ -49265,7 +49720,6 @@
         "sldr": false,
         "tag": "ikv",
         "tags": [ "ikv-Latn", "ikv-NG" ],
-        "unwritten": true,
         "windows": "ikv-Latn"
     },
     {
@@ -49882,11 +50336,12 @@
         "full": "io-Latn-001",
         "iana": [ "Ido" ],
         "iso639_3": "ido",
+        "localname": "Ido",
         "name": "Ido",
         "region": "001",
         "regionname": "World",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "io",
         "tags": [ "io-001", "io-Latn" ],
         "windows": "io-Latn"
@@ -50414,6 +50869,33 @@
         "tags": [ "isu-CM", "isu-Latn" ],
         "windows": "isu-Latn"
     },
+    {
+        "full": "isv-Cyrl-001",
+        "iana": [ "Interslavic" ],
+        "iso639_3": "isv",
+        "name": "Interslavic",
+        "nophonvars": true,
+        "region": "001",
+        "regionname": "World",
+        "regions": [ "BA", "BG", "BY", "CZ", "HR", "ME", "MK", "PL", "RS", "RU", "SI", "SK", "UA" ],
+        "script": "Cyrl",
+        "sldr": false,
+        "tag": "isv-Cyrl",
+        "windows": "isv-Cyrl"
+    },
+    {
+        "full": "isv-Latn-001",
+        "iana": [ "Interslavic" ],
+        "iso639_3": "isv",
+        "name": "Interslavic",
+        "region": "001",
+        "regionname": "World",
+        "regions": [ "BA", "BG", "BY", "CZ", "HR", "ME", "MK", "PL", "RS", "RU", "SI", "SK", "UA" ],
+        "script": "Latn",
+        "sldr": false,
+        "tag": "isv-Latn",
+        "windows": "isv-Latn"
+    },
     {
         "full": "it-Latn-IT",
         "iana": [ "Italian" ],
@@ -50451,6 +50933,7 @@
         "full": "it-Latn-CH",
         "iana": [ "Italian" ],
         "iso639_3": "ita",
+        "localname": "italiano",
         "localnames": [ "Italiano" ],
         "name": "Italian",
         "region": "CH",
@@ -50722,7 +51205,7 @@
         "region": "CA",
         "regionname": "Canada",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "iu-Latn",
         "windows": "iu-Latn"
     },
@@ -50931,6 +51414,7 @@
         "full": "ixl-Latn-GT-x-cotzal",
         "iana": [ "Ixil" ],
         "iso639_3": "ixl",
+        "localname": "Ixil",
         "localnames": [ "Ixil" ],
         "name": "Ixil",
         "names": [ "Ixhil", "Ixhil Mayan", "Ixil Maya" ],
@@ -50947,6 +51431,7 @@
         "full": "ixl-Latn-GT-x-nebaj",
         "iana": [ "Ixil" ],
         "iso639_3": "ixl",
+        "localname": "Ixil",
         "localnames": [ "Ixil" ],
         "name": "Ixil",
         "names": [ "Ixhil", "Ixhil Mayan", "Ixil Maya" ],
@@ -51147,6 +51632,7 @@
         "full": "jaa-Latn-BR-x-jarawara",
         "iana": [ "Jamamadí" ],
         "iso639_3": "jaa",
+        "localname": "Jamamadí",
         "localnames": [ "Jamamadí" ],
         "name": "Jamamadí",
         "names": [ "Canamanti", "Kanamanti", "Kapaná", "Madi", "Yamadi", "Yamamadí", "Yamamandi" ],
@@ -51531,7 +52017,7 @@
         "regionname": "Libya",
         "regions": [ "TN" ],
         "script": "Arab",
-        "sldr": false,
+        "sldr": true,
         "tag": "jbn",
         "tags": [ "jbn-Arab", "jbn-LY" ],
         "windows": "jbn-Arab"
@@ -51540,11 +52026,12 @@
         "full": "jbo-Latn-001",
         "iana": [ "Lojban" ],
         "iso639_3": "jbo",
+        "localname": "la .lojban.",
         "name": "Lojban",
         "region": "001",
         "regionname": "World",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "jbo",
         "tags": [ "jbo-001", "jbo-Latn" ],
         "windows": "jbo-Latn"
@@ -52183,13 +52670,14 @@
         "full": "jit-Latn-TZ",
         "iana": [ "Jita" ],
         "iso639_3": "jit",
+        "localname": "Echijita",
         "localnames": [ "Echijita" ],
         "name": "Jita",
         "names": [ "Echijita", "Ecijiita", "Ecijita", "Kijita" ],
         "region": "TZ",
         "regionname": "United Republic of Tanzania",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "jit",
         "tags": [ "jit-Latn", "jit-TZ" ],
         "windows": "jit-Latn"
@@ -52474,13 +52962,14 @@
         "full": "jmd-Latn-ID",
         "iana": [ "Yamdena" ],
         "iso639_3": "jmd",
+        "localname": "Tanempar",
         "localnames": [ "Tanempar", "Tanempar Liriny" ],
         "name": "Yamdena",
         "names": [ "Jamden", "Jamdena", "Tanempar", "Tanempar Liriny", "Tanemprar lirin" ],
         "region": "ID",
         "regionname": "Indonesia",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "jmd",
         "tags": [ "jmd-ID", "jmd-Latn" ],
         "windows": "jmd-Latn"
@@ -52815,6 +53304,7 @@
         "full": "jow-Latn-ML",
         "iana": [ "Jowulu" ],
         "iso639_3": "jow",
+        "localname": "Jɔwulu",
         "localnames": [ "Jɔwulu" ],
         "name": "Jowulu",
         "names": [ "Jo", "Jɔ", "Jɔwulu", "Samogho", "jôwulu" ],
@@ -52822,7 +53312,7 @@
         "regionname": "Mali",
         "regions": [ "BF" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "jow",
         "tags": [ "jow-Latn", "jow-ML" ],
         "windows": "jow-Latn"
@@ -52898,7 +53388,7 @@
         "regionname": "Cambodia",
         "regions": [ "US", "VN" ],
         "script": "Khmr",
-        "sldr": false,
+        "sldr": true,
         "tag": "jra-Khmr",
         "tags": [ "jra-KH" ],
         "windows": "jra-Khmr"
@@ -53100,13 +53590,14 @@
         "iana": [ "Jirel" ],
         "iso639_3": "jul",
         "latnnames": [ "jirel" ],
+        "localname": "जिरेल",
         "localnames": [ "जिरेल" ],
         "name": "Jirel",
         "names": [ "Jiri", "Jirial", "Ziral" ],
         "region": "NP",
         "regionname": "Nepal",
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "jul",
         "tags": [ "jul-Deva", "jul-NP" ],
         "windows": "jul-Deva"
@@ -53470,6 +53961,7 @@
         "iana": [ "Kara-Kalpak", "Karakalpak" ],
         "iso639_3": "kaa",
         "latnnames": [ "Qaraqalpaq tili" ],
+        "localname": "қарақалпақша",
         "localnames": [ "Қарақалпақ тили" ],
         "name": "Karakalpak",
         "names": [ "Kara-Kalpak", "Karaklobuk", "Klobouki", "Qaraqalpaq tili", "Tchorny" ],
@@ -53477,7 +53969,7 @@
         "regionname": "Uzbekistan",
         "regions": [ "KG", "KZ", "RU", "TM", "TR" ],
         "script": "Cyrl",
-        "sldr": false,
+        "sldr": true,
         "tag": "kaa",
         "tags": [ "kaa-Cyrl", "kaa-UZ" ],
         "windows": "kaa-Cyrl"
@@ -53508,7 +54000,7 @@
         "regionname": "Uzbekistan",
         "regions": [ "KG", "KZ", "RU", "TM", "TR" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "kaa-Latn",
         "windows": "kaa-Latn"
     },
@@ -53555,7 +54047,7 @@
         "regionname": "Algeria",
         "regions": [ "BE", "FR" ],
         "script": "Tfng",
-        "sldr": false,
+        "sldr": true,
         "tag": "kab-Tfng",
         "windows": "kab-Tfng"
     },
@@ -53668,7 +54160,7 @@
         "full": "kaj-Latn-NG",
         "iana": [ "Jju" ],
         "iso639_3": "kaj",
-        "localname": "Jju",
+        "localname": "Kaje",
         "localnames": [ "Jju", "Kәjju" ],
         "name": "Jju",
         "names": [ "Bajju", "Baju", "Kache", "Kaje", "Kajji", "Kәjju" ],
@@ -53777,32 +54269,17 @@
         "windows": "kav-Latn"
     },
     {
-        "full": "kaw-Kawi-ID",
+        "full": "kaw-Bali-ID",
         "iana": [ "Kawi" ],
         "iso639_3": "kaw",
         "name": "Kawi",
         "region": "ID",
         "regionname": "Indonesia",
         "regions": [ "MY" ],
-        "script": "Kawi",
-        "sldr": false,
-        "tag": "kaw",
-        "tags": [ "kaw-ID", "kaw-Kawi" ],
-        "windows": "kaw-Kawi"
-    },
-    {
-        "full": "kaw-Bali-MY",
-        "iana": [ "Kawi" ],
-        "iso639_3": "kaw",
-        "name": "Kawi",
-        "nophonvars": true,
-        "region": "MY",
-        "regionname": "Malaysia",
-        "regions": [ "ID" ],
         "script": "Bali",
         "sldr": false,
-        "tag": "kaw-Bali",
-        "tags": [ "kaw-MY" ],
+        "tag": "kaw",
+        "tags": [ "kaw-Bali", "kaw-ID" ],
         "windows": "kaw-Bali"
     },
     {
@@ -53819,6 +54296,20 @@
         "tag": "kaw-Java",
         "windows": "kaw-Java"
     },
+    {
+        "full": "kaw-Kawi-ID",
+        "iana": [ "Kawi" ],
+        "iso639_3": "kaw",
+        "name": "Kawi",
+        "nophonvars": true,
+        "region": "ID",
+        "regionname": "Indonesia",
+        "regions": [ "MY" ],
+        "script": "Kawi",
+        "sldr": false,
+        "tag": "kaw-Kawi",
+        "windows": "kaw-Kawi"
+    },
     {
         "full": "kax-Latn-ID",
         "iana": [ "Kao" ],
@@ -54387,7 +54878,7 @@
         "full": "kcg-Latn-NG",
         "iana": [ "Tyap" ],
         "iso639_3": "kcg",
-        "localname": "Tyap",
+        "localname": "Katab",
         "localnames": [ "Tyap" ],
         "name": "Tyap",
         "names": [ "A̠tyap", "Katab", "Kataf" ],
@@ -54678,7 +55169,6 @@
         "sldr": false,
         "tag": "kcz",
         "tags": [ "kcz-Latn", "kcz-TZ" ],
-        "unwritten": true,
         "windows": "kcz-Latn"
     },
     {
@@ -54994,6 +55484,7 @@
         "full": "kdt-Khmr-KH",
         "iana": [ "Kuy" ],
         "iso639_3": "kdt",
+        "localname": "កួយ",
         "name": "Kuay",
         "names": [ "Aouei", "Cuoi", "Douon", "Dui", "Khamen-Boran", "Kouy", "Kui", "Kui Souei", "Kuoy", "Kuy", "Old Khmer", "Soai", "Soay", "Soei", "Souai", "Souei", "Suai", "Suay", "Suei", "Sui", "Suoi", "Xuay", "Xuoi" ],
         "nophonvars": true,
@@ -55001,7 +55492,7 @@
         "regionname": "Cambodia",
         "regions": [ "LA", "TH" ],
         "script": "Khmr",
-        "sldr": false,
+        "sldr": true,
         "tag": "kdt-Khmr",
         "tags": [ "kdt-KH" ],
         "windows": "kdt-Khmr"
@@ -55833,13 +56324,14 @@
         "iana": [ "Korwa" ],
         "iso639_3": "kfp",
         "latnnames": [ "Kodava" ],
+        "localname": "कोड़वा",
         "localnames": [ "कोड़वा" ],
         "name": "Korwa",
         "names": [ "Ernga", "Erngga", "Korowa", "Singli" ],
         "region": "IN",
         "regionname": "India",
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "kfp",
         "tags": [ "kfp-Deva", "kfp-IN" ],
         "windows": "kfp-Deva"
@@ -56315,13 +56807,14 @@
         "full": "kgr-Latn-ID",
         "iana": [ "Abun" ],
         "iso639_3": "kgr",
+        "localname": "Abun",
         "localnames": [ "Abun" ],
         "name": "Abun",
         "names": [ "A Nden", "Anden", "Karon", "Manif", "Yimbun" ],
         "region": "ID",
         "regionname": "Indonesia",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "kgr",
         "tags": [ "kgr-ID", "kgr-Latn" ],
         "windows": "kgr-Latn"
@@ -56416,7 +56909,7 @@
         "windows": "kgx-Latn"
     },
     {
-        "full": "kgy-Deva-NP",
+        "full": "kgy-Tibt-NP",
         "iana": [ "Kyerung" ],
         "iso639_3": "kgy",
         "name": "Kyirong",
@@ -56424,10 +56917,25 @@
         "region": "NP",
         "regionname": "Nepal",
         "regions": [ "CN" ],
-        "script": "Deva",
+        "script": "Tibt",
         "sldr": false,
         "tag": "kgy",
-        "tags": [ "kgy-Deva", "kgy-NP" ],
+        "tags": [ "kgy-NP", "kgy-Tibt" ],
+        "windows": "kgy-Tibt"
+    },
+    {
+        "full": "kgy-Deva-NP",
+        "iana": [ "Kyerung" ],
+        "iso639_3": "kgy",
+        "name": "Kyirong",
+        "names": [ "Gyirong", "Kyerong", "Kyerung", "Kyirong kai", "Kyirong-nga", "Kyirung" ],
+        "nophonvars": true,
+        "region": "NP",
+        "regionname": "Nepal",
+        "regions": [ "CN" ],
+        "script": "Deva",
+        "sldr": false,
+        "tag": "kgy-Deva",
         "unwritten": true,
         "windows": "kgy-Deva"
     },
@@ -56740,6 +57248,7 @@
         "iana": [ "Khamti" ],
         "iso639_3": "kht",
         "latnnames": [ "Tai Khamti" ],
+        "localname": "လိꩱ့်တဲးၵမ်းတီ",
         "localnames": [ "လိꩱ့်တဲးၵမ်းတီ" ],
         "name": "Khamti",
         "names": [ "Hkampti Shan", "Hkamti", "Kam Ti", "Kham-Tai", "Khampti", "Khampti Sam", "Khampti Shan", "Khamti Shan", "Khandi Shan", "Khantis", "Tai Kam Ti", "Tai Kham Ti", "Tai-Khamti" ],
@@ -56747,7 +57256,7 @@
         "regionname": "India",
         "regions": [ "MM" ],
         "script": "Mymr",
-        "sldr": false,
+        "sldr": true,
         "tag": "kht",
         "tags": [ "kht-IN", "kht-Mymr" ],
         "windows": "kht-Mymr"
@@ -56863,13 +57372,14 @@
         "full": "kia-Latn-TD",
         "iana": [ "Kim" ],
         "iso639_3": "kia",
+        "localname": "Garab",
         "localnames": [ "Garab" ],
         "name": "Kim",
         "names": [ "Garab", "Masa" ],
         "region": "TD",
         "regionname": "Chad",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "kia",
         "tags": [ "kia-Latn", "kia-TD" ],
         "windows": "kia-Latn"
@@ -57165,6 +57675,7 @@
         "full": "kiu-Latn-TR",
         "iana": [ "Kirmanjki (individual language)" ],
         "iso639_3": "kiu",
+        "localname": "Kırmancki",
         "localnames": [ "Kırmancki", "So-Bê", "Zonê Ma" ],
         "macrolang": "zza",
         "name": "Zazaki, Northern",
@@ -57173,7 +57684,7 @@
         "regionname": "Turkey",
         "regions": [ "AT", "CH", "DE", "NL" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "kiu",
         "tags": [ "kiu-Latn", "kiu-TR" ],
         "windows": "kiu-Latn"
@@ -58128,13 +58639,14 @@
         "full": "kkl-Latn-ID",
         "iana": [ "Kosarek Yale" ],
         "iso639_3": "kkl",
+        "localname": "Mek Kosarek",
         "localnames": [ "Mek Kosarek" ],
         "name": "Yale, Kosarek",
         "names": [ "In-lom", "Kosarek", "Kosarek Yale", "Mek Kosarek", "Wanam", "Yale", "Yale yubu", "Yale yupu", "Yale-Kosarek", "Yali", "Yali Kosarek" ],
         "region": "ID",
         "regionname": "Indonesia",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "kkl",
         "tags": [ "kkl-ID", "kkl-Latn" ],
         "windows": "kkl-Latn"
@@ -58575,7 +59087,7 @@
         "full": "kln-Latn-KE",
         "iana": [ "Kalenjin" ],
         "iso639_3": "kln",
-        "localname": "Sābāwōōt",
+        "localname": "Kalenjin",
         "localnames": [ "Sābāwōōt" ],
         "name": "Kalenjin",
         "names": [ "Sabaot", "Sebei", "Sābāwōōt" ],
@@ -59003,12 +59515,13 @@
         "full": "kml-Latn-PH",
         "iana": [ "Tanudan Kalinga" ],
         "iso639_3": "kml",
+        "localname": "Kinalinga",
         "name": "Kalinga, Tanudan",
         "names": [ "Lower Tanudan", "Lower Tanudan Kalinga", "Mangali Kalinga", "Tanudan", "Tanudan Kalinga" ],
         "region": "PH",
         "regionname": "Philippines",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "kml",
         "tags": [ "kgh", "kgh-Latn", "kgh-Latn-PH", "kgh-PH", "kml-Latn", "kml-PH" ],
         "windows": "kml-Latn"
@@ -59349,7 +59862,6 @@
         "sldr": false,
         "tag": "kni",
         "tags": [ "kni-Latn", "kni-NG" ],
-        "unwritten": true,
         "windows": "kni-Latn"
     },
     {
@@ -59590,6 +60102,7 @@
         "full": "knv-Latn-PG-x-flyriver",
         "iana": [ "Tabo" ],
         "iso639_3": "knv",
+        "localname": "Tabo",
         "localnames": [ "Tabo" ],
         "name": "Tabo",
         "names": [ "Hibaradai", "Hiwi", "Waia", "Waya" ],
@@ -59674,7 +60187,7 @@
         "names": [ "Chaoxian", "Chaoxianyu", "Chaoyu", "Goryeomal", "Hangouyu", "Hanguohua", "Hanyu", "Koryomal", "Zainichi Korean" ],
         "region": "KR",
         "regionname": "Republic of Korea",
-        "regions": [ "AS", "AU", "AZ", "BH", "BN", "BR", "BY", "CA", "CN", "DE", "GU", "JP", "KG", "KZ", "LY", "MN", "MP", "MZ", "NZ", "PA", "PH", "PY", "RU", "SG", "SR", "TJ", "TM", "UA", "US", "UZ" ],
+        "regions": [ "AS", "AU", "AZ", "BH", "BN", "BR", "BY", "CA", "DE", "GU", "JP", "KG", "KZ", "LY", "MN", "MP", "MZ", "NZ", "PA", "PH", "PY", "RU", "SG", "SR", "TJ", "TM", "UA", "US", "UZ" ],
         "script": "Kore",
         "sldr": true,
         "suppress": true,
@@ -59697,10 +60210,24 @@
         "tag": "ko-Brai",
         "windows": "ko-Brai"
     },
+    {
+        "full": "ko-Kore-CN",
+        "iana": [ "Korean" ],
+        "iso639_3": "kor",
+        "localname": "한국어",
+        "name": "Korean",
+        "region": "CN",
+        "regionname": "China",
+        "script": "Kore",
+        "sldr": true,
+        "tag": "ko-CN",
+        "windows": "ko-Kore-CN"
+    },
     {
         "full": "ko-Kore-KP",
         "iana": [ "Korean" ],
         "iso639_3": "kor",
+        "localname": "한국어",
         "name": "Korean",
         "region": "KP",
         "regionname": "Democratic People's Republic of Korea",
@@ -59913,6 +60440,7 @@
         "full": "kok-Latn-IN",
         "iana": [ "Konkani (macrolanguage)" ],
         "iso639_3": "kok",
+        "localname": "Konknni",
         "name": "Konkani (macrolanguage)",
         "names": [ "Amchigela", "Central Konkan", "Concorinum", "Cugani", "Kathodi", "Katvadi", "Konkan Standard", "Konkanese", "Konkani", "Konkani Mangalorean", "Kunabi", "North Konkan" ],
         "obsolete": true,
@@ -59920,7 +60448,7 @@
         "regionname": "India",
         "regions": [ "CA" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "kok-Latn",
         "tags": [ "knn-Latn", "knn-Latn-IN", "kok-knn-Latn", "kok-knn-Latn-IN" ],
         "windows": "kok-Latn"
@@ -60160,7 +60688,7 @@
         "full": "kpe-Latn-LR",
         "iana": [ "Kpelle" ],
         "iso639_3": "kpe",
-        "localname": "Kpɛlɛwoo",
+        "localname": "Kpɛlɛɛ",
         "localnames": [ "Kpɛlɛwoo" ],
         "name": "Kpelle",
         "names": [ "Gbese", "Kpele", "Kpelle, Liberia", "Kpese", "Kpwessi", "Kpɛlɛwoo", "Pessa", "Pessy" ],
@@ -60172,6 +60700,19 @@
         "tags": [ "kpe-LR", "kpe-Latn", "xpe", "xpe-LR", "xpe-Latn", "xpe-Latn-LR" ],
         "windows": "kpe-Latn"
     },
+    {
+        "full": "kpe-Latn-GN",
+        "iana": [ "Kpelle" ],
+        "iso639_3": "kpe",
+        "localname": "Kpɛlɛɛ",
+        "name": "Kpelle",
+        "region": "GN",
+        "regionname": "Guinea",
+        "script": "Latn",
+        "sldr": true,
+        "tag": "kpe-GN",
+        "windows": "kpe-Latn-GN"
+    },
     {
         "full": "kpe-Kpel-LR",
         "iana": [ "Kpelle" ],
@@ -60432,6 +60973,22 @@
         "tags": [ "kpw-Latn", "kpw-PG" ],
         "windows": "kpw-Latn"
     },
+    {
+        "full": "kpw-Latn-PG-x-minimib",
+        "iana": [ "Kobon - Minimib" ],
+        "iso639_3": "kpw",
+        "localnames": [ "Kobon" ],
+        "name": "Kobon",
+        "names": [ "Kobon - Minimib" ],
+        "region": "PG",
+        "regionname": "Papua New Guinea",
+        "rod": "21176",
+        "script": "Latn",
+        "sldr": false,
+        "tag": "kpw-x-minimib",
+        "tags": [ "kpw-Latn-x-minimib", "kpw-PG-x-minimib" ],
+        "windows": "kpw-Latn-x-minimib"
+    },
     {
         "full": "kpx-Latn-PG",
         "iana": [ "Mountain Koiali" ],
@@ -60557,6 +61114,7 @@
         "full": "kqe-Latn-PH-x-east",
         "iana": [ "Kalagan" ],
         "iso639_3": "kqe",
+        "localname": "Kalagan",
         "localnames": [ "Kagan", "Kalagan" ],
         "name": "Kalagan",
         "names": [ "Kaagan", "Kagan", "Kinalagan", "Minuslim Kalagan" ],
@@ -60572,6 +61130,7 @@
         "full": "kqe-Latn-PH-x-west",
         "iana": [ "Kalagan" ],
         "iso639_3": "kqe",
+        "localname": "Kalagan",
         "localnames": [ "Kagan", "Kalagan" ],
         "name": "Kalagan",
         "names": [ "Kaagan", "Kagan", "Kinalagan", "Minuslim Kalagan" ],
@@ -61181,13 +61740,14 @@
         "iana": [ "Krung" ],
         "iso639_3": "krr",
         "latnnames": [ "kreung" ],
+        "localname": "គ្រឹង",
         "localnames": [ "គ្រឹង" ],
         "name": "Krung",
         "names": [ "Brao Krung", "Kreung", "Kru’ng" ],
         "region": "KH",
         "regionname": "Cambodia",
         "script": "Khmr",
-        "sldr": false,
+        "sldr": true,
         "tag": "krr",
         "tags": [ "krr-KH", "krr-Khmr" ],
         "windows": "krr-Khmr"
@@ -61828,13 +62388,14 @@
         "iana": [ "Kodaku" ],
         "iso639_3": "ksz",
         "latnnames": [ "Kodaku" ],
+        "localname": "कोड़ाकु",
         "localnames": [ "कोड़ाकु" ],
         "name": "Kodaku",
         "names": [ "Koraku", "Korwa" ],
         "region": "IN",
         "regionname": "India",
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "ksz",
         "tags": [ "ksz-Deva", "ksz-IN" ],
         "windows": "ksz-Deva"
@@ -62243,7 +62804,7 @@
         "full": "ku-Latn-TR",
         "iana": [ "Kurdish" ],
         "iso639_3": "kur",
-        "localname": "kurdî",
+        "localname": "kurdî (kurmancî)",
         "localnames": [ "Kurdî-Kurmancî", "Kurmancî" ],
         "name": "Kurdish",
         "names": [ "Badinani", "Badînî", "Bahdini", "Behdînî", "Eastern Kurmanji", "Ezdiki", "Kermancî", "Khorasani", "Khorasani Kurmanji", "Kirmanciya Jori", "Kirmancî", "Kordi", "Kordi Kormanji", "Kurdi", "Kurdish Kurmanji", "Kurdish, Northern", "Kurdiya jorîn", "Kurdmancî", "Kurdî", "Kurdî-Kurmancî", "Kurmancî", "Kurmanji", "Kurmanji Kurdish", "Kurmanjî", "Red Kurmanji" ],
@@ -62260,7 +62821,7 @@
         "full": "ku-Arab-IQ",
         "iana": [ "Kurdish" ],
         "iso639_3": "kur",
-        "localname": "kurdî",
+        "localname": "کورمانجی",
         "name": "Kurdish",
         "nophonvars": true,
         "region": "IQ",
@@ -62274,7 +62835,7 @@
     {
         "full": "ku-Arab-TR",
         "iana": [ "Kurdish" ],
-        "localname": "kurdî",
+        "localname": "کورمانجی",
         "name": "Kurdish",
         "names": [ "Badinani", "Badînî", "Bahdini", "Behdînî", "Eastern Kurmanji", "Ezdiki", "Kermancî", "Khorasani", "Khorasani Kurmanji", "Kirmanciya Jori", "Kirmancî", "Kordi", "Kordi Kormanji", "Kurdi", "Kurdish Kurmanji", "Kurdish, Northern", "Kurdiya jorîn", "Kurdmancî", "Kurdî", "Kurdî-Kurmancî", "Kurmancî", "Kurmanji", "Kurmanji Kurdish", "Kurmanjî", "Red Kurmanji" ],
         "region": "TR",
@@ -63675,13 +64236,14 @@
         "full": "kxc-Latn-ET",
         "iana": [ "Konso", "Khonso" ],
         "iso639_3": "kxc",
+        "localname": "Afaa Xonso",
         "localnames": [ "Afaa Xonso" ],
         "name": "Konso",
         "region": "ET",
         "regionname": "Ethiopia",
         "regions": [ "KE" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "kxc",
         "tags": [ "kxc-ET", "kxc-Latn" ],
         "windows": "kxc-Latn"
@@ -64025,12 +64587,13 @@
         "full": "kxv-Latn-IN",
         "iana": [ "Kuvi" ],
         "iso639_3": "kxv",
+        "localname": "kuvi",
         "name": "Kuvi",
         "names": [ "Khod", "Khondh", "Khondi", "Kodu", "Kond", "Kuvi Kond", "Kuvinga", "Kuwi" ],
         "region": "IN",
         "regionname": "India",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "kxv",
         "tags": [ "kxv-IN", "kxv-Latn" ],
         "windows": "kxv-Latn"
@@ -64039,13 +64602,14 @@
         "full": "kxv-Deva-IN",
         "iana": [ "Kuvi" ],
         "iso639_3": "kxv",
+        "localname": "कुवि",
         "name": "Kuvi",
         "names": [ "Khod", "Khondh", "Khondi", "Kodu", "Kond", "Kuvi Kond", "Kuvinga", "Kuwi" ],
         "nophonvars": true,
         "region": "IN",
         "regionname": "India",
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "kxv-Deva",
         "windows": "kxv-Deva"
     },
@@ -64053,13 +64617,14 @@
         "full": "kxv-Orya-IN",
         "iana": [ "Kuvi" ],
         "iso639_3": "kxv",
+        "localname": "କୁୱି",
         "name": "Kuvi",
         "names": [ "Khod", "Khondh", "Khondi", "Kodu", "Kond", "Kuvi Kond", "Kuvinga", "Kuwi" ],
         "nophonvars": true,
         "region": "IN",
         "regionname": "India",
         "script": "Orya",
-        "sldr": false,
+        "sldr": true,
         "tag": "kxv-Orya",
         "windows": "kxv-Orya"
     },
@@ -64068,6 +64633,7 @@
         "iana": [ "Kuvi" ],
         "iso639_3": "kxv",
         "latnnames": [ "Kuvi" ],
+        "localname": "కువి",
         "localnames": [ "కువి" ],
         "name": "Kuvi",
         "names": [ "Khod", "Khondh", "Khondi", "Kodu", "Kond", "Kuvi Kond", "Kuvinga", "Kuwi" ],
@@ -64075,7 +64641,7 @@
         "region": "IN",
         "regionname": "India",
         "script": "Telu",
-        "sldr": false,
+        "sldr": true,
         "tag": "kxv-Telu",
         "windows": "kxv-Telu"
     },
@@ -64347,13 +64913,14 @@
         "full": "kyj-Latn-PH",
         "iana": [ "Karao" ],
         "iso639_3": "kyj",
+        "localname": "Karao",
         "localnames": [ "Karao" ],
         "name": "Karao",
         "names": [ "Karaw" ],
         "region": "PH",
         "regionname": "Philippines",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "kyj",
         "tags": [ "kyj-Latn", "kyj-PH" ],
         "windows": "kyj-Latn"
@@ -65020,6 +65587,7 @@
         "full": "la-Latn-VA",
         "iana": [ "Latin" ],
         "iso639_3": "lat",
+        "localname": "Latina",
         "localnames": [ "Latina" ],
         "name": "Latin",
         "names": [ "Latina" ],
@@ -65027,7 +65595,7 @@
         "regionname": "Holy See (Vatican City State)",
         "regions": [ "IT" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "suppress": true,
         "tag": "la",
         "tags": [ "la-Latn", "la-VA" ],
@@ -65235,17 +65803,18 @@
     {
         "full": "lah-Mahj-IN",
         "iana": [ "Lahnda" ],
-        "iso639_3": "pnb",
-        "macrolang": "lah",
-        "name": "Punjabi, Western",
-        "names": [ "Lahanda", "Lahnda", "Lahndi", "Western Panjabi" ],
+        "iso639_3": "lah",
+        "name": "Lahnda",
+        "names": [ "Lahanda", "Lahndi", "Punjabi, Western", "Western Panjabi" ],
+        "nophonvars": true,
         "region": "IN",
         "regionname": "India",
+        "regions": [ "AE", "CA", "GB", "LY", "PK", "US" ],
         "script": "Mahj",
         "sldr": false,
-        "tag": "lah-Mahj-IN",
-        "tags": [ "pnb-Mahj", "pnb-Mahj-IN" ],
-        "windows": "lah-Mahj-IN"
+        "tag": "lah-Mahj",
+        "tags": [ "lah-IN", "pnb-Mahj", "pnb-Mahj-IN" ],
+        "windows": "lah-Mahj"
     },
     {
         "full": "lah-Zzzz-PK-x-landa",
@@ -65815,13 +66384,14 @@
         "iana": [ "Lohorung" ],
         "iso639_3": "lbr",
         "latnnames": [ "Lōhōruṅ" ],
+        "localname": "लोहोरुङ्",
         "localnames": [ "लोहोरुङ्" ],
         "name": "Lohorung",
         "names": [ "Loarung·Khanawa", "Loharung", "Loharung Khanawa", "Lohorong", "Lohorong Kha", "Lohorong Khap", "Lohorung Kha", "Lohorung Khap", "Lohrung", "Lohrung Khap", "Lohrung-Khanawa", "Lorung", "Lorung Kha", "Lorung Khap", "Northern Lorung", "Yakkhaba Khap", "Yakkhaba Lorung" ],
         "region": "NP",
         "regionname": "Nepal",
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "lbr",
         "tags": [ "lbr-Deva", "lbr-NP" ],
         "windows": "lbr-Deva"
@@ -65882,7 +66452,6 @@
         "sldr": true,
         "tag": "lbv",
         "tags": [ "lbv-Latn", "lbv-PG" ],
-        "unwritten": true,
         "windows": "lbv-Latn"
     },
     {
@@ -67158,6 +67727,7 @@
         "iana": [ "Lhomi" ],
         "iso639_3": "lhm",
         "latnnames": [ "Lhomi" ],
+        "localname": "ल्होमी",
         "localnames": [ "ल्होमी" ],
         "name": "Lhomi",
         "names": [ "Lhoket", "Lhomi dzyükki keccyok", "Lhomiki keccyok", "Shing Saapa", "Syingsaaba" ],
@@ -67165,7 +67735,7 @@
         "regionname": "Nepal",
         "regions": [ "CN", "IN" ],
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "lhm",
         "tags": [ "lhm-Deva", "lhm-NP" ],
         "windows": "lhm-Deva"
@@ -67442,6 +68012,7 @@
         "full": "lij-Latn-IT",
         "iana": [ "Ligurian" ],
         "iso639_3": "lij",
+        "localname": "ligure",
         "localnames": [ "Ligure" ],
         "name": "Ligurian",
         "names": [ "Ligure", "Monégasque", "Munegascu", "Zeneize" ],
@@ -67449,7 +68020,7 @@
         "regionname": "Italy",
         "regions": [ "FR", "MC" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "lij",
         "tags": [ "lij-IT", "lij-Latn" ],
         "windows": "lij-Latn"
@@ -68104,13 +68675,14 @@
         "full": "lld-Latn-IT",
         "iana": [ "Ladin" ],
         "iso639_3": "lld",
+        "localname": "ladin",
         "name": "Ladin",
         "names": [ "Dolomite", "Rhaeto-Romance" ],
         "region": "IT",
         "regionname": "Italy",
         "regions": [ "US" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "lld",
         "tags": [ "lld-IT", "lld-Latn" ],
         "windows": "lld-Latn"
@@ -68576,6 +69148,7 @@
         "full": "lmo-Latn-IT",
         "iana": [ "Lombard" ],
         "iso639_3": "lmo",
+        "localname": "Lombard",
         "localnames": [ "Lombard" ],
         "name": "Lombard",
         "names": [ "Lombardo" ],
@@ -68583,7 +69156,7 @@
         "regionname": "Italy",
         "regions": [ "CH", "US" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "lmo",
         "tags": [ "lmo-IT", "lmo-Latn" ],
         "windows": "lmo-Latn"
@@ -68704,7 +69277,6 @@
         "sldr": false,
         "tag": "lmy",
         "tags": [ "lmy-ID", "lmy-Latn" ],
-        "unwritten": true,
         "windows": "lmy-Latn"
     },
     {
@@ -68731,7 +69303,7 @@
         "names": [ "Ngala" ],
         "region": "CD",
         "regionname": "The Democratic Republic of the Congo",
-        "regions": [ "BE", "CF", "CG" ],
+        "regions": [ "AO", "BE", "CF", "CG" ],
         "script": "Latn",
         "sldr": true,
         "suppress": true,
@@ -68739,19 +69311,6 @@
         "tags": [ "ln-CD", "ln-Latn" ],
         "windows": "ln"
     },
-    {
-        "full": "ln-Latn-AO",
-        "iana": [ "Lingala" ],
-        "iso639_3": "lin",
-        "localnames": [ "Lingala" ],
-        "name": "Lingala",
-        "region": "AO",
-        "regionname": "Angola",
-        "script": "Latn",
-        "sldr": true,
-        "tag": "ln-AO",
-        "windows": "ln-Latn-AO"
-    },
     {
         "full": "lna-Latn-CF",
         "iana": [ "Langbashe" ],
@@ -69412,7 +69971,7 @@
         "region": "NP",
         "regionname": "Nepal",
         "script": "Tibt",
-        "sldr": false,
+        "sldr": true,
         "tag": "loy-Tibt",
         "windows": "loy-Tibt"
     },
@@ -69588,6 +70147,7 @@
         "iana": [ "Northern Luri" ],
         "iso639_3": "lrc",
         "latnnames": [ "Zön łôrī" ],
+        "localname": "لۊری شومالی",
         "localnames": [ "زۊن لٛوْری" ],
         "name": "Northern Luri",
         "region": "IQ",
@@ -70127,6 +70687,7 @@
         "full": "ltg-Latn-LV",
         "iana": [ "Latgalian" ],
         "iso639_3": "ltg",
+        "localname": "latgalīšu",
         "localnames": [ "Latgališu" ],
         "macrolang": "lv",
         "name": "Latgalian",
@@ -70135,7 +70696,7 @@
         "regionname": "Latvia",
         "regions": [ "CA", "RU", "US" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "ltg",
         "tags": [ "ltg-LV", "ltg-Latn", "lv-ltg", "lv-ltg-LV", "lv-ltg-Latn", "lv-ltg-Latn-LV" ],
         "windows": "ltg-Latn"
@@ -71069,6 +71630,20 @@
         "tags": [ "lzz-Latn", "lzz-TR" ],
         "windows": "lzz-Latn"
     },
+    {
+        "full": "lzz-Latn-GE",
+        "iana": [ "Laz" ],
+        "iso639_3": "lzz",
+        "localnames": [ "Lazuri" ],
+        "name": "Laz",
+        "names": [ "Chan", "Chanuri", "Chanzan", "Laze", "Lazuri", "Zan" ],
+        "region": "GE",
+        "regionname": "Georgia",
+        "script": "Latn",
+        "sldr": false,
+        "tag": "lzz-GE",
+        "windows": "lzz-Latn-GE"
+    },
     {
         "full": "lzz-Geor-GE",
         "iana": [ "Laz" ],
@@ -71083,20 +71658,6 @@
         "tag": "lzz-Geor",
         "windows": "lzz-Geor"
     },
-    {
-        "full": "lzz-Latn-GE",
-        "iana": [ "Laz" ],
-        "iso639_3": "lzz",
-        "localnames": [ "Lazuri" ],
-        "name": "Laz",
-        "names": [ "Chan", "Chanuri", "Chanzan", "Laze", "Lazuri", "Zan" ],
-        "region": "GE",
-        "regionname": "Georgia",
-        "script": "Latn",
-        "sldr": false,
-        "tag": "lzz-Latn-GE",
-        "windows": "lzz-Latn-GE"
-    },
     {
         "full": "maa-Latn-MX",
         "iana": [ "San Jerónimo Tecóatl Mazatec" ],
@@ -71158,6 +71719,21 @@
         "tag": "mad-Arab",
         "windows": "mad-Arab"
     },
+    {
+        "full": "mad-Java-ID",
+        "iana": [ "Madurese" ],
+        "iso639_3": "mad",
+        "name": "Madura",
+        "names": [ "Basa Mathura", "Madhura", "Madura-Bali", "Madurese", "Maduresisch" ],
+        "nophonvars": true,
+        "region": "ID",
+        "regionname": "Indonesia",
+        "regions": [ "SG" ],
+        "script": "Java",
+        "sldr": false,
+        "tag": "mad-Java",
+        "windows": "mad-Java"
+    },
     {
         "full": "mae-Latn-NG",
         "iana": [ "Bo-Rukul" ],
@@ -71354,6 +71930,7 @@
         "full": "mam-Latn-GT-x-central",
         "iana": [ "Mam" ],
         "iso639_3": "mam",
+        "localname": "Qyol Mam",
         "localnames": [ "Qyo:l", "Qyol Mam", "Yol Mam" ],
         "name": "Mam",
         "names": [ "B’anax Mam", "Kyol", "Qyo:l", "Qyol", "Qyol Mam", "Qyool", "Qyool Mam", "Yol Mam", "toj qyol" ],
@@ -71417,6 +71994,7 @@
         "full": "mam-Latn-GT-x-todos",
         "iana": [ "Mam" ],
         "iso639_3": "mam",
+        "localname": "Qyol Mam",
         "localnames": [ "Qyo:l", "Qyol Mam", "Yol Mam" ],
         "name": "Mam",
         "names": [ "B’anax Mam", "Kyol", "Qyo:l", "Qyol", "Qyol Mam", "Qyool", "Qyool Mam", "Yol Mam", "toj qyol" ],
@@ -71545,6 +72123,7 @@
         "full": "mas-Latn-TZ",
         "iana": [ "Masai" ],
         "iso639_3": "mas",
+        "localname": "Maa",
         "localnames": [ "Maa", "ɔl Maa" ],
         "name": "Maasai",
         "names": [ "Kimaasai", "Lumbwa", "Maa", "Masai", "Massai", "ɔl Maa" ],
@@ -72999,13 +73578,14 @@
         "full": "meh-Latn-MX",
         "iana": [ "Southwestern Tlaxiaco Mixtec" ],
         "iso639_3": "meh",
+        "localname": "Tu̱ꞌun káꞌánꞌ kájí",
         "localnames": [ "Tu̱ꞌun káꞌánꞌ kájí" ],
         "name": "Mixtec, Southwestern Tlaxiaco",
         "names": [ "Mixteco de Santiago Nuyoo", "Mixteco del Suroeste", "Mixteco del Suroeste de Tlaxiaco", "Mixteco del suroeste del distrito de Tlaxiaco", "Nuyoo Mixtec", "Southeastern Ocotepec Mixtec", "Southwestern Tlaxiaco Mixtec", "Tu̱ꞌun káꞌánꞌ kájí", "Tu’un savi" ],
         "region": "MX",
         "regionname": "Mexico",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "meh",
         "tags": [ "meh-Latn", "meh-MX" ],
         "windows": "meh-Latn"
@@ -73337,6 +73917,21 @@
         "tags": [ "mfa-Arab", "mfa-TH", "ms-mfa", "ms-mfa-Arab", "ms-mfa-Arab-TH", "ms-mfa-TH" ],
         "windows": "mfa-Arab"
     },
+    {
+        "full": "mfa-Latn-TH",
+        "iana": [ "Pattani Malay" ],
+        "iso639_3": "mfa",
+        "macrolang": "ms",
+        "name": "Malay, Pattani",
+        "names": [ "Jawi", "Jawi-Malay", "Kelantan-Pattani Malay", "Pattani Malay", "Yawi", "oré Jawi" ],
+        "region": "TH",
+        "regionname": "Thailand",
+        "script": "Latn",
+        "sldr": false,
+        "tag": "mfa-Latn",
+        "tags": [ "ms-mfa-Latn", "ms-mfa-Latn-TH" ],
+        "windows": "mfa-Latn"
+    },
     {
         "full": "mfa-Thai-TH",
         "iana": [ "Pattani Malay" ],
@@ -74049,12 +74644,13 @@
         "full": "mgm-Latn-TL",
         "iana": [ "Mambae" ],
         "iso639_3": "mgm",
+        "localname": "Mambae",
         "name": "Mambae",
         "names": [ "Mambai", "Manbae" ],
         "region": "TL",
         "regionname": "Timor-Leste",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "mgm",
         "tags": [ "mgm-Latn", "mgm-TL" ],
         "windows": "mgm-Latn"
@@ -74095,6 +74691,7 @@
         "iana": [ "Eastern Magar" ],
         "iso639_3": "mgp",
         "latnnames": [ "magar ḍhuṭ" ],
+        "localname": "मगर ढुट",
         "localnames": [ "मगर ढुट" ],
         "name": "Magar, Eastern",
         "names": [ "Eastern Magar", "Magar", "Magari", "Magarkura", "Magarí", "Magarī", "Mangar", "Mangari", "Manggar", "Mãgari" ],
@@ -74102,7 +74699,7 @@
         "regionname": "Nepal",
         "regions": [ "BT", "IN" ],
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "mgp",
         "tags": [ "mgp-Deva", "mgp-NP" ],
         "windows": "mgp-Deva"
@@ -74465,7 +75062,7 @@
         "region": "IT",
         "regionname": "Italy",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "mhn",
         "tags": [ "mhn-IT", "mhn-Latn" ],
         "unwritten": true,
@@ -74687,7 +75284,7 @@
         "full": "mic-Latn-CA",
         "iana": [ "Mi'kmaq", "Micmac" ],
         "iso639_3": "mic",
-        "localname": "L'nui'simk",
+        "localname": "Lʼnuiʼsuti",
         "localnames": [ "L'nui'simk", "Míkmawísimk" ],
         "name": "Mi’kmaq",
         "names": [ "L’nui’simk", "Mi'kmaq", "Micmac", "Miigmao", "Mikmak", "Mikmaw", "Mi’gmaq", "Mi’gmaw", "Mi’gmawi’simg", "Mi’kmag", "Mi’kmaw", "Mìgmaq", "Mìkmaq", "Míkmawísimk", "Restigouche" ],
@@ -76153,7 +76750,6 @@
         "sldr": false,
         "tag": "mln",
         "tags": [ "mln-Latn", "mln-SB" ],
-        "unwritten": true,
         "windows": "mln-Latn"
     },
     {
@@ -76420,7 +77016,6 @@
         "sldr": false,
         "tag": "mme",
         "tags": [ "mme-Latn", "mme-VU" ],
-        "unwritten": true,
         "windows": "mme-Latn"
     },
     {
@@ -76442,13 +77037,14 @@
         "full": "mmg-Latn-VU",
         "iana": [ "North Ambrym" ],
         "iso639_3": "mmg",
+        "localname": "Rral",
         "localnames": [ "Rral", "Tolongken" ],
         "name": "Ambrym, North",
         "names": [ "North Ambrym", "Rral", "Tolongken" ],
         "region": "VU",
         "regionname": "Vanuatu",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "mmg",
         "tags": [ "mmg-Latn", "mmg-VU" ],
         "unwritten": true,
@@ -76598,7 +77194,6 @@
         "sldr": false,
         "tag": "mmq",
         "tags": [ "mmq-Latn", "mmq-PG" ],
-        "unwritten": true,
         "windows": "mmq-Latn"
     },
     {
@@ -76765,13 +77360,26 @@
         "names": [ "Central Mongolian", "Halh", "Halha", "Kalkh", "Khalkh", "Khalkha", "Khalkha Mongolian", "Mongol", "Mongolian, Halh" ],
         "region": "CN",
         "regionname": "China",
-        "regions": [ "CZ", "KG", "MN", "RU", "TW", "US" ],
+        "regions": [ "CZ", "KG", "RU", "TW", "US" ],
         "script": "Mong",
         "sldr": true,
         "tag": "mn-CN",
         "tags": [ "drh-Mong", "drh-Mong-CN", "khk-Mong", "khk-Mong-CN", "mn-Mong" ],
         "windows": "mn-Mong"
     },
+    {
+        "full": "mn-Mong-MN",
+        "iana": [ "Mongolian" ],
+        "iso639_3": "mon",
+        "localname": "ᠮᠣᠩᠭᠣᠯ",
+        "name": "Mongolian",
+        "region": "MN",
+        "regionname": "Mongolia",
+        "script": "Mong",
+        "sldr": true,
+        "tag": "mn-Mong-MN",
+        "windows": "mn-Mong-MN"
+    },
     {
         "full": "mn-Phag-CN",
         "iana": [ "Mongolian" ],
@@ -76840,13 +77448,14 @@
         "full": "mnb-Latn-ID",
         "iana": [ "Muna" ],
         "iso639_3": "mnb",
+        "localname": "Wuna",
         "localnames": [ "Wuna" ],
         "name": "Muna",
         "names": [ "Wuna" ],
         "region": "ID",
         "regionname": "Indonesia",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "mnb",
         "tags": [ "mnb-ID", "mnb-Latn" ],
         "windows": "mnb-Latn"
@@ -76994,6 +77603,7 @@
         "full": "mni-Mtei-IN",
         "iana": [ "Manipuri" ],
         "iso639_3": "mni",
+        "localname": "ꯃꯤꯇꯩꯂꯣꯟ",
         "name": "Meitei",
         "names": [ "Kathe", "Kathi", "Manipuri", "Meetei", "Meeteilon", "Meitei Manipuri", "Meiteilon", "Meiteiron", "Meithe", "Meithei", "Menipuri", "Mitei", "Mithe", "Ponna" ],
         "nophonvars": true,
@@ -77001,7 +77611,7 @@
         "regionname": "India",
         "regions": [ "BD" ],
         "script": "Mtei",
-        "sldr": false,
+        "sldr": true,
         "tag": "mni-Mtei",
         "windows": "mni-Mtei"
     },
@@ -77311,6 +77921,7 @@
         "full": "moh-Latn-CA",
         "iana": [ "Mohawk" ],
         "iso639_3": "moh",
+        "localname": "Kanienʼkéha",
         "localnames": [ "Kanien'kéha" ],
         "name": "Mohawk",
         "names": [ "Kanienkehaka", "Kanien’kehaka", "Kanien’kéha" ],
@@ -77318,7 +77929,7 @@
         "regionname": "Canada",
         "regions": [ "US" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "moh",
         "tags": [ "moh-CA", "moh-Latn" ],
         "windows": "moh-Latn"
@@ -78650,13 +79261,14 @@
         "full": "mrn-Latn-SB",
         "iana": [ "Cheke Holo" ],
         "iso639_3": "mrn",
+        "localname": "Cheke Holo",
         "localnames": [ "Cheke Holo", "Holo" ],
         "name": "Cheke Holo",
         "names": [ "A’ara", "Cheke Tahati", "Holo", "Kubonitu" ],
         "region": "SB",
         "regionname": "Solomon Islands",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "mrn",
         "tags": [ "mrn-Latn", "mrn-SB" ],
         "windows": "mrn-Latn"
@@ -78894,24 +79506,38 @@
         "iana": [ "Malay (macrolanguage)" ],
         "iso639_3": "msa",
         "latnnames": [ "Bahasa Malaysia" ],
-        "localname": "بهاس مليسيا",
+        "localname": "بهاس ملايو",
         "localnames": [ "بهاس مليسيا" ],
         "name": "Malay (macrolanguage)",
         "names": [ "Bahasa Malaysia", "Bahasa Malayu", "Bahasa Melayu Malaysia", "Formal Malay", "Malay", "Malay, Standard", "Malaysian Malay", "Malayu", "Melayu", "Melayu Baku" ],
         "nophonvars": true,
         "region": "MY",
         "regionname": "Malaysia",
-        "regions": [ "BN", "SG" ],
+        "regions": [ "SG" ],
         "script": "Arab",
         "sldr": true,
         "tag": "ms-Arab",
         "tags": [ "ms-zsm-Arab", "ms-zsm-Arab-MY", "zsm-Arab", "zsm-Arab-MY" ],
         "windows": "ms-Arab"
     },
+    {
+        "full": "ms-Arab-BN",
+        "iana": [ "Malay (macrolanguage)" ],
+        "iso639_3": "msa",
+        "localname": "بهاس ملايو",
+        "name": "Malay (macrolanguage)",
+        "region": "BN",
+        "regionname": "Brunei Darussalam",
+        "script": "Arab",
+        "sldr": true,
+        "tag": "ms-Arab-BN",
+        "windows": "ms-Arab-BN"
+    },
     {
         "full": "ms-Latn-BN",
         "iana": [ "Malay (macrolanguage)" ],
         "iso639_3": "msa",
+        "localname": "Melayu",
         "name": "Malay (macrolanguage)",
         "region": "BN",
         "regionname": "Brunei Darussalam",
@@ -78967,6 +79593,7 @@
         "full": "ms-Latn-SG",
         "iana": [ "Malay (macrolanguage)" ],
         "iso639_3": "msa",
+        "localname": "Melayu",
         "name": "Malay (macrolanguage)",
         "region": "SG",
         "regionname": "Singapore",
@@ -80025,13 +80652,14 @@
         "full": "mus-Latn-US",
         "iana": [ "Creek" ],
         "iso639_3": "mus",
+        "localname": "Mvskoke",
         "localnames": [ "Mvskoke" ],
         "name": "Muskogee",
         "names": [ "Creek", "Maskoke", "Muscogee", "Mvskoke" ],
         "region": "US",
         "regionname": "United States",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "mus",
         "tags": [ "mus-Latn", "mus-US" ],
         "windows": "mus-Latn"
@@ -81325,12 +81953,13 @@
         "full": "mxx-Latn-CI",
         "iana": [ "Mahou", "Mawukakan" ],
         "iso639_3": "mxx",
+        "localname": "Maukakanŋ",
         "name": "Mahou",
         "names": [ "Mahu", "Maou", "Mau", "Mauka", "Mauke", "Mawu", "Mawukakan" ],
         "region": "CI",
         "regionname": "Côte d'Ivoire",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "mxx",
         "tags": [ "mxx-CI", "mxx-Latn" ],
         "unwritten": true,
@@ -81654,6 +82283,7 @@
         "iana": [ "Erzya" ],
         "iso639_3": "myv",
         "latnnames": [ "erzänj kelj" ],
+        "localname": "эрзянь кель",
         "localnames": [ "эрзянь кель" ],
         "name": "Erzya",
         "names": [ "Erza-Mordvin", "Erzia", "Erzya Mordva", "Erzya Mordvin", "Mordva", "Mordvin", "Mordvin-Erzya", "Mordvinian" ],
@@ -81661,7 +82291,7 @@
         "regionname": "Russian Federation",
         "regions": [ "AM", "AZ", "BY", "EE", "KG", "KZ", "LT", "LV", "TM", "UA", "UZ" ],
         "script": "Cyrl",
-        "sldr": false,
+        "sldr": true,
         "tag": "myv",
         "tags": [ "myv-Cyrl", "myv-RU" ],
         "windows": "myv-Cyrl"
@@ -81782,7 +82412,7 @@
         "region": "DZ",
         "regionname": "Algeria",
         "script": "Tfng",
-        "sldr": false,
+        "sldr": true,
         "tag": "mzb-Tfng",
         "windows": "mzb-Tfng"
     },
@@ -82463,7 +83093,7 @@
         "full": "nat-Latn-NG",
         "iana": [ "Ca̱hungwa̱rya̱", "Hungworo" ],
         "iso639_3": "nat",
-        "localname": "Cәhungwә̀ryə̀",
+        "localname": "Ca̱hungwa̱rya̱",
         "localnames": [ "Cәhungwә̀ryə̀" ],
         "name": "Cahungwarya",
         "names": [ "Ca̱hungwa̱rya̱", "Cәhungwә̀ryə̀", "Hungworo", "Ingwe", "Ingwo", "Ngwai", "Ngwe", "Ngwoi", "Nkwoi", "Ungwai", "Ungwe" ],
@@ -82539,6 +83169,7 @@
         "full": "nb-Latn-NO",
         "iana": [ "Norwegian Bokmål" ],
         "iso639_3": "nob",
+        "localname": "norsk bokmål",
         "macrolang": "no",
         "name": "Norwegian Bokmål",
         "region": "NO",
@@ -82604,7 +83235,6 @@
         "sldr": false,
         "tag": "nbb",
         "tags": [ "nbb-Latn", "nbb-NG" ],
-        "unwritten": true,
         "windows": "nbb-Latn"
     },
     {
@@ -82786,7 +83416,6 @@
         "sldr": false,
         "tag": "nbp",
         "tags": [ "nbp-Latn", "nbp-NG" ],
-        "unwritten": true,
         "windows": "nbp-Latn"
     },
     {
@@ -83191,13 +83820,14 @@
         "full": "ncr-Latn-CM",
         "iana": [ "Ncane" ],
         "iso639_3": "ncr",
+        "localname": "Nchane",
         "localnames": [ "Nchane" ],
         "name": "Nchane",
         "names": [ "Cane", "Ncane", "Nchaney", "Nchanti", "Ntshanti" ],
         "region": "CM",
         "regionname": "Cameroon",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "ncr",
         "tags": [ "ncr-CM", "ncr-Latn" ],
         "windows": "ncr-Latn"
@@ -83572,6 +84202,7 @@
         "full": "nds-Latn-NL",
         "iana": [ "Low German", "Low Saxon" ],
         "iso639_3": "nds",
+        "localname": "Neddersass’sch",
         "localnames": [ "Nedderdüütsch", "Plattdüütsch" ],
         "name": "Low German",
         "names": [ "Low Saxon" ],
@@ -83755,6 +84386,7 @@
         "full": "ne-Deva-IN",
         "iana": [ "Nepali (macrolanguage)" ],
         "iso639_3": "nep",
+        "localname": "नेपाली",
         "name": "Nepali (macrolanguage)",
         "region": "IN",
         "regionname": "India",
@@ -83878,7 +84510,6 @@
         "sldr": false,
         "tag": "neg",
         "tags": [ "neg-Cyrl", "neg-RU" ],
-        "unwritten": true,
         "windows": "neg-Cyrl"
     },
     {
@@ -83949,7 +84580,6 @@
         "sldr": false,
         "tag": "nem",
         "tags": [ "nem-Latn", "nem-NC" ],
-        "unwritten": true,
         "windows": "nem-Latn"
     },
     {
@@ -84135,12 +84765,13 @@
         "full": "ney-Latn-CI",
         "iana": [ "Neyo" ],
         "iso639_3": "ney",
+        "localname": "Nɩ́wɔlɩ",
         "name": "Neyo",
         "names": [ "Gwibwen", "Towi" ],
         "region": "CI",
         "regionname": "Côte d'Ivoire",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "ney",
         "tags": [ "ney-CI", "ney-Latn" ],
         "unwritten": true,
@@ -84902,6 +85533,7 @@
         "full": "nhw-Latn-MX",
         "iana": [ "Western Huasteca Nahuatl" ],
         "iso639_3": "nhw",
+        "localname": "Nahuatl",
         "localnames": [ "Nahuatl" ],
         "name": "Nahuatl, Western Huasteca",
         "names": [ "Mexicano", "Nahuatl", "Náhuatl de Tamazunchale", "Náhuatl de la Huasteca Occidental", "Nāhuatlahtōlli", "Western Huasteca Aztec", "Western Huasteca Nahuatl" ],
@@ -84933,6 +85565,7 @@
         "full": "nhx-Latn-MX-x-tatahui",
         "iana": [ "Nahuatl, Isthmus-Mecayapan" ],
         "iso639_3": "nhx",
+        "localname": "Melaꞌtájto̱l",
         "localnames": [ "Melaꞌtájto̱l" ],
         "name": "Nahuatl, Isthmus-Mecayapan",
         "names": [ "Isthmus Aztec-Mecayapan", "Isthmus Nahuat", "Isthmus Nahuatl", "Mecayapan Isthmus Nahuatl", "Mejicano", "Mejicano de Mecayapan", "Mejicano del Istmo", "Melaꞌtájto̱l", "Mexicano", "Mexicano de Mecayapan", "Nahuatl del Istmo", "Náhuatl", "Náhuatl sur de Veracruz" ],
@@ -84948,7 +85581,7 @@
         "full": "nhy-Latn-MX",
         "iana": [ "Northern Oaxaca Nahuatl" ],
         "iso639_3": "nhy",
-        "localname": "Nāhuatlahtōlli",
+        "localname": "Nahuatlahtolli",
         "localnames": [ "Nāhuatlahtōlli" ],
         "name": "Nahuatl, Northern Oaxaca",
         "names": [ "Mexicano", "Nahuatl de Oaxaca", "Northern Oaxaca Nahuatl", "Náhuatl", "Náhuatl del Norte de Oaxaca", "Nāhuatlahtōlli" ],
@@ -85023,12 +85656,13 @@
         "full": "nie-Latn-TD",
         "iana": [ "Niellim" ],
         "iso639_3": "nie",
+        "localname": "Lua",
         "name": "Niellim",
         "names": [ "Lua", "Lwaà", "Mjillem", "Nielim", "Nyilem" ],
         "region": "TD",
         "regionname": "Chad",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "nie",
         "tags": [ "nie-Latn", "nie-TD" ],
         "windows": "nie-Latn"
@@ -85067,6 +85701,7 @@
         "full": "nih-Latn-TZ",
         "iana": [ "Nyiha (Tanzania)" ],
         "iso639_3": "nih",
+        "localname": "Shinyiha",
         "localnames": [ "Ishinyiha", "Shinyiha" ],
         "name": "Nyiha, Tanzania",
         "names": [ "Ishinyiha", "Isinyixa", "Kinyiha", "Nyiha", "Nyiha (Tanzania)", "Nyika", "Nyixa", "Shinyiha" ],
@@ -85074,7 +85709,7 @@
         "regionname": "United Republic of Tanzania",
         "regions": [ "ZM" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "nih",
         "tags": [ "nih-Latn", "nih-TZ" ],
         "windows": "nih-Latn"
@@ -85690,7 +86325,6 @@
         "sldr": false,
         "tag": "nke",
         "tags": [ "nke-Latn", "nke-SB" ],
-        "unwritten": true,
         "windows": "nke-Latn"
     },
     {
@@ -85875,6 +86509,7 @@
         "full": "nkr-Latn-FM",
         "iana": [ "Nukuoro" ],
         "iso639_3": "nkr",
+        "localname": "Nukuoro",
         "localnames": [ "Nukuoro" ],
         "name": "Nukuoro",
         "names": [ "Nuguor", "Nukoro" ],
@@ -85882,7 +86517,7 @@
         "regionname": "Federated States of Micronesia",
         "regions": [ "US" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "nkr",
         "tags": [ "nkr-FM", "nkr-Latn" ],
         "windows": "nkr-Latn"
@@ -86015,6 +86650,7 @@
         "full": "nl-Latn-AW",
         "iana": [ "Dutch", "Flemish" ],
         "iso639_3": "nld",
+        "localname": "Nederlands",
         "localnames": [ "Nederlands" ],
         "name": "Dutch",
         "names": [ "Flemish" ],
@@ -86029,6 +86665,7 @@
         "full": "nl-Latn-BE",
         "iana": [ "Dutch", "Flemish" ],
         "iso639_3": "nld",
+        "localname": "Nederlands",
         "localnames": [ "Nederlands" ],
         "name": "Dutch",
         "names": [ "Flemish" ],
@@ -86043,6 +86680,7 @@
         "full": "nl-Latn-BQ",
         "iana": [ "Dutch", "Flemish" ],
         "iso639_3": "nld",
+        "localname": "Nederlands",
         "localnames": [ "Nederlands" ],
         "name": "Dutch",
         "names": [ "Flemish" ],
@@ -86072,6 +86710,7 @@
         "full": "nl-Latn-CW",
         "iana": [ "Dutch", "Flemish" ],
         "iso639_3": "nld",
+        "localname": "Nederlands",
         "localnames": [ "Nederlands" ],
         "name": "Dutch",
         "names": [ "Flemish" ],
@@ -86086,6 +86725,7 @@
         "full": "nl-Latn-SR",
         "iana": [ "Dutch", "Flemish" ],
         "iso639_3": "nld",
+        "localname": "Nederlands",
         "localnames": [ "Nederlands" ],
         "name": "Dutch",
         "names": [ "Flemish" ],
@@ -86100,6 +86740,7 @@
         "full": "nl-Latn-SX",
         "iana": [ "Dutch", "Flemish" ],
         "iso639_3": "nld",
+        "localname": "Nederlands",
         "localnames": [ "Nederlands" ],
         "name": "Dutch",
         "names": [ "Flemish" ],
@@ -86383,13 +87024,14 @@
         "full": "nmb-Latn-VU",
         "iana": [ "Big Nambas", "V'ënen Taut" ],
         "iso639_3": "nmb",
+        "localname": "V'ənen Taut",
         "localnames": [ "V'ənen Taut" ],
         "name": "V’ënen Taut",
         "names": [ "Big Nambas", "V'ënen Taut", "V’ənen Taut" ],
         "region": "VU",
         "regionname": "Vanuatu",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "nmb",
         "tags": [ "nmb-Latn", "nmb-VU" ],
         "windows": "nmb-Latn"
@@ -87837,13 +88479,14 @@
         "full": "nqo-Nkoo-GN",
         "iana": [ "N'Ko", "N’Ko" ],
         "iso639_3": "nqo",
+        "localname": "ߒߞߏ",
         "name": "N’Ko",
         "names": [ "N'Ko" ],
         "region": "GN",
         "regionname": "Guinea",
         "regions": [ "BF", "CI", "GM", "LR", "ML", "SL", "SN" ],
         "script": "Nkoo",
-        "sldr": false,
+        "sldr": true,
         "suppress": true,
         "tag": "nqo",
         "tags": [ "nqo-GN", "nqo-Nkoo" ],
@@ -88760,13 +89403,14 @@
         "full": "ntk-Latn-TZ",
         "iana": [ "Ikoma-Nata-Isenye" ],
         "iso639_3": "ntk",
+        "localname": "Eghiikoma",
         "localnames": [ "Eghiikoma" ],
         "name": "Ikoma-Nata-Isenye",
         "names": [ "Eghiikoma" ],
         "region": "TZ",
         "regionname": "United Republic of Tanzania",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "ntk",
         "tags": [ "ntk-Latn", "ntk-TZ" ],
         "windows": "ntk-Latn"
@@ -89075,13 +89719,14 @@
         "full": "num-Latn-TO",
         "iana": [ "Niuafo'ou" ],
         "iso639_3": "num",
+        "localname": "Niuafo'ou",
         "localnames": [ "Niuafo'ou" ],
         "name": "Niuafo’ou",
         "names": [ "Ko te lea faka Niuafoʻou", "Niuafo'ou", "Niuafoʻouan" ],
         "region": "TO",
         "regionname": "Tonga",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "num",
         "tags": [ "num-Latn", "num-TO" ],
         "windows": "num-Latn"
@@ -89302,13 +89947,14 @@
         "full": "nv-Latn-US",
         "iana": [ "Navajo", "Navaho" ],
         "iso639_3": "nav",
+        "localname": "Diné Bizaad",
         "localnames": [ "Diné Bizaad" ],
         "name": "Navajo",
         "names": [ "Diné", "Diné Bizaad", "Naabeehó bizaad", "Navaho" ],
         "region": "US",
         "regionname": "United States",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "nv",
         "tags": [ "nv-Latn", "nv-US" ],
         "windows": "nv-Latn"
@@ -89852,7 +90498,7 @@
         "full": "ny-Latn-MW",
         "iana": [ "Nyanja", "Chewa", "Chichewa" ],
         "iso639_3": "nya",
-        "localname": "Chicheŵa",
+        "localname": "Nyanja",
         "localnames": [ "Chicheŵa" ],
         "name": "Chichewa",
         "names": [ "Chewa", "Chicheŵa", "Chinyanja", "CiNyanja", "Cinianja", "Cinyanja", "Nyanja", "Nyanja-Chewa" ],
@@ -90636,6 +91282,7 @@
         "full": "oc-Latn-ES",
         "iana": [ "Occitan (post 1500)" ],
         "iso639_3": "oci",
+        "localname": "occitan",
         "name": "Occitan (post 1500)",
         "region": "ES",
         "regionname": "Spain",
@@ -91124,13 +91771,14 @@
         "full": "ojv-Latn-SB",
         "iana": [ "Ontong Java" ],
         "iso639_3": "ojv",
+        "localname": "Luangiua",
         "localnames": [ "Luangiua" ],
         "name": "Ontong Java",
         "names": [ "Leuangiua", "Lord Howe", "Luangiua", "Luaniua" ],
         "region": "SB",
         "regionname": "Solomon Islands",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "ojv",
         "tags": [ "ojv-Latn", "ojv-SB" ],
         "windows": "ojv-Latn"
@@ -91443,6 +92091,86 @@
         "tags": [ "okv-Latn", "okv-PG" ],
         "windows": "okv-Latn"
     },
+    {
+        "full": "okv-Latn-PG-x-ahija",
+        "iana": [ "Orokaiva - Ahija" ],
+        "iso639_3": "okv",
+        "localnames": [ "Orokaiva" ],
+        "name": "Orokaiva",
+        "names": [ "Orokaiva - Ahija" ],
+        "region": "PG",
+        "regionname": "Papua New Guinea",
+        "rod": "15340",
+        "script": "Latn",
+        "sldr": false,
+        "tag": "okv-x-ahija",
+        "tags": [ "okv-Latn-x-ahija", "okv-PG-x-ahija" ],
+        "windows": "okv-Latn-x-ahija"
+    },
+    {
+        "full": "okv-Latn-PG-x-ajeka",
+        "iana": [ "Orokaiva - Ajeka" ],
+        "iso639_3": "okv",
+        "localnames": [ "Orokaiva" ],
+        "name": "Orokaiva",
+        "names": [ "Orokaiva - Ajeka" ],
+        "region": "PG",
+        "regionname": "Papua New Guinea",
+        "rod": "15339",
+        "script": "Latn",
+        "sldr": false,
+        "tag": "okv-x-ajeka",
+        "tags": [ "okv-Latn-x-ajeka", "okv-PG-x-ajeka" ],
+        "windows": "okv-Latn-x-ajeka"
+    },
+    {
+        "full": "okv-Latn-PG-x-etija",
+        "iana": [ "Orokaiva - Etija" ],
+        "iso639_3": "okv",
+        "localnames": [ "Orokaiva" ],
+        "name": "Orokaiva",
+        "names": [ "Orokaiva - Etija" ],
+        "region": "PG",
+        "regionname": "Papua New Guinea",
+        "rod": "15341",
+        "script": "Latn",
+        "sldr": false,
+        "tag": "okv-x-etija",
+        "tags": [ "okv-Latn-x-etija", "okv-PG-x-etija" ],
+        "windows": "okv-Latn-x-etija"
+    },
+    {
+        "full": "okv-Latn-PG-x-harava",
+        "iana": [ "Orokaiva - Harava" ],
+        "iso639_3": "okv",
+        "localnames": [ "Orokaiva" ],
+        "name": "Orokaiva",
+        "names": [ "Orokaiva - Harava" ],
+        "region": "PG",
+        "regionname": "Papua New Guinea",
+        "rod": "15342",
+        "script": "Latn",
+        "sldr": false,
+        "tag": "okv-x-harava",
+        "tags": [ "okv-Latn-x-harava", "okv-PG-x-harava" ],
+        "windows": "okv-Latn-x-harava"
+    },
+    {
+        "full": "okv-Latn-PG-x-kokoda",
+        "iana": [ "Orokaiva - Kokoda" ],
+        "iso639_3": "okv",
+        "localnames": [ "Orokaiva" ],
+        "name": "Orokaiva",
+        "names": [ "Orokaiva - Kokoda" ],
+        "region": "PG",
+        "regionname": "Papua New Guinea",
+        "rod": "15344",
+        "script": "Latn",
+        "sldr": false,
+        "tag": "okv-x-kokoda",
+        "tags": [ "okv-Latn-x-kokoda", "okv-PG-x-kokoda" ],
+        "windows": "okv-Latn-x-kokoda"
+    },
     {
         "full": "okx-Latn-NG",
         "iana": [ "Okpe (Northwestern Edo)" ],
@@ -91670,6 +92398,7 @@
         "full": "om-Latn-KE",
         "iana": [ "Oromo" ],
         "iso639_3": "orm",
+        "localname": "Oromoo",
         "name": "Oromo",
         "region": "KE",
         "regionname": "Kenya",
@@ -91909,6 +92638,19 @@
         "tags": [ "omy-MY", "omy-Zyyy" ],
         "windows": "omy-Zyyy"
     },
+    {
+        "full": "omy-Kawi-MY",
+        "iana": [ "Old Malay" ],
+        "iso639_3": "omy",
+        "name": "Old Malay",
+        "nophonvars": true,
+        "region": "MY",
+        "regionname": "Malaysia",
+        "script": "Kawi",
+        "sldr": false,
+        "tag": "omy-Kawi",
+        "windows": "omy-Kawi"
+    },
     {
         "full": "ona-Latn-AR",
         "iana": [ "Ona" ],
@@ -92653,6 +93395,7 @@
         "iana": [ "Ossetian", "Ossetic" ],
         "iso639_3": "oss",
         "latnnames": [ "iron ævzag" ],
+        "localname": "ирон",
         "localnames": [ "ирон æвзаг" ],
         "name": "Ossetian",
         "names": [ "Ossetic" ],
@@ -92667,12 +93410,13 @@
         "full": "osa-Osge-US",
         "iana": [ "Osage" ],
         "iso639_3": "osa",
+        "localname": "𐓏𐓘𐓻𐓘𐓻𐓟",
         "name": "Osage",
         "names": [ "Wazhazhe", "Wazhazhe ie" ],
         "region": "US",
         "regionname": "United States",
         "script": "Osge",
-        "sldr": false,
+        "sldr": true,
         "tag": "osa",
         "tags": [ "osa-Osge", "osa-US" ],
         "windows": "osa-Osge"
@@ -92744,6 +93488,19 @@
         "tags": [ "osn-Sund", "osn-XX" ],
         "windows": "osn-Sund"
     },
+    {
+        "full": "osn-Kawi-XX",
+        "iana": [ "Old Sundanese" ],
+        "iso639_3": "osn",
+        "name": "Old Sundanese",
+        "nophonvars": true,
+        "obsolete": true,
+        "region": "XX",
+        "script": "Kawi",
+        "sldr": false,
+        "tag": "osn-Kawi",
+        "windows": "osn-Kawi"
+    },
     {
         "full": "oso-Latn-NG",
         "iana": [ "Ososo" ],
@@ -93402,6 +94159,7 @@
         "full": "pac-Latn-VN-x-diacado",
         "iana": [ "Pacoh (Cado dialect)" ],
         "iso639_3": "pac",
+        "localname": "Cang Pacóuh",
         "localnames": [ "Cang Pacóuh" ],
         "name": "Pacoh",
         "names": [ "Bo River Van Kieu", "Cang Pacóuh", "Ganai", "Pa Co", "Paco", "Pacoh (Cado dialect)", "Pako", "Poko", "Pokoh" ],
@@ -93612,6 +94370,7 @@
         "full": "pap-Latn-AW",
         "iana": [ "Papiamento" ],
         "iso639_3": "pap",
+        "localname": "Papiamentu",
         "localnames": [ "Papiamentu" ],
         "name": "Papiamento",
         "names": [ "Curassese", "Curaçoleño", "Papiam", "Papiamen", "Papiamentoe", "Papiamentu" ],
@@ -93619,7 +94378,7 @@
         "regionname": "Aruba",
         "regions": [ "BQ", "CW", "NL", "PR", "SX", "US", "VI" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "pap",
         "tags": [ "pap-AW", "pap-Latn" ],
         "windows": "pap-Latn"
@@ -94144,6 +94903,7 @@
         "iana": [ "Ruching Palaung" ],
         "iso639_3": "pce",
         "latnnames": [ "Daraarin" ],
+        "localname": "ဒါအာင်",
         "localnames": [ "ဒါအာင်" ],
         "name": "Palaung, Ruching",
         "names": [ "Da’ang", "De’ang", "Di-Ang", "Dlang", "Ngwe Palaung", "Palay", "Pale", "Pale Palaung", "Ru-Jing Palaung", "Ruching Palaung", "Silver Palaung", "Southern Ta’ang" ],
@@ -94151,7 +94911,7 @@
         "regionname": "Myanmar",
         "regions": [ "CN" ],
         "script": "Mymr",
-        "sldr": false,
+        "sldr": true,
         "tag": "pce",
         "tags": [ "pce-MM", "pce-Mymr" ],
         "windows": "pce-Mymr"
@@ -94160,13 +94920,14 @@
         "full": "pce-Thai-TH",
         "iana": [ "Ruching Palaung" ],
         "iso639_3": "pce",
+        "localname": "รูจีง ดาอาง",
         "name": "Palaung, Pale",
         "names": [ "Di-Ang", "Ngwe Palaung", "Palay", "Pale", "Ruching Palaung", "Silver Palaung", "Southern Palaung", "Ta-Ang" ],
         "nophonvars": true,
         "region": "TH",
         "regionname": "Thailand",
         "script": "Thai",
-        "sldr": false,
+        "sldr": true,
         "tag": "pce-Thai",
         "tags": [ "pce-TH" ],
         "windows": "pce-Thai"
@@ -94861,16 +95622,30 @@
         "tags": [ "pgd-Khar", "pgd-PK" ],
         "windows": "pgd-Khar"
     },
+    {
+        "full": "pgd-Latn-PK",
+        "iana": [ "Gāndhārī" ],
+        "iso639_3": "pgd",
+        "name": "Gāndhārī",
+        "region": "PK",
+        "regionname": "Pakistan",
+        "regions": [ "AF" ],
+        "script": "Latn",
+        "sldr": false,
+        "tag": "pgd-Latn",
+        "windows": "pgd-Latn"
+    },
     {
         "full": "pgg-Deva-IN",
         "iana": [ "Pangwali" ],
         "iso639_3": "pgg",
+        "localname": "पंगवाड़ी",
         "name": "Pangwali",
         "names": [ "Pahari", "Pangi", "Pangwali Pahari" ],
         "region": "IN",
         "regionname": "India",
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "pgg",
         "tags": [ "pgg-Deva", "pgg-IN" ],
         "windows": "pgg-Deva"
@@ -95140,6 +95915,7 @@
         "full": "phr-Arab-PK",
         "iana": [ "Pahari-Potwari" ],
         "iso639_3": "phr",
+        "localname": "پہاڑی-پوٹھواری",
         "macrolang": "lah",
         "name": "Pahari-Potwari",
         "names": [ "Mirpur", "Mirpur Panjabi", "Mirpur Punjabi", "Mirpuri", "Pahari", "Pahari-Pothowari", "Pothohari", "Potohari", "Potwari" ],
@@ -95147,7 +95923,7 @@
         "regionname": "Pakistan",
         "regions": [ "GB", "IN" ],
         "script": "Arab",
-        "sldr": false,
+        "sldr": true,
         "tag": "phr",
         "tags": [ "phr-Arab", "phr-PK", "pmu", "pmu-Arab", "pmu-Arab-PK", "pmu-PK" ],
         "windows": "phr-Arab"
@@ -95870,13 +96646,14 @@
         "iana": [ "Attapady Kurumba" ],
         "iso639_3": "pkr",
         "latnnames": [ "Pāl Kuṟumpa" ],
+        "localname": "പാല് കുറുമ്പ",
         "localnames": [ "പാല് കുറുമ്പ" ],
         "name": "Kurumba, Attapady",
         "names": [ "Attapady Kurumba", "Kurumba", "Pal Kurumba" ],
         "region": "IN",
         "regionname": "India",
         "script": "Mlym",
-        "sldr": false,
+        "sldr": true,
         "tag": "pkr",
         "tags": [ "pkr-IN", "pkr-Mlym" ],
         "windows": "pkr-Mlym"
@@ -97181,6 +97958,7 @@
         "full": "pov-Latn-GW",
         "iana": [ "Upper Guinea Crioulo" ],
         "iso639_3": "pov",
+        "localname": "Kiriol",
         "localnames": [ "Kiriol" ],
         "name": "Guinea-Bissau Creole",
         "names": [ "Casamance Creole", "Casamancese Creole", "Casamançais", "Crioulo", "Crioulo de Guinea-Bissau", "Créole", "Créole afro-portugais de Casamance", "Créole casamançais", "Créole de Casamance", "Guinea-Bissau Kriyol", "Guineense", "Kiriol", "Kriol", "Kriulo", "Kriyol", "Portuguese Creole", "Upper Guinea Crioulo" ],
@@ -97188,7 +97966,7 @@
         "regionname": "Guinea-Bissau",
         "regions": [ "GM", "PT", "SN", "US" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "pov",
         "tags": [ "pov-GW", "pov-Latn" ],
         "windows": "pov-Latn"
@@ -97812,6 +98590,7 @@
         "full": "ps-Arab-PK",
         "iana": [ "Pushto", "Pashto" ],
         "iso639_3": "pus",
+        "localname": "پښتو",
         "name": "Pushto",
         "names": [ "Pashto" ],
         "region": "PK",
@@ -98236,7 +99015,7 @@
         "names": [ "Portugais", "Portugués del Uruguay", "Português", "Portunhol", "Portuñol", "Uruguayan Portuguese", "portugués" ],
         "region": "BR",
         "regionname": "Brazil",
-        "regions": [ "AD", "AG", "AU", "BE", "BM", "CA", "CG", "CH", "CW", "DE", "ES", "FI", "FR", "GG", "GQ", "GY", "IN", "JE", "JM", "MW", "PY", "RU", "SN", "SR", "US", "UY", "VC", "VE", "ZA", "ZM" ],
+        "regions": [ "AD", "AG", "AU", "BE", "BM", "CA", "CG", "CW", "DE", "ES", "FI", "FR", "GG", "GY", "IN", "JE", "JM", "MW", "PY", "RU", "SN", "SR", "US", "UY", "VC", "VE", "ZA", "ZM" ],
         "script": "Latn",
         "sldr": true,
         "suppress": true,
@@ -98249,6 +99028,7 @@
         "full": "pt-Latn-AO",
         "iana": [ "Portuguese" ],
         "iso639_3": "por",
+        "localname": "português",
         "localnames": [ "Português" ],
         "name": "Portuguese",
         "region": "AO",
@@ -98274,10 +99054,26 @@
         "tag": "pt-Brai",
         "windows": "pt-Brai"
     },
+    {
+        "full": "pt-Latn-CH",
+        "iana": [ "Portuguese" ],
+        "iso639_3": "por",
+        "localname": "português",
+        "localnames": [ "Português" ],
+        "name": "Portuguese",
+        "region": "CH",
+        "regionname": "Switzerland",
+        "script": "Latn",
+        "sldr": true,
+        "tag": "pt-CH",
+        "variants": [ "abl1943", "ai1990", "colb1945" ],
+        "windows": "pt-Latn-CH"
+    },
     {
         "full": "pt-Latn-CV",
         "iana": [ "Portuguese" ],
         "iso639_3": "por",
+        "localname": "português",
         "localnames": [ "Português" ],
         "name": "Portuguese",
         "region": "CV",
@@ -98288,10 +99084,26 @@
         "variants": [ "abl1943", "ai1990", "colb1945" ],
         "windows": "pt-Latn-CV"
     },
+    {
+        "full": "pt-Latn-GQ",
+        "iana": [ "Portuguese" ],
+        "iso639_3": "por",
+        "localname": "português",
+        "localnames": [ "Português" ],
+        "name": "Portuguese",
+        "region": "GQ",
+        "regionname": "Equatorial Guinea",
+        "script": "Latn",
+        "sldr": true,
+        "tag": "pt-GQ",
+        "variants": [ "abl1943", "ai1990", "colb1945" ],
+        "windows": "pt-Latn-GQ"
+    },
     {
         "full": "pt-Latn-GW",
         "iana": [ "Portuguese" ],
         "iso639_3": "por",
+        "localname": "português",
         "localnames": [ "Português" ],
         "name": "Portuguese",
         "region": "GW",
@@ -98306,6 +99118,7 @@
         "full": "pt-Latn-LU",
         "iana": [ "Portuguese" ],
         "iso639_3": "por",
+        "localname": "português",
         "localnames": [ "Português" ],
         "name": "Portuguese",
         "region": "LU",
@@ -98320,6 +99133,7 @@
         "full": "pt-Latn-MO",
         "iana": [ "Portuguese" ],
         "iso639_3": "por",
+        "localname": "português",
         "localnames": [ "Português" ],
         "name": "Portuguese",
         "region": "MO",
@@ -98334,6 +99148,7 @@
         "full": "pt-Latn-MZ",
         "iana": [ "Portuguese" ],
         "iso639_3": "por",
+        "localname": "português",
         "localnames": [ "Português" ],
         "name": "Portuguese",
         "region": "MZ",
@@ -98348,7 +99163,7 @@
         "full": "pt-Latn-PT",
         "iana": [ "Portuguese" ],
         "iso639_3": "por",
-        "localname": "português europeu",
+        "localname": "português",
         "localnames": [ "Português" ],
         "name": "Portuguese",
         "region": "PT",
@@ -98363,6 +99178,7 @@
         "full": "pt-Latn-ST",
         "iana": [ "Portuguese" ],
         "iso639_3": "por",
+        "localname": "português",
         "localnames": [ "Português" ],
         "name": "Portuguese",
         "region": "ST",
@@ -98377,6 +99193,7 @@
         "full": "pt-Latn-TL",
         "iana": [ "Portuguese" ],
         "iso639_3": "por",
+        "localname": "português",
         "localnames": [ "Português" ],
         "name": "Portuguese",
         "region": "TL",
@@ -99137,13 +99954,14 @@
         "full": "pyy-Latn-MM",
         "iana": [ "Pyen" ],
         "iso639_3": "pyy",
+        "localname": "Bisu",
         "localnames": [ "Bisu" ],
         "name": "Pyen",
         "names": [ "Bisu", "Biˎ suˎ", "Hpinba", "Hpyin", "Misu", "Phen", "Pyin" ],
         "region": "MM",
         "regionname": "Myanmar",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "pyy",
         "tags": [ "pyy-Latn", "pyy-MM" ],
         "windows": "pyy-Latn"
@@ -99214,7 +100032,7 @@
     {
         "full": "qu-Latn-BO",
         "iana": [ "Quechua" ],
-        "localname": "Uralan Buliwya runasimi",
+        "localname": "Runasimi",
         "localnames": [ "Qhichwa" ],
         "name": "Quechua",
         "names": [ "Central Bolivian Quechua", "Cochabamba Quechua", "Qhichwa", "Qhishwa", "Quechua Boliviano", "Quechua, South Bolivian", "Uralan Buliwya runasimi" ],
@@ -99231,6 +100049,7 @@
         "full": "qu-Latn-EC",
         "iana": [ "Quechua" ],
         "iso639_3": "que",
+        "localname": "Runasimi",
         "name": "Quechua",
         "region": "EC",
         "regionname": "Ecuador",
@@ -99275,7 +100094,7 @@
         "full": "quc-Latn-GT",
         "iana": [ "K'iche'", "Quiché" ],
         "iso639_3": "quc",
-        "localname": "Qach'abel",
+        "localname": "Kʼicheʼ",
         "localnames": [ "K'iche'", "Qach'abel" ],
         "name": "K’iche’",
         "names": [ "Central K’iche’", "Central Quiché", "Chiquel", "K'iche'", "Qach’abel", "Quiché" ],
@@ -99886,6 +100705,7 @@
         "full": "qwa-Latn-PE",
         "iana": [ "Corongo Ancash Quechua" ],
         "iso639_3": "qwa",
+        "localname": "Llaqwash",
         "localnames": [ "Llaqwash" ],
         "macrolang": "qu",
         "name": "Quechua, Corongo Ancash",
@@ -99893,7 +100713,7 @@
         "region": "PE",
         "regionname": "Peru",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "qwa",
         "tags": [ "qwa-Latn", "qwa-PE" ],
         "windows": "qwa-Latn"
@@ -100776,7 +101596,7 @@
         "regionname": "Myanmar",
         "regions": [ "CN" ],
         "script": "Mymr",
-        "sldr": false,
+        "sldr": true,
         "tag": "rbb",
         "tags": [ "rbb-MM", "rbb-Mymr" ],
         "windows": "rbb-Mymr"
@@ -101184,13 +102004,14 @@
         "full": "rhg-Rohg-MM",
         "iana": [ "Rohingya" ],
         "iso639_3": "rhg",
+        "localname": "𐴌𐴗𐴥𐴝𐴙𐴚𐴒𐴙𐴝",
         "name": "Rohingya",
         "names": [ "Rohinga", "Rohinja", "Ruwainggya" ],
         "region": "MM",
         "regionname": "Myanmar",
-        "regions": [ "BD", "CN", "MY", "PK", "SA", "TH" ],
+        "regions": [ "CN", "MY", "PK", "SA", "TH" ],
         "script": "Rohg",
-        "sldr": false,
+        "sldr": true,
         "tag": "rhg",
         "tags": [ "rhg-MM", "rhg-Rohg" ],
         "windows": "rhg-Rohg"
@@ -101210,6 +102031,20 @@
         "tag": "rhg-Arab",
         "windows": "rhg-Arab"
     },
+    {
+        "full": "rhg-Rohg-BD",
+        "iana": [ "Rohingya" ],
+        "iso639_3": "rhg",
+        "localname": "𐴌𐴗𐴥𐴝𐴙𐴚𐴒𐴙𐴝",
+        "name": "Rohingya",
+        "names": [ "Rohinga", "Ruwainggya" ],
+        "region": "BD",
+        "regionname": "Bangladesh",
+        "script": "Rohg",
+        "sldr": true,
+        "tag": "rhg-BD",
+        "windows": "rhg-Rohg-BD"
+    },
     {
         "full": "rhg-Latn-MM",
         "iana": [ "Rohingya" ],
@@ -101318,6 +102153,7 @@
         "iana": [ "Tarifit" ],
         "iso639_3": "rif",
         "latnnames": [ "Tarifit" ],
+        "localname": "تاريفيت",
         "localnames": [ "تاريفيت" ],
         "name": "Tarifit",
         "names": [ "Arrif", "Fifia", "Northern Shilha", "Rif", "Rif Berber", "Rifain", "Rifeño", "Riff", "Rifi", "Rifia", "Rifiya", "Ruafa", "Shilha", "Tamazight", "Tamazight n Arrif", "Tarifiyt", "Tarifyt Berber", "Tirifie", "Tmazight", "Tmaziɣt" ],
@@ -101326,7 +102162,7 @@
         "regionname": "Morocco",
         "regions": [ "BE", "DE", "DZ", "ES", "FR", "NL" ],
         "script": "Arab",
-        "sldr": false,
+        "sldr": true,
         "tag": "rif-Arab",
         "windows": "rif-Arab"
     },
@@ -101343,7 +102179,7 @@
         "regionname": "Morocco",
         "regions": [ "BE", "DE", "DZ", "ES", "FR", "NL" ],
         "script": "Tfng",
-        "sldr": false,
+        "sldr": true,
         "tag": "rif-Tfng",
         "windows": "rif-Tfng"
     },
@@ -101351,6 +102187,7 @@
         "full": "ril-Latn-MM",
         "iana": [ "Riang Lang", "Riang (Myanmar)" ],
         "iso639_3": "ril",
+        "localname": "Reu Yaang",
         "localnames": [ "Reu Yaang" ],
         "name": "Riang Lang",
         "names": [ "Black Karen", "Black Riang", "Black Yang", "Drum", "Reu Yaang", "Riang", "Riang (Myanmar)", "Yang", "Yang Lang", "Yang Wan Kun", "Yanglam", "Yin", "Yin Net", "Yinnet" ],
@@ -101358,7 +102195,7 @@
         "regionname": "Myanmar",
         "regions": [ "CN" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "ril",
         "tags": [ "ril-Latn", "ril-MM" ],
         "windows": "ril-Latn"
@@ -101545,6 +102382,20 @@
         "tags": [ "ccq", "ccq-MM", "ccq-Mymr", "ccq-Mymr-MM", "rki-MM", "rki-Mymr", "ybd", "ybd-MM", "ybd-Mymr", "ybd-Mymr-MM" ],
         "windows": "rki-Mymr"
     },
+    {
+        "full": "rki-Latn-MM",
+        "iana": [ "Rakhine" ],
+        "iso639_3": "rki",
+        "name": "Rakhine",
+        "names": [ "Arakanese", "Rakhain", "Rakhaing", "Rakkhaine" ],
+        "region": "MM",
+        "regionname": "Myanmar",
+        "regions": [ "BD" ],
+        "script": "Latn",
+        "sldr": false,
+        "tag": "rki-Latn",
+        "windows": "rki-Latn"
+    },
     {
         "full": "rkm-Latn-BF",
         "iana": [ "Marka" ],
@@ -102005,6 +102856,7 @@
         "iana": [ "Marma" ],
         "iso639_3": "rmz",
         "latnnames": [ "Mraima" ],
+        "localname": "မရမာ",
         "localnames": [ "မရမာ" ],
         "name": "Marma",
         "names": [ "Arkanese-Marma", "Mraima" ],
@@ -102012,7 +102864,7 @@
         "regionname": "India",
         "regions": [ "BD" ],
         "script": "Mymr",
-        "sldr": false,
+        "sldr": true,
         "tag": "rmz",
         "tags": [ "rmz-IN", "rmz-Mymr" ],
         "windows": "rmz-Mymr"
@@ -102266,6 +103118,7 @@
         "full": "ro-Latn-MD",
         "iana": [ "Romanian", "Moldavian", "Moldovan" ],
         "iso639_3": "ron",
+        "localname": "română",
         "localnames": [ "Limba română", "româneşte" ],
         "name": "Romanian",
         "names": [ "Moldavian", "Moldovan" ],
@@ -102775,7 +103628,7 @@
         "names": [ "Eluosi", "Krievu", "Okhu-in", "Olossu", "Rosiysʹkyy", "Rossiya", "Rosyjski", "Rusija", "Rusijos", "Russ", "Russit" ],
         "region": "RU",
         "regionname": "Russian Federation",
-        "regions": [ "AM", "AU", "AZ", "BE", "BG", "CA", "CN", "CY", "CZ", "DE", "EE", "FI", "GE", "GR", "HR", "HU", "IL", "LT", "LU", "LV", "ME", "MN", "MZ", "NO", "PL", "RO", "RS", "SE", "SJ", "SK", "TJ", "TM", "US", "UY", "UZ" ],
+        "regions": [ "AM", "AU", "AZ", "BE", "BG", "CA", "CN", "CY", "CZ", "DE", "EE", "FI", "GE", "GR", "HR", "HU", "IL", "KZ", "LT", "LU", "LV", "ME", "MN", "MZ", "NO", "PL", "RO", "RS", "SE", "SJ", "SK", "TJ", "TM", "US", "UY", "UZ" ],
         "script": "Cyrl",
         "sldr": true,
         "suppress": true,
@@ -102789,6 +103642,7 @@
         "iana": [ "Russian" ],
         "iso639_3": "rus",
         "latnnames": [ "russkij jazyk" ],
+        "localname": "русский",
         "localnames": [ "русский язык" ],
         "name": "Russian",
         "region": "BY",
@@ -102819,6 +103673,7 @@
         "iana": [ "Russian" ],
         "iso639_3": "rus",
         "latnnames": [ "russkij jazyk" ],
+        "localname": "русский",
         "localnames": [ "русский язык" ],
         "name": "Russian",
         "region": "KG",
@@ -102829,26 +103684,12 @@
         "variants": [ "luna1918", "petr1708" ],
         "windows": "ru-Cyrl-KG"
     },
-    {
-        "full": "ru-Cyrl-KZ",
-        "iana": [ "Russian" ],
-        "iso639_3": "rus",
-        "latnnames": [ "russkij jazyk" ],
-        "localnames": [ "русский язык" ],
-        "name": "Russian",
-        "region": "KZ",
-        "regionname": "Kazakhstan",
-        "script": "Cyrl",
-        "sldr": true,
-        "tag": "ru-KZ",
-        "variants": [ "luna1918", "petr1708" ],
-        "windows": "ru-Cyrl-KZ"
-    },
     {
         "full": "ru-Cyrl-MD",
         "iana": [ "Russian" ],
         "iso639_3": "rus",
         "latnnames": [ "russkij jazyk" ],
+        "localname": "русский",
         "localnames": [ "русский язык" ],
         "name": "Russian",
         "region": "MD",
@@ -102864,6 +103705,7 @@
         "iana": [ "Russian" ],
         "iso639_3": "rus",
         "latnnames": [ "russkij jazyk" ],
+        "localname": "русский",
         "localnames": [ "русский язык" ],
         "name": "Russian",
         "region": "UA",
@@ -103155,7 +103997,7 @@
         "full": "rw-Latn-RW",
         "iana": [ "Kinyarwanda" ],
         "iso639_3": "kin",
-        "localname": "Kinyarwanda",
+        "localname": "Ikinyarwanda",
         "localnames": [ "Ikinyarwanda" ],
         "name": "Kinyarwanda",
         "names": [ "Bafumbira", "Banyarwanda", "Fumbira", "Hima", "Ikinyarwanda", "Orunyarwanda", "Ruanda", "Rufumbira", "Runyarwanda", "Rwanda", "Rwandan", "Urunyaruanda" ],
@@ -103462,6 +104304,35 @@
         "tag": "sa-Khar",
         "windows": "sa-Khar"
     },
+    {
+        "full": "sa-Latn-IN",
+        "iana": [ "Sanskrit" ],
+        "iso639_3": "san",
+        "name": "Sanskrit",
+        "names": [ "Deva Bhasha", "Deva vani", "Sanskrit bhasha" ],
+        "region": "IN",
+        "regionname": "India",
+        "regions": [ "NP" ],
+        "script": "Latn",
+        "sldr": false,
+        "tag": "sa-Latn",
+        "windows": "sa-Latn"
+    },
+    {
+        "full": "sa-Mong-IN",
+        "iana": [ "Sanskrit" ],
+        "iso639_3": "san",
+        "name": "Sanskrit",
+        "names": [ "Deva Bhasha", "Deva vani", "Sanskrit bhasha" ],
+        "nophonvars": true,
+        "region": "IN",
+        "regionname": "India",
+        "regions": [ "NP" ],
+        "script": "Mong",
+        "sldr": false,
+        "tag": "sa-Mong",
+        "windows": "sa-Mong"
+    },
     {
         "full": "sa-Mymr-IN",
         "iana": [ "Sanskrit" ],
@@ -103557,6 +104428,21 @@
         "variants": [ "bauddha", "itihasa", "laukika", "vaidika" ],
         "windows": "sa-Sinh"
     },
+    {
+        "full": "sa-Soyo-IN",
+        "iana": [ "Sanskrit" ],
+        "iso639_3": "san",
+        "name": "Sanskrit",
+        "names": [ "Deva Bhasha", "Deva vani", "Sanskrit bhasha" ],
+        "nophonvars": true,
+        "region": "IN",
+        "regionname": "India",
+        "regions": [ "NP" ],
+        "script": "Soyo",
+        "sldr": false,
+        "tag": "sa-Soyo",
+        "windows": "sa-Soyo"
+    },
     {
         "full": "sa-Tirh-IN",
         "iana": [ "Sanskrit" ],
@@ -103860,6 +104746,20 @@
         "tag": "sas-Bali",
         "windows": "sas-Bali"
     },
+    {
+        "full": "sas-Java-ID",
+        "iana": [ "Sasak" ],
+        "iso639_3": "sas",
+        "name": "Sasak",
+        "names": [ "Lombok" ],
+        "nophonvars": true,
+        "region": "ID",
+        "regionname": "Indonesia",
+        "script": "Java",
+        "sldr": false,
+        "tag": "sas-Java",
+        "windows": "sas-Java"
+    },
     {
         "full": "sat-Olck-IN",
         "iana": [ "Santali" ],
@@ -103895,6 +104795,7 @@
         "full": "sat-Deva-NP",
         "iana": [ "Santali" ],
         "iso639_3": "sat",
+        "localname": "सानताड़ी",
         "name": "Santhali",
         "names": [ "Har", "Har Rar", "Hor", "Sainti", "Samtali", "Sandal", "Sangtal", "Santal", "Santali", "Santhal", "Santhiali", "Satar", "Sentali", "Sonthal" ],
         "nophonvars": true,
@@ -103902,7 +104803,7 @@
         "regionname": "Nepal",
         "regions": [ "BD", "BT", "IN" ],
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "sat-Deva",
         "tags": [ "sat-NP" ],
         "windows": "sat-Deva"
@@ -104237,13 +105138,14 @@
         "full": "sbk-Latn-TZ",
         "iana": [ "Safwa" ],
         "iso639_3": "sbk",
+        "localname": "Shisafwa",
         "localnames": [ "Shisafwa" ],
         "name": "Safwa",
         "names": [ "Cisafwa", "Ishisafwa", "Kisafwa", "Shisafwa" ],
         "region": "TZ",
         "regionname": "United Republic of Tanzania",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "sbk",
         "tags": [ "sbk-Latn", "sbk-TZ" ],
         "windows": "sbk-Latn"
@@ -104671,13 +105573,14 @@
         "full": "scn-Latn-IT",
         "iana": [ "Sicilian" ],
         "iso639_3": "scn",
+        "localname": "sicilianu",
         "localnames": [ "Sicilianu" ],
         "name": "Sicilian",
         "names": [ "Calabro-Sicilian", "Sicilianu", "Siculu" ],
         "region": "IT",
         "regionname": "Italy",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "scn",
         "tags": [ "scn-IT", "scn-Latn" ],
         "windows": "scn-Latn"
@@ -104718,13 +105621,14 @@
         "iana": [ "Hyolmo", "Helambu Sherpa" ],
         "iso639_3": "scp",
         "latnnames": [ "Hyolmo" ],
+        "localname": "ह्योल्मो",
         "localnames": [ "ह्योल्मो" ],
         "name": "Hyolmo",
         "names": [ "Helambu Sherpa", "Hyolmo Tam", "Yholmo", "Yohlmo", "Yolmo" ],
         "region": "NP",
         "regionname": "Nepal",
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "scp",
         "tags": [ "scp-Deva", "scp-NP" ],
         "windows": "scp-Deva"
@@ -105031,6 +105935,7 @@
         "iana": [ "Southern Kurdish" ],
         "iso639_3": "sdh",
         "latnnames": [ "Kurdî xwarg", "Kurdîyi başûrî" ],
+        "localname": "کوردی خوارگ",
         "localnames": [ "کوردی خوارگ", "کوردیی باشووری" ],
         "macrolang": "ku",
         "name": "Kurdish, Southern",
@@ -105039,7 +105944,7 @@
         "regionname": "Islamic Republic of Iran",
         "regions": [ "IQ" ],
         "script": "Arab",
-        "sldr": false,
+        "sldr": true,
         "tag": "sdh",
         "tags": [ "sdh-Arab", "sdh-IR" ],
         "windows": "sdh-Arab"
@@ -105325,6 +106230,7 @@
         "full": "se-Latn-FI",
         "iana": [ "Northern Sami" ],
         "iso639_3": "sme",
+        "localname": "davvisámegiella",
         "localnames": [ "Davvisámegiella", "Sámegiella" ],
         "name": "Northern Sami",
         "region": "FI",
@@ -105338,6 +106244,7 @@
         "full": "se-Latn-SE",
         "iana": [ "Northern Sami" ],
         "iso639_3": "sme",
+        "localname": "davvisámegiella",
         "localnames": [ "Davvisámegiella", "Sámegiella" ],
         "name": "Northern Sami",
         "region": "SE",
@@ -105785,7 +106692,7 @@
         "region": "CN",
         "regionname": "China",
         "script": "Plrd",
-        "sldr": false,
+        "sldr": true,
         "tag": "sfm",
         "tags": [ "sfm-CN", "sfm-Plrd" ],
         "windows": "sfm-Plrd"
@@ -106007,13 +106914,14 @@
         "iana": [ "Surgujia" ],
         "iso639_3": "sgj",
         "latnnames": [ "Surgujia" ],
+        "localname": "सरगुजिया",
         "localnames": [ "सरगुजिया" ],
         "name": "Surgujia",
         "names": [ "Suraji", "Surguja", "Surgujia-Chhattisgarhi", "Surjugia" ],
         "region": "IN",
         "regionname": "India",
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "sgj",
         "tags": [ "sgj-Deva", "sgj-IN" ],
         "windows": "sgj-Deva"
@@ -106444,7 +107352,7 @@
         "iana": [ "Shan" ],
         "iso639_3": "shn",
         "latnnames": [ "Lik Tai" ],
-        "localname": "လိၵ်ႈတႆး",
+        "localname": "တႆး",
         "localnames": [ "လိၵ်ႈတႆး" ],
         "name": "Shan",
         "names": [ "Burmese Shan", "Dehong", "Dehong Dai", "Great Thai", "Sam", "Sha", "Shan Bama", "Shan Gyi", "Tai", "Tai Long", "Tai Luang", "Tai Shan", "Tai Yai", "Tai Yay", "Tai-Lon", "Thai Yai", "Thai Yay" ],
@@ -106501,7 +107409,7 @@
         "regionname": "Thailand",
         "regions": [ "CN", "MM" ],
         "script": "Thai",
-        "sldr": false,
+        "sldr": true,
         "tag": "shn-Thai",
         "tags": [ "shn-TH" ],
         "windows": "shn-Thai"
@@ -106716,7 +107624,7 @@
         "regionname": "Algeria",
         "regions": [ "FR", "TN" ],
         "script": "Tfng",
-        "sldr": false,
+        "sldr": true,
         "tag": "shy-Tfng",
         "windows": "shy-Tfng"
     },
@@ -106802,7 +107710,7 @@
         "full": "sid-Latn-ET",
         "iana": [ "Sidamo" ],
         "iso639_3": "sid",
-        "localname": "Sidaamu Afoo",
+        "localname": "Sidaamu Afo",
         "localnames": [ "Sidaamu Afoo" ],
         "name": "Sidamo",
         "region": "ET",
@@ -107138,7 +108046,7 @@
         "regionname": "Libya",
         "regions": [ "EG" ],
         "script": "Tfng",
-        "sldr": false,
+        "sldr": true,
         "tag": "siz-Tfng",
         "tags": [ "siz-LY" ],
         "windows": "siz-Tfng"
@@ -107269,6 +108177,7 @@
         "full": "sjm-Latn-PH",
         "iana": [ "Mapun" ],
         "iso639_3": "sjm",
+        "localname": "Pallun Mapun",
         "localnames": [ "Pallun Mapun" ],
         "name": "Mapun",
         "names": [ "Bajau Kagayan", "Cagayan", "Cagayan de Sulu", "Cagayanen", "Cagayano", "Cagayanon", "Jama Mapun", "Kagayan", "Orang", "Orang Cagayan", "Pallun Mapun", "Pellun Mapun", "Pullun Mapun", "Sama Mapun" ],
@@ -107276,7 +108185,7 @@
         "regionname": "Philippines",
         "regions": [ "MY" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "sjm",
         "tags": [ "sjm-Latn", "sjm-PH" ],
         "windows": "sjm-Latn"
@@ -108321,18 +109230,33 @@
         "full": "sma-Latn-SE",
         "iana": [ "Southern Sami" ],
         "iso639_3": "sma",
+        "localname": "Åarjelsaemien gïele",
         "localnames": [ "Saemien gïele", "Åarjelsaemien gïele" ],
         "name": "Saami, South",
         "names": [ "Saami", "Saemien gïele", "Same", "Samic", "Southern Lapp", "Southern Sami", "Åarjelsaemien gïele" ],
         "region": "SE",
         "regionname": "Sweden",
-        "regions": [ "NO" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "sma",
         "tags": [ "sma-Latn", "sma-SE" ],
         "windows": "sma-Latn"
     },
+    {
+        "full": "sma-Latn-NO",
+        "iana": [ "Southern Sami" ],
+        "iso639_3": "sma",
+        "localname": "Åarjelsaemien gïele",
+        "localnames": [ "Saemien gïele", "Åarjelsaemien gïele" ],
+        "name": "Saami, South",
+        "names": [ "Saami", "Saemien gïele", "Same", "Samic", "Southern Sami", "Åarjelsaemien gïele" ],
+        "region": "NO",
+        "regionname": "Norway",
+        "script": "Latn",
+        "sldr": true,
+        "tag": "sma-NO",
+        "windows": "sma-Latn-NO"
+    },
     {
         "full": "smb-Latn-PG",
         "iana": [ "Simbari" ],
@@ -108411,6 +109335,7 @@
         "full": "smj-Latn-SE",
         "iana": [ "Lule Sami" ],
         "iso639_3": "smj",
+        "localname": "julevsámegiella",
         "localnames": [ "Julevusámegiella" ],
         "name": "Saami, Lule",
         "names": [ "Julevusámegiella", "Lule", "Lule Sami", "Saame", "Saami" ],
@@ -108418,7 +109343,7 @@
         "regionname": "Sweden",
         "regions": [ "NO" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "smj",
         "tags": [ "smj-Latn", "smj-SE" ],
         "windows": "smj-Latn"
@@ -109221,6 +110146,7 @@
         "full": "so-Latn-DJ",
         "iana": [ "Somali" ],
         "iso639_3": "som",
+        "localname": "Soomaali",
         "localnames": [ "Af-Soomaali", "Afka Soomaaliga" ],
         "name": "Somali",
         "region": "DJ",
@@ -109234,6 +110160,7 @@
         "full": "so-Latn-ET",
         "iana": [ "Somali" ],
         "iso639_3": "som",
+        "localname": "Soomaali",
         "localnames": [ "Af-Soomaali", "Afka Soomaaliga" ],
         "name": "Somali",
         "region": "ET",
@@ -109247,6 +110174,7 @@
         "full": "so-Latn-KE",
         "iana": [ "Somali" ],
         "iso639_3": "som",
+        "localname": "Soomaali",
         "localnames": [ "Af-Soomaali", "Afka Soomaaliga" ],
         "name": "Somali",
         "region": "KE",
@@ -109998,6 +110926,7 @@
         "full": "sq-Latn-MK",
         "iana": [ "Albanian" ],
         "iso639_3": "sqi",
+        "localname": "shqip",
         "name": "Albanian",
         "region": "MK",
         "regionname": "North Macedonia",
@@ -110006,6 +110935,22 @@
         "tag": "sq-MK",
         "windows": "sq-Latn-MK"
     },
+    {
+        "full": "sq-Todr-AL",
+        "iana": [ "Albanian" ],
+        "iso639_3": "sqi",
+        "name": "Albanian",
+        "names": [ "Albanian, Tosk", "Arnaut", "Arvanitika", "Camerija", "Shkip", "Shqip", "Skchip", "Tosk", "Zhgabe" ],
+        "nophonvars": true,
+        "region": "AL",
+        "regionname": "Albania",
+        "regions": [ "AT", "AU", "BE", "DE", "GR", "HR", "IT", "MK", "MN", "RS", "SE", "TR", "UA", "US" ],
+        "script": "Todr",
+        "sldr": false,
+        "tag": "sq-Todr",
+        "tags": [ "als-Todr", "als-Todr-AL" ],
+        "windows": "sq-Todr"
+    },
     {
         "full": "sq-Vith-AL",
         "iana": [ "Albanian" ],
@@ -110027,8 +110972,10 @@
         "full": "sq-Latn-XK",
         "iana": [ "Albanian" ],
         "iso639_3": "sqi",
+        "localname": "shqip",
         "name": "Albanian",
         "region": "XK",
+        "regionname": "Kosovo",
         "script": "Latn",
         "sldr": true,
         "tag": "sq-XK",
@@ -110242,6 +111189,7 @@
         "iana": [ "Serbian" ],
         "iso639_3": "srp",
         "latnnames": [ "Srpski" ],
+        "localname": "српски",
         "localnames": [ "српски" ],
         "macrolang": "sh",
         "name": "Serbian",
@@ -110274,6 +111222,7 @@
         "iana": [ "Serbian" ],
         "iso639_3": "srp",
         "latnnames": [ "Srpski" ],
+        "localname": "српски",
         "localnames": [ "српски" ],
         "macrolang": "sh",
         "name": "Serbian",
@@ -110322,6 +111271,7 @@
         "full": "sr-Latn-BA",
         "iana": [ "Serbian" ],
         "iso639_3": "srp",
+        "localname": "srpski",
         "macrolang": "sh",
         "name": "Serbian",
         "region": "BA",
@@ -110336,9 +111286,11 @@
         "full": "sr-Latn-XK",
         "iana": [ "Serbian" ],
         "iso639_3": "srp",
+        "localname": "srpski",
         "macrolang": "sh",
         "name": "Serbian",
         "region": "XK",
+        "regionname": "Kosovo",
         "script": "Latn",
         "sldr": true,
         "tag": "sr-Latn-XK",
@@ -110349,6 +111301,7 @@
         "full": "sr-Latn-ME",
         "iana": [ "Serbian" ],
         "iso639_3": "srp",
+        "localname": "srpski",
         "macrolang": "sh",
         "name": "Serbian",
         "names": [ "Serbo-Croatian" ],
@@ -110405,10 +111358,12 @@
         "iana": [ "Serbian" ],
         "iso639_3": "srp",
         "latnnames": [ "Srpski" ],
+        "localname": "српски",
         "localnames": [ "српски" ],
         "macrolang": "sh",
         "name": "Serbian",
         "region": "XK",
+        "regionname": "Kosovo",
         "script": "Cyrl",
         "sldr": true,
         "tag": "sr-XK",
@@ -110702,7 +111657,6 @@
         "sldr": false,
         "tag": "srs",
         "tags": [ "srs-CA", "srs-Latn" ],
-        "unwritten": true,
         "windows": "srs-Latn"
     },
     {
@@ -110768,13 +111722,14 @@
         "iana": [ "Sirmauri" ],
         "iso639_3": "srx",
         "latnnames": [ "Sirmauri" ],
+        "localname": "सिरमौरी",
         "localnames": [ "सिरमौरी" ],
         "name": "Sirmauri",
         "names": [ "Himachali", "Pahari", "Sirmouri", "Sirmuri" ],
         "region": "IN",
         "regionname": "India",
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "srx",
         "tags": [ "srx-Deva", "srx-IN" ],
         "windows": "srx-Deva"
@@ -110825,13 +111780,13 @@
         "full": "ss-Latn-ZA",
         "iana": [ "Swati" ],
         "iso639_3": "ssw",
-        "localname": "Siswati",
+        "localname": "siSwati",
         "localnames": [ "siSwati" ],
         "name": "Swati",
         "names": [ "Isiswazi", "Ngwane", "Phuthi", "Sephuthi", "Siswati", "Siswazi", "Swazi", "Síphùthì", "Tekela", "Tekeza", "Thithiza", "Yeyeza", "siSwati" ],
         "region": "ZA",
         "regionname": "South Africa",
-        "regions": [ "LS", "MZ", "SZ" ],
+        "regions": [ "LS", "MZ" ],
         "script": "Latn",
         "sldr": true,
         "suppress": true,
@@ -110854,6 +111809,20 @@
         "tag": "ss-Brai",
         "windows": "ss-Brai"
     },
+    {
+        "full": "ss-Latn-SZ",
+        "iana": [ "Swati" ],
+        "iso639_3": "ssw",
+        "localname": "siSwati",
+        "localnames": [ "siSwati" ],
+        "name": "Swati",
+        "region": "SZ",
+        "regionname": "Swaziland",
+        "script": "Latn",
+        "sldr": true,
+        "tag": "ss-SZ",
+        "windows": "ss-Latn-SZ"
+    },
     {
         "full": "ssb-Latn-PH",
         "iana": [ "Southern Sama" ],
@@ -111237,6 +112206,7 @@
         "full": "ssy-Latn-ER",
         "iana": [ "Saho" ],
         "iso639_3": "ssy",
+        "localname": "Saho",
         "localnames": [ "Saaho" ],
         "name": "Saho",
         "names": [ "Saaho", "Sao", "Shaho", "Shiho", "Shoho" ],
@@ -111597,6 +112567,20 @@
         "unwritten": true,
         "windows": "str-Latn"
     },
+    {
+        "full": "str-Latn-CA-x-lekwungn",
+        "iana": [ "Lekwungen" ],
+        "iso639_3": "str",
+        "name": "Northern Straits Salish",
+        "names": [ "Lekwungen", "North Straits Salish", "SENĆOŦEN", "Straits", "Straits Salish" ],
+        "region": "CA",
+        "regionname": "Canada",
+        "script": "Latn",
+        "sldr": false,
+        "tag": "str-x-lekwungn",
+        "tags": [ "str-CA-x-lekwungn", "str-Latn-x-lekwungn" ],
+        "windows": "str-Latn-x-lekwungn"
+    },
     {
         "full": "sts-Arab-AF",
         "iana": [ "Shumashti" ],
@@ -112166,6 +113150,7 @@
         "full": "sv-Latn-FI",
         "iana": [ "Swedish" ],
         "iso639_3": "swe",
+        "localname": "svenska",
         "localnames": [ "Svenska" ],
         "name": "Swedish",
         "region": "FI",
@@ -112383,6 +113368,7 @@
         "full": "sw-Latn-CD",
         "iana": [ "Swahili (macrolanguage)" ],
         "iso639_3": "swa",
+        "localname": "Kiswahili",
         "name": "Swahili (macrolanguage)",
         "region": "CD",
         "regionname": "The Democratic Republic of the Congo",
@@ -112395,6 +113381,7 @@
         "full": "sw-Latn-KE",
         "iana": [ "Swahili (macrolanguage)" ],
         "iso639_3": "swa",
+        "localname": "Kiswahili",
         "name": "Swahili (macrolanguage)",
         "region": "KE",
         "regionname": "Kenya",
@@ -112407,6 +113394,7 @@
         "full": "sw-Latn-UG",
         "iana": [ "Swahili (macrolanguage)" ],
         "iso639_3": "swa",
+        "localname": "Kiswahili",
         "name": "Swahili (macrolanguage)",
         "region": "UG",
         "regionname": "Uganda",
@@ -112434,6 +113422,7 @@
         "full": "swb-Latn-YT",
         "iana": [ "Maore Comorian" ],
         "iso639_3": "swb",
+        "localname": "Shimaore",
         "localnames": [ "Shimaore" ],
         "name": "Comorian, Maore",
         "names": [ "Comores Swahili", "Comorian", "Comoro", "Komoro", "Maore", "Maore Comorian", "Shimaore" ],
@@ -112441,7 +113430,7 @@
         "regionname": "Mayotte",
         "regions": [ "MG", "RE" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "swb-Latn",
         "windows": "swb-Latn"
     },
@@ -113010,7 +113999,6 @@
         "sldr": false,
         "tag": "sya",
         "tags": [ "sya-ID", "sya-Latn" ],
-        "unwritten": true,
         "windows": "sya-Latn"
     },
     {
@@ -113207,13 +114195,14 @@
         "iana": [ "Kagate" ],
         "iso639_3": "syw",
         "latnnames": [ "Syuba" ],
+        "localname": "स्युबा",
         "localnames": [ "स्युबा" ],
         "name": "Syuba",
         "names": [ "Kagate", "Shuba", "Shuuba", "Shuva", "Shuwa", "Shyuuba", "Syuba Tam", "Syuuba", "Yholmo", "Yholmoli", "Yholmu" ],
         "region": "NP",
         "regionname": "Nepal",
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "syw",
         "tags": [ "syw-Deva", "syw-NP" ],
         "windows": "syw-Deva"
@@ -113324,13 +114313,14 @@
         "full": "szl-Latn-PL",
         "iana": [ "Silesian" ],
         "iso639_3": "szl",
+        "localname": "ślōnski",
         "localnames": [ "ślůnsko godka" ],
         "name": "Silesian",
         "names": [ "Slonska Godka", "Szlonzokian", "ślōnskŏ gŏdka", "ślůnsko godka" ],
         "region": "PL",
         "regionname": "Poland",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "szl",
         "tags": [ "szl-Latn", "szl-PL" ],
         "windows": "szl-Latn"
@@ -113478,6 +114468,7 @@
         "iana": [ "Tamil" ],
         "iso639_3": "tam",
         "latnnames": [ "Tamiḻ" ],
+        "localname": "தமிழ்",
         "localnames": [ "தமிழ்" ],
         "name": "Tamil",
         "region": "LK",
@@ -113487,11 +114478,26 @@
         "tag": "ta-LK",
         "windows": "ta-Taml-LK"
     },
+    {
+        "full": "ta-Latn-IN",
+        "iana": [ "Tamil" ],
+        "iso639_3": "tam",
+        "name": "Tamil",
+        "names": [ "Damulian", "Tamal", "Tamalsan", "Tambul", "Tamili" ],
+        "region": "IN",
+        "regionname": "India",
+        "regions": [ "AE", "AU", "BH", "BZ", "CA", "DE", "DK", "FJ", "GB", "LK", "MQ", "MU", "MY", "NL", "PK", "QA", "RE", "SG", "TH", "US", "ZA" ],
+        "script": "Latn",
+        "sldr": false,
+        "tag": "ta-Latn",
+        "windows": "ta-Latn"
+    },
     {
         "full": "ta-Taml-MY",
         "iana": [ "Tamil" ],
         "iso639_3": "tam",
         "latnnames": [ "Tamiḻ" ],
+        "localname": "தமிழ்",
         "localnames": [ "தமிழ்" ],
         "name": "Tamil",
         "region": "MY",
@@ -113506,6 +114512,7 @@
         "iana": [ "Tamil" ],
         "iso639_3": "tam",
         "latnnames": [ "Tamiḻ" ],
+        "localname": "தமிழ்",
         "localnames": [ "தமிழ்" ],
         "name": "Tamil",
         "region": "SG",
@@ -113783,7 +114790,7 @@
         "regionname": "Mali",
         "regions": [ "BF", "BG", "DZ" ],
         "script": "Tfng",
-        "sldr": false,
+        "sldr": true,
         "tag": "taq-Tfng",
         "windows": "taq-Tfng"
     },
@@ -114688,13 +115695,14 @@
         "iana": [ "Tulu" ],
         "iso639_3": "tcy",
         "latnnames": [ "Tulu", "Tuḷu bhāṣe" ],
+        "localname": "ತುಳು",
         "localnames": [ "ತುಳು", "ತುಳು ಭಾಷೆ" ],
         "name": "Tulu",
         "names": [ "Tal", "Tallu", "Thalu", "Thulu", "Tilu", "Tullu", "Tuluva Bhasa" ],
         "region": "IN",
         "regionname": "India",
         "script": "Knda",
-        "sldr": false,
+        "sldr": true,
         "tag": "tcy",
         "tags": [ "tcy-IN", "tcy-Knda" ],
         "windows": "tcy-Knda"
@@ -114738,7 +115746,7 @@
         "region": "NE",
         "regionname": "Niger",
         "script": "Tfng",
-        "sldr": false,
+        "sldr": true,
         "tag": "tda",
         "tags": [ "tda-NE", "tda-Tfng" ],
         "windows": "tda-Tfng"
@@ -114901,13 +115909,14 @@
         "iana": [ "Western Tamang" ],
         "iso639_3": "tdg",
         "latnnames": [ "Pakṣcimī tāmāṅga" ],
+        "localname": "पक्ष्चिमी तामाङ्ग",
         "localnames": [ "पक्ष्चिमी तामाङ्ग" ],
         "name": "Tamang, Western",
         "names": [ "Murmi", "Sain", "Tamang Gyot", "Tamang Tam", "Western Tamang" ],
         "region": "NP",
         "regionname": "Nepal",
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "tdg",
         "tags": [ "tdg-Deva", "tdg-NP", "tmk", "tmk-Deva", "tmk-Deva-NP", "tmk-NP" ],
         "windows": "tdg-Deva"
@@ -115097,13 +116106,14 @@
         "full": "tdt-Latn-TL",
         "iana": [ "Tetun Dili" ],
         "iso639_3": "tdt",
+        "localname": "Tetun Dili",
         "localnames": [ "Tetun Dili" ],
         "name": "Tetun Dili",
         "names": [ "Dili Tetum", "Lia-Tetun", "Tetum", "Tetum Dili", "Tetum Prasa", "Tetum Praça", "Tetun", "Tetun Prasa" ],
         "region": "TL",
         "regionname": "Timor-Leste",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "tdt",
         "tags": [ "tdt-Latn", "tdt-TL" ],
         "windows": "tdt-Latn"
@@ -115391,6 +116401,7 @@
         "full": "teo-Latn-KE",
         "iana": [ "Teso" ],
         "iso639_3": "teo",
+        "localname": "Kiteso",
         "localnames": [ "Atεsᴐ" ],
         "name": "Ateso",
         "names": [ "Atεsᴐ", "Iteso", "Teso" ],
@@ -116173,6 +117184,7 @@
         "iana": [ "Chitwania Tharu" ],
         "iso639_3": "the",
         "latnnames": [ "Chituneeya Thaaruk" ],
+        "localname": "चितुनीया थारुक",
         "localnames": [ "चितुनीया थारुक" ],
         "name": "Tharu, Central",
         "names": [ "Chhetriya Tharu", "Chitawan Tharu", "Chitoniya Tharu", "Chitwan Tharu", "Chitwania Tharu", "Madhya Chhetriya Tharu", "Madhya Ksetriya Tharu", "Tharu, Chitwania" ],
@@ -116180,7 +117192,7 @@
         "regionname": "Nepal",
         "regions": [ "IN" ],
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "the",
         "tags": [ "the-Deva", "the-NP" ],
         "windows": "the-Deva"
@@ -116329,6 +117341,7 @@
         "iana": [ "Kochila Tharu" ],
         "iso639_3": "thq",
         "latnnames": [ "madhya-pūrviyā thārū" ],
+        "localname": "मध्य-पूर्विया थारू",
         "localnames": [ "मध्य-पूर्विया थारू" ],
         "name": "Tharu, Mid-Eastern",
         "names": [ "Kochila Tharu", "Madhya-Purbiya Tharu", "Saptari", "Tharu, Kochila" ],
@@ -116336,7 +117349,7 @@
         "regionname": "Nepal",
         "regions": [ "IN" ],
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "thq",
         "tags": [ "thq-Deva", "thq-NP" ],
         "windows": "thq-Deva"
@@ -116463,7 +117476,7 @@
         "regionname": "Algeria",
         "regions": [ "LY", "NE" ],
         "script": "Tfng",
-        "sldr": false,
+        "sldr": true,
         "tag": "thv-Tfng",
         "windows": "thv-Tfng"
     },
@@ -116524,7 +117537,7 @@
         "region": "NE",
         "regionname": "Niger",
         "script": "Tfng",
-        "sldr": false,
+        "sldr": true,
         "tag": "thz-Tfng",
         "windows": "thz-Tfng"
     },
@@ -116629,7 +117642,7 @@
         "iana": [ "Tigre" ],
         "iso639_3": "tig",
         "latnnames": [ "Tigrayit/Tigraayit" ],
-        "localname": "ትግራይት",
+        "localname": "ትግረ",
         "localnames": [ "ትግራይት" ],
         "name": "Tigré",
         "names": [ "Tigre" ],
@@ -118077,7 +119090,7 @@
         "full": "tmh-Latn-NE",
         "iana": [ "Tamashek" ],
         "iso639_3": "tmh",
-        "localname": "Tamajaq, Tawallammat",
+        "localname": "Tamajaq",
         "localnames": [ "Təmajəq" ],
         "name": "Tamashek",
         "names": [ "Amazigh", "Azbinawa", "Bugaje", "Buzu", "Tahoua", "Tahoua Tamajeq", "Tajag", "Tamachek", "Tamajaq", "Tamajaq, Tawallammat", "Tamajeq", "Tamashekin", "Tamasheq", "Tewellemet", "Tomacheck", "Touareg", "Tourage", "Tuareg", "Təmajəq" ],
@@ -118115,6 +119128,7 @@
         "iana": [ "Tamashek" ],
         "iso639_3": "ttq",
         "latnnames": [ "Tamajaq" ],
+        "localname": "ⵜⵎⵌⵆ",
         "localnames": [ "ⵜⵎⵌⵆ" ],
         "macrolang": "tmh",
         "name": "Tamajaq, Tawallammat",
@@ -118124,7 +119138,7 @@
         "regionname": "Niger",
         "regions": [ "ML", "NG" ],
         "script": "Tfng",
-        "sldr": false,
+        "sldr": true,
         "tag": "tmh-Tfng",
         "tags": [ "ttq-Tfng", "ttq-Tfng-NE" ],
         "windows": "tmh-Tfng"
@@ -118360,7 +119374,7 @@
         "names": [ "Bechuana", "Beetjuans", "Chuana", "Chwana", "Coana", "Cuana", "Sechuana", "Secoana", "Secwana", "Tshwana", "Tsiwaha", "Tswana" ],
         "region": "ZA",
         "regionname": "South Africa",
-        "regions": [ "NA", "ZW" ],
+        "regions": [ "BW", "NA", "ZW" ],
         "script": "Latn",
         "sldr": true,
         "suppress": true,
@@ -118368,19 +119382,6 @@
         "tags": [ "tn-Latn", "tn-ZA" ],
         "windows": "tn"
     },
-    {
-        "full": "tn-Latn-BW",
-        "iana": [ "Tswana" ],
-        "iso639_3": "tsn",
-        "localnames": [ "Setswana" ],
-        "name": "Tswana",
-        "region": "BW",
-        "regionname": "Botswana",
-        "script": "Latn",
-        "sldr": true,
-        "tag": "tn-BW",
-        "windows": "tn-Latn-BW"
-    },
     {
         "full": "tn-Brai-ZA",
         "iana": [ "Tswana" ],
@@ -118901,7 +119902,7 @@
         "full": "tok-Latn-001",
         "iana": [ "Toki Pona" ],
         "iso639_3": "tok",
-        "localname": "Toki Pona",
+        "localname": "toki pona",
         "name": "Toki Pona",
         "region": "001",
         "regionname": "World",
@@ -119678,6 +120679,7 @@
         "full": "tr-Latn-CY",
         "iana": [ "Turkish" ],
         "iso639_3": "tur",
+        "localname": "Türkçe",
         "localnames": [ "Türkçe" ],
         "name": "Turkish",
         "region": "CY",
@@ -120056,7 +121058,7 @@
         "full": "trv-Latn-TW",
         "iana": [ "Sediq", "Seediq", "Taroko" ],
         "iso639_3": "trv",
-        "localname": "Seediq",
+        "localname": "patas Taroko",
         "localnames": [ "Seediq" ],
         "name": "Sediq",
         "names": [ "Bu-Hwan", "Che-Hwan", "Daiya-Ataiyal", "Hogo", "Iboho", "Saediq", "Sazek", "Sedek", "Sedeq", "Sediakk", "Sedik", "Seedakka", "Seedek", "Seedeq", "Seedik", "Seediq", "Sejiq", "Shedekka", "Taroko", "Taruku", "Toda", "Toroko" ],
@@ -120173,7 +121175,7 @@
         "regionname": "Congo",
         "regions": [ "GA" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "tsa",
         "tags": [ "tsa-CG", "tsa-Latn" ],
         "unwritten": true,
@@ -121008,6 +122010,7 @@
         "full": "tuc-Latn-PG-x-oov",
         "iana": [ "Mutu - Saveeng-Oov" ],
         "iso639_3": "tuc",
+        "localname": "Saveeng",
         "localnames": [ "Saveeng" ],
         "name": "Mutu",
         "names": [ "Mutu - Saveeng-Oov", "Saveeng", "Sisi", "Tuam", "Tuam-Mutu", "Tuom" ],
@@ -121024,6 +122027,7 @@
         "full": "tuc-Latn-PG-x-tuam",
         "iana": [ "Mutu - Saveeng-Tuam" ],
         "iso639_3": "tuc",
+        "localname": "Saveeng",
         "localnames": [ "Saveeng" ],
         "name": "Mutu",
         "names": [ "Mutu - Saveeng-Tuam", "Saveeng", "Sisi", "Tuam", "Tuam-Mutu", "Tuom" ],
@@ -121203,13 +122207,27 @@
         "names": [ "Betaya", "Betoya", "Betoye", "Dachsea", "Dahseyé", "Dasea", "Dasea ye", "Daxsea", "Takuna", "Tukana", "Tukano", "Tukána", "Ye’pãmasa" ],
         "region": "BR",
         "regionname": "Brazil",
-        "regions": [ "CO" ],
         "script": "Latn",
         "sldr": true,
         "tag": "tuo",
         "tags": [ "tuo-BR", "tuo-Latn" ],
         "windows": "tuo-Latn"
     },
+    {
+        "full": "tuo-Latn-CO",
+        "iana": [ "Tucano" ],
+        "iso639_3": "tuo",
+        "localname": "Dasea ye",
+        "localnames": [ "Dasea ye" ],
+        "name": "Tucano",
+        "names": [ "Betaya", "Betoya", "Betoye", "Dachsea", "Dasea", "Dasea ye", "Daxsea", "Tukana", "Tukano" ],
+        "region": "CO",
+        "regionname": "Colombia",
+        "script": "Latn",
+        "sldr": true,
+        "tag": "tuo-CO",
+        "windows": "tuo-Latn-CO"
+    },
     {
         "full": "tuq-Latn-TD",
         "iana": [ "Tedaga" ],
@@ -121649,7 +122667,7 @@
         "full": "twh-Latn-VN",
         "iana": [ "Tai Dón" ],
         "iso639_3": "twh",
-        "localname": "Tãy Ðón",
+        "localname": "Tãy Đón",
         "localnames": [ "Tãy Ðón" ],
         "name": "Tai Dón",
         "names": [ "Bai Dai", "Tai Blanc", "Tai Jinping", "Tai Kao", "Tai Khao", "Tai Lai", "Thái Tráng", "Táy Khao", "Tãy Ðón", "White Tai" ],
@@ -121858,13 +122876,14 @@
         "full": "txa-Latn-MY",
         "iana": [ "Tombonuo" ],
         "iso639_3": "txa",
+        "localname": "Tangar nu Tombonuo",
         "localnames": [ "Tangar nu Tombonuo" ],
         "name": "Tombonuo",
         "names": [ "Lobu", "Paitan", "Sungai", "Sungei", "Tambanua", "Tambanuo", "Tambanuva", "Tambanwas", "Tambenua", "Tambunwas", "Tangar nu Tombonuo", "Tembenua", "Tombonuva", "Tombonuwo", "Tumbunwha", "Tunbumohas" ],
         "region": "MY",
         "regionname": "Malaysia",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "txa",
         "tags": [ "txa-Latn", "txa-MY" ],
         "windows": "txa-Latn"
@@ -122383,7 +123402,7 @@
         "regionname": "Russian Federation",
         "regions": [ "CN", "MN" ],
         "script": "Cyrl",
-        "sldr": false,
+        "sldr": true,
         "tag": "tyv",
         "tags": [ "tyv-Cyrl", "tyv-RU" ],
         "windows": "tyv-Cyrl"
@@ -122578,6 +123597,7 @@
         "full": "tzj-Latn-GT-x-western",
         "iana": [ "Tz'utujil - Western" ],
         "iso639_3": "tzj",
+        "localname": "Tz'utujil",
         "localnames": [ "Tz'utujil" ],
         "name": "Tz’utujil",
         "names": [ "Eastern Tzutujil", "Santiago Atitlán Tzutujil", "Tz'utujil - Western", "Tzutuhil", "Tzutujil", "Tzutujil Oriental" ],
@@ -122719,6 +123739,7 @@
         "full": "tzo-Latn-MX-x-huixtan",
         "iana": [ "Tzotzil - Huixtan" ],
         "iso639_3": "tzo",
+        "localname": "Bats'i k'op",
         "localnames": [ "Bats'i k'op" ],
         "name": "Tzotzil",
         "names": [ "Bats’i c’op", "Bats’i k’op", "Tsotsil", "Tzotzil - Huixtan" ],
@@ -122735,6 +123756,7 @@
         "full": "tzo-Latn-MX-x-sanandre",
         "iana": [ "Tzotzil - San Andres" ],
         "iso639_3": "tzo",
+        "localname": "Bats'i k'op",
         "localnames": [ "Bats'i k'op" ],
         "name": "Tzotzil",
         "names": [ "Bats’i c’op", "Bats’i k’op", "Tsotsil", "Tzotzil - San Andres" ],
@@ -122767,6 +123789,7 @@
         "full": "tzo-Latn-MX-x-zinacntn",
         "iana": [ "Tzotzil - Zinacantan" ],
         "iso639_3": "tzo",
+        "localname": "Bats'i k'op",
         "localnames": [ "Bats'i k'op" ],
         "name": "Tzotzil",
         "names": [ "Bats’i c’op", "Bats’i k’op", "Tsotsil", "Tzotzil - Zinacantan" ],
@@ -123539,6 +124562,7 @@
         "full": "ukk-Latn-MM",
         "iana": [ "Muak Sa-aak" ],
         "iso639_3": "ukk",
+        "localname": "duai: muak see aak",
         "localnames": [ "duai: muak see aak" ],
         "name": "Muak Sa-aak",
         "names": [ "Doi", "Muak", "Muak Saak", "duai: muak see aak", "muak see aak" ],
@@ -123546,7 +124570,7 @@
         "regionname": "Myanmar",
         "regions": [ "CN" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "ukk",
         "tags": [ "ukk-Latn", "ukk-MM" ],
         "windows": "ukk-Latn"
@@ -124484,6 +125508,7 @@
         "iana": [ "Urdu" ],
         "iso639_3": "urd",
         "latnnames": [ "Urdū" ],
+        "localname": "اردو",
         "localnames": [ "اُردُو" ],
         "name": "Urdu",
         "region": "IN",
@@ -124694,13 +125719,14 @@
         "full": "uro-Latn-PG",
         "iana": [ "Ura (Papua New Guinea)" ],
         "iso639_3": "uro",
+        "localname": "Ura",
         "localnames": [ "Ura" ],
         "name": "Ura",
         "names": [ "Auramot", "Ura (Papua New Guinea)", "Uramet", "Uramit", "Uramot", "Uramät" ],
         "region": "PG",
         "regionname": "Papua New Guinea",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "uro",
         "tags": [ "uro-Latn", "uro-PG" ],
         "windows": "uro-Latn"
@@ -124971,7 +125997,6 @@
         "sldr": false,
         "tag": "uta",
         "tags": [ "uta-Latn", "uta-NG" ],
-        "unwritten": true,
         "windows": "uta-Latn"
     },
     {
@@ -125475,7 +126500,6 @@
         "sldr": false,
         "tag": "vao",
         "tags": [ "vao-Latn", "vao-VU" ],
-        "unwritten": true,
         "windows": "vao-Latn"
     },
     {
@@ -125668,7 +126692,7 @@
         "full": "vec-Latn-IT",
         "iana": [ "Venetian" ],
         "iso639_3": "vec",
-        "localname": "Veneto",
+        "localname": "veneto",
         "localnames": [ "Veneto" ],
         "name": "Venetian",
         "names": [ "Chipileño", "Talian", "Taliano", "Venet", "Veneto", "Veneto braziłian", "Veneto chipileño", "Veneto cipilen", "Vêneto Brasileiro" ],
@@ -126637,6 +127661,7 @@
         "full": "vmw-Latn-MZ",
         "iana": [ "Makhuwa" ],
         "iso639_3": "vmw",
+        "localname": "emakhuwa",
         "localnames": [ "Emakhuwa" ],
         "name": "Makhuwa",
         "names": [ "Central Makhuwa", "Emakhuwa", "Emakhuwa-Makhuwana", "Emakua", "Macua", "Makhuwa-Makhuwana", "Makhuwwa of Nampula", "Makoane", "Makua", "Maquoua" ],
@@ -126644,7 +127669,7 @@
         "regionname": "Mozambique",
         "regions": [ "KM" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "vmw",
         "tags": [ "vmw-Latn", "vmw-MZ" ],
         "windows": "vmw-Latn"
@@ -127007,7 +128032,7 @@
         "full": "wa-Latn-BE",
         "iana": [ "Walloon" ],
         "iso639_3": "wln",
-        "localname": "Walon",
+        "localname": "walon",
         "localnames": [ "Walon" ],
         "name": "Walloon",
         "names": [ "Wallon", "Walon" ],
@@ -127907,6 +128932,7 @@
         "full": "wed-Latn-PG-x-topura",
         "iana": [ "Wedau" ],
         "iso639_3": "wed",
+        "localname": "Pona Wedau",
         "localnames": [ "Pona Wedau" ],
         "name": "Wedau",
         "names": [ "Pona Wedau", "Wamira", "Wedaun", "Wedawan" ],
@@ -129279,7 +130305,6 @@
         "sldr": false,
         "tag": "wnk",
         "tags": [ "wnk-ID", "wnk-Latn" ],
-        "unwritten": true,
         "windows": "wnk-Latn"
     },
     {
@@ -131147,14 +132172,48 @@
         "windows": "xbi-Latn"
     },
     {
-        "full": "xbi-Latn-PG-x-south",
-        "iana": [ "Kombio" ],
+        "full": "xbi-Latn-PG-x-east",
+        "iana": [ "Kombio - Wampurun (East)" ],
         "iso639_3": "xbi",
         "localnames": [ "Akwun" ],
         "name": "Kombio",
-        "names": [ "Akwun", "Endangen", "Indiang" ],
+        "names": [ "Akwun", "Endangen", "Indiang", "Kombio - Wampurun (East)" ],
         "region": "PG",
         "regionname": "Papua New Guinea",
+        "rod": "26363",
+        "script": "Latn",
+        "sldr": false,
+        "tag": "xbi-x-east",
+        "tags": [ "xbi-Latn-x-east", "xbi-PG-x-east" ],
+        "windows": "xbi-Latn-x-east"
+    },
+    {
+        "full": "xbi-Latn-PG-x-north",
+        "iana": [ "Kombio - Mwi (North)" ],
+        "iso639_3": "xbi",
+        "localnames": [ "Akwun" ],
+        "name": "Kombio",
+        "names": [ "Akwun", "Endangen", "Indiang", "Kombio - Mwi (North)" ],
+        "region": "PG",
+        "regionname": "Papua New Guinea",
+        "rod": "12182",
+        "script": "Latn",
+        "sldr": false,
+        "tag": "xbi-x-north",
+        "tags": [ "xbi-Latn-x-north", "xbi-PG-x-north" ],
+        "windows": "xbi-Latn-x-north"
+    },
+    {
+        "full": "xbi-Latn-PG-x-south",
+        "iana": [ "Kombio - Yanimoi (South)" ],
+        "iso639_3": "xbi",
+        "localname": "Akwun",
+        "localnames": [ "Akwun" ],
+        "name": "Kombio",
+        "names": [ "Akwun", "Endangen", "Indiang", "Kombio - Yanimoi (South)" ],
+        "region": "PG",
+        "regionname": "Papua New Guinea",
+        "rod": "12183",
         "script": "Latn",
         "sldr": true,
         "tag": "xbi-x-south",
@@ -131163,13 +132222,15 @@
     },
     {
         "full": "xbi-Latn-PG-x-western",
-        "iana": [ "Kombio" ],
+        "iana": [ "Kombio - Wampukuamp (West-Central)" ],
         "iso639_3": "xbi",
+        "localname": "Akwun",
         "localnames": [ "Akwun" ],
         "name": "Kombio",
-        "names": [ "Akwun", "Endangen", "Indiang" ],
+        "names": [ "Akwun", "Endangen", "Indiang", "Kombio - Wampukuamp (West-Central)" ],
         "region": "PG",
         "regionname": "Papua New Guinea",
+        "rod": "12184",
         "script": "Latn",
         "sldr": true,
         "tag": "xbi-x-western",
@@ -132144,12 +133205,13 @@
         "full": "xis-Orya-IN",
         "iana": [ "Kisan" ],
         "iso639_3": "xis",
+        "localname": "Kisan",
         "name": "Kisan",
         "names": [ "Birhor", "Koda", "Kola", "Kora", "Kuda", "Kunha", "Kunhar", "Kunhu", "Kunna", "Kunrukh", "Kunuk", "Mirdha", "Morva", "Nagesia", "Nageswar" ],
         "region": "IN",
         "regionname": "India",
         "script": "Orya",
-        "sldr": false,
+        "sldr": true,
         "tag": "xis",
         "tags": [ "xis-IN", "xis-Orya" ],
         "windows": "xis-Orya"
@@ -133293,13 +134355,14 @@
         "full": "xnr-Deva-IN",
         "iana": [ "Kangri" ],
         "iso639_3": "xnr",
+        "localname": "कांगड़ी",
         "macrolang": "doi",
         "name": "Kangri",
         "names": [ "Kangra-Dogri", "Pahari", "Pahari Kangri" ],
         "region": "IN",
         "regionname": "India",
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "xnr",
         "tags": [ "xnr-Deva", "xnr-IN" ],
         "windows": "xnr-Deva"
@@ -134292,13 +135355,27 @@
         "names": [ "Kasena", "Kasim", "Kassem", "Kassena", "Kassene", "Kasɩm" ],
         "region": "GH",
         "regionname": "Ghana",
-        "regions": [ "BF" ],
         "script": "Latn",
         "sldr": true,
         "tag": "xsm",
         "tags": [ "xsm-GH", "xsm-Latn" ],
         "windows": "xsm-Latn"
     },
+    {
+        "full": "xsm-Latn-BF",
+        "iana": [ "Kasem" ],
+        "iso639_3": "xsm",
+        "localname": "Kasɩm",
+        "localnames": [ "Kasɩm" ],
+        "name": "Kasem",
+        "names": [ "Kasena", "Kasim", "Kassem", "Kassena", "Kasɩm" ],
+        "region": "BF",
+        "regionname": "Burkina Faso",
+        "script": "Latn",
+        "sldr": true,
+        "tag": "xsm-BF",
+        "windows": "xsm-Latn-BF"
+    },
     {
         "full": "xsn-Latn-NG",
         "iana": [ "Sanga (Nigeria)" ],
@@ -135647,13 +136724,14 @@
         "iana": [ "Yagnobi" ],
         "iso639_3": "yai",
         "latnnames": [ "Yaɣnobī́ zivók" ],
+        "localname": "Яғнобӣ зивок",
         "localnames": [ "Яғнобӣ зивок" ],
         "name": "Yagnobi",
         "names": [ "Soghdi", "Yaghnabi", "Yaghnobi", "Yaghnubi", "Yagnabi", "Yagnob", "Yagnubi" ],
         "region": "TJ",
         "regionname": "Tajikistan",
         "script": "Cyrl",
-        "sldr": false,
+        "sldr": true,
         "tag": "yai",
         "tags": [ "yai-Cyrl", "yai-TJ" ],
         "windows": "yai-Cyrl"
@@ -136019,6 +137097,7 @@
         "iana": [ "Yakha" ],
         "iso639_3": "ybh",
         "latnnames": [ "Yākkhā" ],
+        "localname": "याक्खा",
         "localnames": [ "याक्खा" ],
         "name": "Yakkha",
         "names": [ "Dewansala", "Jimi Bhasa", "Yakha", "Yakkha Ceya", "Yakkhaba", "Yakkhaba Cea", "Yakkhaba Sala", "Yakthomba" ],
@@ -136026,7 +137105,7 @@
         "regionname": "Nepal",
         "regions": [ "IN" ],
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "ybh",
         "tags": [ "ybh-Deva", "ybh-NP" ],
         "windows": "ybh-Deva"
@@ -136036,13 +137115,14 @@
         "iana": [ "Yamphu" ],
         "iso639_3": "ybi",
         "latnnames": [ "Yāmphu khāpa" ],
+        "localname": "याम्फु खाप",
         "localnames": [ "याम्फु खाप" ],
         "name": "Yamphu",
         "names": [ "Yakkhaba Khap", "Yamphu Kha", "Yamphu Rai", "Yangphu" ],
         "region": "NP",
         "regionname": "Nepal",
         "script": "Deva",
-        "sldr": false,
+        "sldr": true,
         "tag": "ybi",
         "tags": [ "ybi-Deva", "ybi-NP" ],
         "windows": "ybi-Deva"
@@ -136555,7 +137635,7 @@
         "region": "CN",
         "regionname": "China",
         "script": "Plrd",
-        "sldr": false,
+        "sldr": true,
         "tag": "ygp",
         "tags": [ "ygp-CN", "ygp-Plrd" ],
         "windows": "ygp-Plrd"
@@ -137649,7 +138729,7 @@
         "region": "CN",
         "regionname": "China",
         "script": "Plrd",
-        "sldr": false,
+        "sldr": true,
         "tag": "yna",
         "tags": [ "yna-CN", "yna-Plrd" ],
         "windows": "yna-Plrd"
@@ -139044,7 +140124,7 @@
         "region": "CN",
         "regionname": "China",
         "script": "Plrd",
-        "sldr": false,
+        "sldr": true,
         "tag": "ywq",
         "tags": [ "ywq-CN", "ywq-Plrd" ],
         "windows": "ywq-Plrd"
@@ -139301,7 +140381,7 @@
         "full": "za-Latn-CN",
         "iana": [ "Zhuang", "Chuang" ],
         "iso639_3": "zha",
-        "localname": "Vahmbanj",
+        "localname": "Vahcuengh",
         "name": "Zhuang",
         "names": [ "Chuang", "Zhuang, Yongbei" ],
         "region": "CN",
@@ -139525,13 +140605,14 @@
         "full": "zak-Latn-TZ",
         "iana": [ "Zanaki" ],
         "iso639_3": "zak",
+        "localname": "Ekizanaki",
         "localnames": [ "Ekizanaki" ],
         "name": "Zanaki",
         "names": [ "Ekizanaki", "Ikizanaki", "Ilizanaki", "Kizanaki" ],
         "region": "TZ",
         "regionname": "United Republic of Tanzania",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "zak",
         "tags": [ "zak-Latn", "zak-TZ" ],
         "windows": "zak-Latn"
@@ -140216,12 +141297,12 @@
         "full": "zh-Hans-CN",
         "iana": [ "Chinese" ],
         "iso639_3": "zho",
-        "localname": "中文",
+        "localname": "简体中文",
         "name": "Chinese",
         "names": [ "Beifang Fangyan", "Beijinghua", "Chinese, Mandarin", "Hoton", "Hui", "Hui-Zu", "Hytad", "Khoton", "Kuo-Yu", "Mandarin", "Northern Chinese", "Qotong", "Standard Chinese", "Tayok", "Xui", "Zhongguohua" ],
         "region": "CN",
         "regionname": "China",
-        "regions": [ "AU", "BN", "BS", "CA", "CX", "GB", "GQ", "ID", "KH", "KR", "LA", "LY", "MM", "MN", "MU", "MY", "NL", "NZ", "PH", "RU", "TH", "TW", "US", "VN", "WS", "ZA", "ZM" ],
+        "regions": [ "AU", "BN", "BS", "CA", "CX", "GB", "GQ", "ID", "KH", "KR", "LA", "LY", "MM", "MN", "MU", "NL", "NZ", "PH", "RU", "TH", "TW", "US", "VN", "WS", "ZA", "ZM" ],
         "script": "Hans",
         "sldr": true,
         "tag": "zh-CN",
@@ -140282,6 +141363,7 @@
         "full": "zh-Hant-HK",
         "iana": [ "Chinese" ],
         "iso639_3": "zho",
+        "localname": "繁體中文",
         "name": "Chinese",
         "region": "HK",
         "regionname": "Hong Kong",
@@ -140307,6 +141389,7 @@
         "full": "zh-Hans-HK",
         "iana": [ "Chinese" ],
         "iso639_3": "zho",
+        "localname": "简体中文",
         "name": "Chinese",
         "region": "HK",
         "regionname": "Hong Kong",
@@ -140319,6 +141402,7 @@
         "full": "zh-Hans-MO",
         "iana": [ "Chinese" ],
         "iso639_3": "zho",
+        "localname": "简体中文",
         "name": "Chinese",
         "region": "MO",
         "regionname": "Macao",
@@ -140327,6 +141411,19 @@
         "tag": "zh-Hans-MO",
         "windows": "zh-Hans-MO"
     },
+    {
+        "full": "zh-Hans-MY",
+        "iana": [ "Chinese" ],
+        "iso639_3": "zho",
+        "localname": "简体中文",
+        "name": "Chinese",
+        "region": "MY",
+        "regionname": "Malaysia",
+        "script": "Hans",
+        "sldr": true,
+        "tag": "zh-Hans-MY",
+        "windows": "zh-Hans-MY"
+    },
     {
         "full": "zh-Hant-ID",
         "iana": [ "Chinese" ],
@@ -140349,7 +141446,7 @@
         "regionname": "China",
         "regions": [ "AU", "BN", "BS", "CA", "CX", "ES", "GB", "GQ", "HK", "ID", "KH", "KR", "LA", "LY", "MM", "MN", "MO", "MY", "NL", "NZ", "PH", "RU", "SG", "TH", "TW", "US", "VN", "WS", "ZA", "ZM" ],
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "zh-Latn",
         "tags": [ "cmn-Latn", "cmn-Latn-CN", "zh-cmn-Latn", "zh-cmn-Latn-CN" ],
         "variants": [ "pinyin", "wadegile" ],
@@ -140359,6 +141456,7 @@
         "full": "zh-Hant-MO",
         "iana": [ "Chinese" ],
         "iso639_3": "zho",
+        "localname": "繁體中文",
         "name": "Chinese",
         "region": "MO",
         "regionname": "Macao",
@@ -140371,11 +141469,12 @@
         "full": "zh-Hant-MY",
         "iana": [ "Chinese" ],
         "iso639_3": "zho",
+        "localname": "繁體中文",
         "name": "Chinese",
         "region": "MY",
         "regionname": "Malaysia",
         "script": "Hant",
-        "sldr": false,
+        "sldr": true,
         "tag": "zh-MY",
         "windows": "zh-Hant-MY"
     },
@@ -140434,6 +141533,7 @@
         "full": "zh-Hans-SG",
         "iana": [ "Chinese" ],
         "iso639_3": "zho",
+        "localname": "简体中文",
         "name": "Chinese",
         "region": "SG",
         "regionname": "Singapore",
@@ -140573,6 +141673,7 @@
         "full": "zhn-Latn-CN",
         "iana": [ "Nong Zhuang" ],
         "iso639_3": "zhn",
+        "localname": "kauq Daez",
         "localnames": [ "kauq Daez", "kauq Noangz" ],
         "macrolang": "za",
         "name": "Zhuang, Nong",
@@ -140580,7 +141681,7 @@
         "region": "CN",
         "regionname": "China",
         "script": "Latn",
-        "sldr": false,
+        "sldr": true,
         "tag": "zhn",
         "tags": [ "zhn-CN", "zhn-Latn" ],
         "windows": "zhn-Latn"
@@ -140773,6 +141874,21 @@
         "tags": [ "kdv", "kdv-Latn", "kdv-Latn-MM", "kdv-MM", "zkd-Latn", "zkd-MM" ],
         "windows": "zkd-Latn"
     },
+    {
+        "full": "zkd-Zzzz-MM-x-kadu",
+        "iana": [ "Kadu" ],
+        "iso639_3": "zkd",
+        "name": "Kadu",
+        "names": [ "Asak", "Gadu", "Kadu-Ganaan", "Kantu’", "Kato", "Ka’do", "Kudo", "Maw", "Mawteik", "Puteik", "Sak", "Thet" ],
+        "nophonvars": true,
+        "region": "MM",
+        "regionname": "Myanmar",
+        "script": "Zzzz",
+        "sldr": false,
+        "tag": "zkd-Zzzz-x-kadu",
+        "tags": [ "zkd-MM-x-kadu" ],
+        "windows": "zkd-Zzzz-x-kadu"
+    },
     {
         "full": "zkg-Zyyy-CN",
         "iana": [ "Koguryo" ],
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 db7d38cde2..46ed231c3d 100755
--- a/web/build.sh
+++ b/web/build.sh
@@ -37,7 +37,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" \
@@ -147,12 +147,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 d64a275aeb..7f9c08ffc6 100644
--- a/web/src/app/browser/src/contextManager.ts
+++ b/web/src/app/browser/src/contextManager.ts
@@ -761,7 +761,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';
@@ -822,11 +822,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 d0be8929a5..0e203f562c 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 5902ab6c0b..67c146a34e 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 class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, ContextManager, HardwareEventKeyboard> {
   touchLanguageMenu?: LanguageMenu;
@@ -55,10 +56,10 @@ export class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
     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 class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
 
     // 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 class KeymanEngine extends KeymanEngineBase<BrowserConfiguration, Context
     // 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 b06adb8f30..de4544af3b 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 f0e6dfde21..45c3342644 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 b2bb980ede..d73e440586 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 487e1743b6..386b2cd090 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 37fab0e797..f8d3bb7d06 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 7961212081..646c8f1687 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 e7bb25bf16..2fce06ed62 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 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 class KeymanEngine extends KeymanEngineBase<WebviewConfiguration, Context
       }
     }
 
-    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 d456f75e57..ba70bfef9b 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 3958f6f714..865e78936b 100755
--- a/web/src/engine/main/build.sh
+++ b/web/src/engine/main/build.sh
@@ -50,6 +50,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 09276a9670..fd6d2916b7 100644
--- a/web/src/engine/main/src/headless/inputProcessor.ts
+++ b/web/src/engine/main/src/headless/inputProcessor.ts
@@ -22,6 +22,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 = {
@@ -40,7 +41,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');
     }
@@ -51,7 +52,7 @@ export class InputProcessor {
 
     this.contextDevice = device;
     this.kbdProcessor = new JSKeyboardProcessor(device, options);
-    this.lngProcessor = new LanguageProcessor(predictiveTextWorker, this.contextCache);
+    this.lngProcessor = new LanguageProcessor(predictiveWorkerFactory, this.contextCache);
   }
 
   public async init(paths: PathConfiguration): Promise<void> {
diff --git a/web/src/engine/main/src/headless/languageProcessor.ts b/web/src/engine/main/src/headless/languageProcessor.ts
index f81ae547a5..d84662aa47 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";
 // TODO-web-core: remove use of OutputTargetBase
 import { Transcription, Mock, OutputTargetBase } from "keyman/engine/js-processor";
 import { OutputTarget } from 'keyman/engine/keyboard';
@@ -27,7 +27,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;
@@ -40,11 +40,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 {
@@ -60,6 +70,10 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
   }
 
   public unloadModel() {
+    if(!this.isActive) {
+      return;
+    }
+
     this.lmEngine.unloadModel();
     delete this.currentModel;
     delete this.configuration;
@@ -73,6 +87,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;
 
@@ -110,9 +128,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) {
@@ -123,7 +138,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) {
       // TODO-web-core
       const transcription = (outputTarget as OutputTargetBase).buildTranscriptionFrom((outputTarget as OutputTargetBase), null, false);
       return this.predict_internal(transcription, true, layerId);
@@ -177,6 +197,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");
@@ -250,6 +274,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.
@@ -286,7 +314,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
   }
 
   public predictFromTarget(outputTarget: OutputTarget, layerId: string): Promise<Suggestion[]> {
-    if(!outputTarget) {
+    if(!this.isActive || !outputTarget) {
       return null;
     }
 
@@ -301,7 +329,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;
     }
 
@@ -350,19 +378,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;
   }
@@ -372,7 +400,7 @@ export class LanguageProcessor extends EventEmitter<LanguageProcessorEventMap> {
   }
 
   public set mayPredict(flag: boolean) {
-    if(!this.canEnable()) {
+    if(!this.canEnable) {
       return;
     }
 
@@ -425,6 +453,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.
@@ -435,6 +467,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/keymanEngineBase.ts b/web/src/engine/main/src/keymanEngineBase.ts
index b9ea22967a..d801c5eb7c 100644
--- a/web/src/engine/main/src/keymanEngineBase.ts
+++ b/web/src/engine/main/src/keymanEngineBase.ts
@@ -2,6 +2,7 @@ import { type KeyEvent, JSKeyboard, Keyboard, KeyboardProperties, KeyboardKeyman
 // TODO-web-core: remove usage of OutputTargetBase
 import { OutputTargetBase, 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, JSKeyboardData } from "keyman/engine/osk";
 import { KeyboardRequisitioner, ModelCache, toUnprefixedKeyboardId as unprefixed } from "keyman/engine/keyboard-storage";
@@ -114,7 +115,7 @@ export class KeymanEngineBase<
    *                                   the superclass constructor.
    */
   constructor(
-    worker: Worker,
+    workerFactory: WorkerFactory,
     config: Configuration,
     contextManager: ContextManager,
     processorConfigInitializer: (engine: KeymanEngineBase<Configuration, ContextManager, HardKeyboard>) => ProcessorConfiguration
@@ -125,7 +126,7 @@ export class KeymanEngineBase<
     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 916ba061d4..123d6c2340 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 { JSKeyboardInterface } 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 JSKeyboardInterface({}, 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 371822d1f7..591b112392 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 JSKeyboardInterface({}, 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 23301ecce5..25ae78abde 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 { JSKeyboardInterface } 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 JSKeyboardInterface({}, 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 e503c59cd6..83936da36f 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 { JSKeyboardInterface } 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 JSKeyboardInterface({}, 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 2684fe52fc..9eebd0dbf2 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 { JSKeyboardInterface, 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.
@@ -91,7 +93,7 @@ describe('InputProcessor', function() {
       }
 
       // Load the keyboard.
-      let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
+      let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
       const keyboard = await keyboardLoader.loadKeyboardFromPath(require.resolve('@keymanapp/common-test-resources/keyboards/test_chirality.js'));
       keyboardWithHarness = keyboardLoader.harness;
       keyboardWithHarness.activeKeyboard = keyboard;
@@ -186,7 +188,7 @@ describe('InputProcessor', function() {
 
     before(async function () {
       // Load the keyboard.
-      let keyboardLoader = new NodeKeyboardLoader(new KeyboardInterface({}, MinimalKeymanGlobal));
+      let keyboardLoader = new NodeKeyboardLoader(new JSKeyboardInterface({}, MinimalKeymanGlobal));
       const keyboard = await keyboardLoader.loadKeyboardFromPath(require.resolve('@keymanapp/common-test-resources/keyboards/test_8568_deadkeys.js'));
       keyboardWithHarness = keyboardLoader.harness;
       keyboardWithHarness.activeKeyboard = keyboard;
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 ed1740322a..efb4b387bc 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 JSKeyboardProcessor 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/locale/vi-VN/strings.xml b/windows/src/desktop/kmshell/locale/vi-VN/strings.xml
new file mode 100644
index 0000000000..53ba4a7b67
--- /dev/null
+++ b/windows/src/desktop/kmshell/locale/vi-VN/strings.xml
@@ -0,0 +1,956 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  strings.xml: Contains all localizable strings for Keyman for Windows
+  * Create a user interface translation for Keyman for Windows at https://translate.keyman.com/
+-->
+<resources>
+  <!-- Context: System -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.266.0 -->
+  <string name="S_LocaleAuthors" comment="Name(s) of people who created this translation - i.e. your name">Mike Vo, Mai Lê Bảo Khang</string>
+  <!-- Context: _Font -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SK_UIFontName" comment="The standard font">Segoe UI</string>
+  <!-- Context: _Font -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SK_UIFontSize" comment="The standard font size">9</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKButtonYes" comment="Yes button in message boxes">&amp;Có</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKButtonNo" comment="No button in message boxes">&amp;Không</string>
+  <!-- Context: General Strings -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_OK" comment="Ok button term">OK</string>
+  <!-- Context: General Strings -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_Cancel" comment="Cancel button term">Huỷ</string>
+  <!-- Context: General Strings -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_Close" comment="Close button term">Đóng</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKButtonOK" comment="OK button in message boxes">OK</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKButtonCancel" comment="Cancel button in message boxes">Huỷ</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 16.0.47 -->
+  <string name="SKAddremove" comment="Add or Remove languages button opens a dialog window">Thêm/xoá ngôn ngữ...</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.330.0 -->
+  <string name="SKBalloonClickToSelectKeyboard" comment="Balloon that shows when Keyman icon is first shown during the tutorial">Nhấn biểu tượng này để chọn bàn phím</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.330.0 -->
+  <string name="SKBalloonOSKClosed" comment="Balloon that shows when OSK is closed">Keyman vẫn đang chạy.  Nhấn biểu tượng này để dùng bàn phím ngôn ngữ của bạn bất cứ lúc nào</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 14.0.234 -->
+  <string name="SKBalloonKeymanIsRunning" comment="Balloon that shows when user tries to start Keyman but it is already running">Keyman đã chạy rồi. Vui lòng nhấn biểu tượng Keyman trong khu vực thông báo hệ thống để dùng bàn phím ngôn ngữ của bạn</string>
+  <!-- Context: Configuration Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_ConfigurationTitle" comment="Configuration dialog title, which includes the product name">Cài đặt Keyman</string>
+  <!-- Context: Configuration Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.239.0 -->
+  <string name="S_Caption_Help" comment="Configuration dialog link to Help">Trợ giúp</string>
+  <!-- Context: Configuration Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 16.0.47.0 -->
+  <string name="S_Caption_Uninstall" comment="Configuration dialog link to Uninstall Keyboard">Gỡ cài đặt</string>
+  <!-- Context: Configuration Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 16.0.47.0 -->
+  <string name="S_Caption_Enable" comment="Configuration dialog link to Enable Keyboard">Bật</string>
+  <!-- Context: Configuration Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 16.0.47.0 -->
+  <string name="S_Caption_Disable" comment="Configuration dialog link to Disable Keyboard">Tắt</string>
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Keyboards" comment="Keyboard Layouts tab name">Bố cục bàn phím</string>
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Keyboards_AccessChar" comment="Direct access to the Keyboard Layouts tab using alt+">K</string>
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Options" comment="Options tab name">Tùy chỉnh</string>
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Options_AccessChar" comment="Direct access to the Options tab using alt+">O</string>
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Hotkeys" comment="Hotkeys tab name">Phím tắt</string>
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Hotkeys_AccessChar" comment="Direct access to the Hotkeys tab using alt+">H</string>
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Support" comment="Support tab name">Hỗ Trợ</string>
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Support_AccessChar" comment="Direct access to the Support tab using alt+">S</string>
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.493.0 -->
+  <string name="S_KeepInTouch" comment="Keep in touch tab name">Giữ liên lạc</string>
+  <!-- Context: Configuration Dialog - Tab names -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.492.0 -->
+  <string name="S_KeepInTouch_AccessChar" comment="Direct access to the Keep in Touch tab using alt+">T</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Filename" comment="Keyboard download window, etc. - term for filename">Tên tập tin:</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Version" comment="Keyboard download window, etc. - term for package version">Phiên bản gói:</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.442.0 -->
+  <string name="S_Caption_KeyboardVersion" comment="Keyboard download window, etc. - term for keyboard version">Phiên bản bàn phím:</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Author" comment="Keyboard download window, etc. - term for author">Tác giả:</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Website" comment="Keyboard download window, etc. - term for website">Website:</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Package" comment="Keyboard download window, etc. - term for package">Gói:</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Fonts" comment="Keyboard download window, etc. - term for fonts">Phông:</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Keyboards" comment="Keyboard download window, etc. - term for keyboard layouts">Bố cục bàn phím:</string>
+  <!-- Context: Keyboard Install Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 14.0 -->
+  <string name="S_Caption_Keyboard" comment="Keyboard install dialog - term for a single keyboard layout">Bố cục bàn phím:</string>
+  <!-- Context: Keyboard Install Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 14.0 -->
+  <string name="S_Caption_KeyboardLanguage" comment="Keyboard install dialog - term for caption for language selector a single keyboard layout">Ngôn ngữ bàn phím:</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Encodings" comment="Keyboard download window, etc. - term for encodings (encodings include Unicode, ANSI, Non-Unicode, etc).">Bảng mã:</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_LayoutType" comment="Keyboard download window, etc. - term for keyboard layout type (keyboard layout types include Fixed and Mnemonic)">Loại bố cục:</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_LayoutType_Positional" comment="Keyboard download window, etc. - term for the fixed keyboard layout type">Cố định (Theo vị trí)</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_LayoutType_Mnemonic" comment="Keyboard download window, etc. - term for the mnemonic keyboard layout type">Ánh xạ tới bố cục Windows (Mnemonic)</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.420.0 -->
+  <string name="S_Caption_Languages" comment="Text preceding linked language profiles">Ngôn ngữ:</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.420.0 -->
+  <string name="S_Languages_Uninstall" comment="Remove language profile">✕</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.420.0 -->
+  <string name="S_Languages_Install" comment="Add language profile">Thêm ngôn ngữ</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 16.0.47 -->
+  <string name="S_Languages_Addremove" comment="Title for dialog to add or remove languages for keyboard layout">Thêm/xoá ngôn ngữ</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_OnScreenKeyboard" comment="Term for the On Screen Keyboard">Bàn phím ảo:</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.306.0 -->
+  <string name="S_OnScreenKeyboard_Custom" comment="(OSK) Custom term">Tùy chỉnh</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_OnScreenKeyboard_Installed" comment="(OSK) Installed term">Đã cài đặt</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_OnScreenKeyboard_NotInstalled" comment="(OSK) Not installed term">Chưa cài đặt</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.306.0 -->
+  <string name="S_Caption_Documentation" comment="Term for the Documentation">Tài liệu hướng dẫn:</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.306.0 -->
+  <string name="S_Documentation_Installed" comment="(Documentation) Installed term">Đã cài đặt</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.306.0 -->
+  <string name="S_Documentation_NotInstalled" comment="(Documentation) Not installed term">Chưa cài đặt</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Message" comment="Keyboard download window, etc. - term for additional messages">Tin nhắn:</string>
+  <!-- Context: Configuration Dialog - Captions -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Caption_Copyright" comment="Keyboard download window, etc. - term for copyright">Bản quyền:</string>
+  <!-- Context: Configuration Dialog - Footer -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 14.0 -->
+  <string name="S_Footer_ChangesImmediate" comment="Short-term (14.0) message explaining why Ok and Cancel buttons are no longer present">Các thay đổi được áp dụng ngay lập tức</string>
+  <!-- Context: Configuration Dialog - Footer -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_InstallKeyboard" comment="Keyboard Layouts - install keyboard button">Cài đặt bàn phím...</string>
+  <!-- Context: Configuration Dialog - Footer -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_DownloadKeyboard" comment="Keyboard Layouts - download keyboard button">Tải về bàn phím...</string>
+  <!-- Context: Configuration Dialog - Keyboard Layouts tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.287.0 -->
+  <string name="S_Menu_Options" comment="KL option button submenu - keyboard options">Cài đặt bàn phím...</string>
+  <!-- Context: Configuration Dialog - Keyboard Layouts tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Keyboards_NoKeyboardsInstalled" comment="Keyboard Layouts - notice of no keyboard layouts installed">Bạn không có bàn phím nào được cài đặt. Vui lòng nhấn nút Tải về Bàn phím để cài đặt một bố cục bàn phím từ website Keyman.</string>
+  <!-- Parameters: %1$s = keyboard layout name -->
+  <!-- Context: Configuration Dialog - Keyboard Layouts tab -->
+  <!-- Introduced: 7.1.251.0 -->
+  <!-- String Type: PlainText -->
+  <string name="SKUninstallRequireAdmin" comment="Keyboard Layouts - notice of ineligibility to uninstall a keyboard">Bạn chỉ được gỡ bàn phím %1$s nếu bạn là một Quản trị viên</string>
+  <!-- Context: Configuration Dialog - Keyboard Layouts tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 13.0.40.0 -->
+  <string name="S_Keyboard_Share" comment="Keyboard Layouts - share selected keyboard button">Chia sẻ bàn phím</string>
+  <!-- Context: Configuration Dialog - Keyboard Layouts tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 13.0.40.0 -->
+  <string name="S_Keyboard_Share_QRCode" comment="Keyboard Layouts - caption explaining QRCode, plus prefix to link to share">Quét mã này để tải bàn phím này trong thiết bị khác hoặc </string>
+  <!-- Context: Configuration Dialog - Keyboard Layouts tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 13.0.40.0 -->
+  <string name="S_Keyboard_Share_Link" comment="Keyboard Layouts - text for link to share">chia sẻ trực tuyến</string>
+  <!-- Context: Configuration Dialog - Keyboard Layouts tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 13.0.40.0 -->
+  <string name="S_Keyboard_Share_LinkSuffix" comment="Keyboard Layouts - suffix for link to share"></string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="kogGeneral" comment="Options section - General">Tổng thể</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="kogStartup" comment="Options section - Startup">Khởi động</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.244.0 -->
+  <string name="kogOSK" comment="Options section - OSK">Bàn phím ảo</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="kogAdvanced" comment="Options section - Advanced">Nâng cao</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="koKeyboardHotkeysAreToggle" comment="General options - hotkeys toggle on AND off a keyboard layout">Phím tắt Bàn phím chuyển đổi kích hoạt bàn phím</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="koAltGrCtrlAlt" comment="General options - Ctrl+Alt simulates AltGr on computers without AltGr">Mô phỏng AltGr với 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">Cho phép sửa đổi đúng cho các phím tắt</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">Xử lý phím chết phần cứng như các phím đơn giản</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.244.0 -->
+  <string name="koShowHints" comment="General options - show/hide hint messages (resets hint messages individually disabled)">Hiển thị tin nhắn gợi ý</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 14.0 -->
+  <string name="koAutomaticallyReportErrors" comment="General options - report errors to Keyman team automatically">Tự động báo lỗi tới keyman.com</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 14.0 -->
+  <string name="koAutomaticallyReportUsage" comment="General options - report anonymous usage to Keyman team automatically">Chia sẻ thống kê sử dụng ẩn danh với keyman.com</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="koStartWithWindows" comment="Startup options - Start Keyman with Windows start">Chạy khi Windows khởi động</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="koShowStartup" comment="Startup options - show/hide splash screen">Hiển thị màn hình chào</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="koShowWelcome" comment="Startup options - show/hide welcome screen">Hiển thị màn hình chào mừng</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Modified: 18.0.96.0 -->
+  <string name="koCheckForUpdates" comment="Automatically check for updates and download">Tự động kiểm tra cập nhật và tải xuống</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">Kiểm tra các ứng dụng can thiệp khi Keyman khởi động</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.236.0 -->
+  <string name="koReleaseShiftKeysAfterKeyPress" comment="OSK options - Releases shift/ctrl/alt on OSK after key press">Nhả phím Shift/Ctrl/Alt trên bàn phím ảo sau khi nhấn một phím</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.244.0 -->
+  <string name="koAutoOpenOSK" comment="OSK options - auto-open OSK">Luôn hiện Cửa sổ Bàn phím ảo khi bàn phím Keyman được chọn</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.244.0 -->
+  <string name="koAutoSwitchOSKPages" comment="OSK options - when a keyboard is activated, switch to most appropriate page in OSK">Tự động chuyển sang Bàn phím ảo/Trợ giúp phù hợp khi chọn bàn phím</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="koDebugging" comment="Advanced options - turn on debugging (which creates a very large file)">Gỡ lỗi</string>
+  <!-- Context: Configuration Dialog - Options tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.445.0 -->
+  <string name="S_Button_BaseKeyboard" comment="Options tab - base keyboard button">Bố trí bàn phím cơ sở...</string>
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.241.0 -->
+  <string name="S_Hotkey_Language_Prefix" comment="Hotkey - activation term preceding Windows language name. Note: include a space following."></string>
+  <!-- e.g. "Activate [Korean KORDA] Keyboard" -->
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.241.0 -->
+  <string name="S_Hotkey_Language_Suffix" comment="Hotkey - language term following Windows language name. Note: include an initial space."></string>
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Hotkey_None" comment="Hotkey - text used when no hotkey set">(không có hotkey)</string>
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Hotkey_TurnKeymanOff" comment="Hotkey - Turn Product Off">Tắt bộ gõ Keyman</string>
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Hotkey_OpenKeyboardMenu" comment="Hotkey - Open Keyman system tray menu">Mở menu bàn phím</string>
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Hotkey_ShowOnScreenKeyboard" comment="Hotkey - show keyboard in OSK">Xem Bàn phím ảo</string>
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Hotkey_OpenConfiguration" comment="Hotkey - open Keyman Configuration">Mở Cấu hình</string>
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.275.0 -->
+  <string name="S_Hotkey_ShowFontHelper" comment="Hotkey - show font helper in OSK">Hiện trị ngăn Trợ giúp phong chữ</string>
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.275.0 -->
+  <string name="S_Hotkey_ShowCharacterMap" comment="Hotkey - show character map in OSK">Hiển thị ngăn Bảng ký tự</string>
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.275.0 -->
+  <string name="S_Hotkey_OpenTextEditor" comment="Hotkey - open text editor">Mở Trình chỉnh sửa văn bản</string>
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_Hotkey_SwitchLanguage" comment="Hotkey - switch language window">Mở Trình chuyển đổi ngôn ngữ</string>
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.274.0 -->
+  <string name="S_Hotkey_Control_Title" comment="Hotkey - Control Title">Phím tắt chung</string>
+  <!-- Context: Configuration Dialog - Hotkeys tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.274.0 -->
+  <string name="S_Hotkey_Keyboard_Title" comment="Hotkey - Keyboard Title">Bố cục bàn phím</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.465.0 -->
+  <string name="S_Support_ContactInstructions_Free" comment="">Nếu có vấn đề sử dụng Keyman, chỉ cần hỏi trong Diễn đàn Cộng đồng Keyman.</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.465.0 -->
+  <string name="S_Button_CommunitySupport" comment="">Diễn đàn cộng đồng mở Keyman</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 11.0.1500.0 -->
+  <string name="S_Support_CreatedBySIL" comment="Support - SIL statement">Tạo bởi SIL International</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Support_Copyright" comment="Support - Product Copyright">Bản quyền © SIL International. Mọi quyền được bảo lưu.</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.94.0 -->
+  <string name="S_Support_CreatedBySILGlobal" comment="Created by {SIL Global} ">Được tạo bởi %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.">Bản quyền © %1$s. Mọi bản quyền được bảo lưu.</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Support_Version" comment="Support - version">Phiên bản</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_Support_UsefulLinks" comment="Support - Useful Links heading">Liên kết hữu ích</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_OnlineSupport" comment="Support button - links to online support">Trợ giúp trên mạng</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_CheckForUpdates" comment="Support button - manually checks for product updates">Kiểm tra bản cập nhật</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_ProxyConfig" comment="Options button - allows manual adjustment of proxy settings">Cài đặt proxy...</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Button_SettingsManager" comment="Options button - access to the Settings Manager">Cài đặt hệ thống Keyman...</string>
+  <!-- Context: Configuration Dialog - Support tab -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_Diagnostics_Diagnostics" comment="Support button submenu - performs a diagnostic report">Chẩn đoán</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">Không có bản cập nhật nào khả dụng.</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 ">Các bản cập nhật hiện có sẽ được áp dụng khi Windows được khởi động lại lần tiếp theo.</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 ">Việc cập nhật ngay bây giờ yêu cầu khởi động lại máy tính.</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">Bản cập nhật Keyman đã sẵn sàng để cài đặt.</string>
+  <!-- Context: Download Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_DownloadKeyboard_Title" comment="Download keyboard layout from keyman.com dialog title">Tải bàn phím từ keyman.com</string>
+  <!-- Context: Download Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_DownloadKeyboard_DownloadOnlyCheckbox" comment="Download only option checkbox">Đừng cài, chỉ cần tải về</string>
+  <!-- Parameters: %1$s = Error Message, %2$d Error Code -->
+  <!-- Context: Download Keyboard Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 14.0 -->
+  <string name="S_DownloadKeyboard_DownloadError" comment="Message shown when there is an error downloading the keyboard package">Không thể tải về được bàn phím, lỗi</string>
+  <!-- Context: Download Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 14.0 -->
+  <string name="S_Button_Back" comment="Back button">&lt; Quay lại</string>
+  <!-- Context: Install Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_InstallKeyboard_Title" comment="Install keyboard/package dialog title">Cài đật bàn phím/gói phần mềm</string>
+  <!-- Context: Install Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_InstallKeyboard_Tab_Details" comment="Install keyboard/package - details">Thông tin chi tiết</string>
+  <!-- Context: Install Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_InstallKeyboard_Tab_Readme" comment="Install keyboard/package - readme">Readme</string>
+  <!-- Context: Install Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_InstallKeyboard_Button_Install" comment="Install keyboard/package - install button">Cài đặt</string>
+  <!-- Context: Proxy Configuration Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_ProxyConfiguration_Title" comment="Proxy configuration dialog title">Tùy chỉnh Máy chủ proxy</string>
+  <!-- Context: Proxy Configuration Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_ProxyConfiguration_Server" comment="Proxy dialog - fillable-field server">Máy chủ: </string>
+  <!-- Context: Proxy Configuration Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_ProxyConfiguration_Port" comment="Proxy dialog - fillable-field port">Cổng: </string>
+  <!-- Context: Proxy Configuration Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_ProxyConfiguration_Username" comment="Proxy dialog - fillable-field username">Tên tài khoản đăng nhập: </string>
+  <!-- Context: Proxy Configuration Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_ProxyConfiguration_Password" comment="Proxy dialog - fillable-field password">Mật khẩu: </string>
+  <!-- Context: Base Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.445.0 -->
+  <string name="S_BaseKeyboard_Title" comment="Base keyboard dialog title">Đặt layout bàn phím gốc</string>
+  <!-- Context: Base Keyboard Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.445.0 -->
+  <string name="S_BaseKeyboard_Text" comment="Base keyboard dialog description">Chọn bàn phím chữ Latin cơ bản mà bạn sử dụng trong Windows. Bàn phím Keyman sẽ tự động điều chỉnh theo bố cục bạn thích.</string>
+  <!-- Context: Hotkey Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKChangeHotkeyTitle" comment="Change Hotkey dialog title">Thay đổi phím tắt</string>
+  <!-- Parameters: %1$s = Name of keyboard -->
+  <!-- Context: Hotkey Dialog -->
+  <!-- Introduced: 7.0.241.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKSetHotkey_Language" comment="Hotkey dialog - message when setting hotkey for a language">Chọn một phím tắt chuẩn hay chọn \'Tuỳ chọn\' và giữ Ctrl,Shirt và/hay Alt và gõ phím tắt mong muốn của bạn cho ngôn ngữ %1$s:</string>
+  <!-- Context: Hotkey Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKSetHotkey_Interface" comment="Hotkey dialog - message displayed when changing a hotkey for a product feature (e.g. show menu or show on screen keyboard)">Chọn một phím tắt chuẩn hay chọn \'Tuỳ chọn\' và giữ Ctrl,Shirt và/hay Alt và gõ phím tắt mong muốn của bạn:</string>
+  <!-- Parameters: %1$s = Hotkey -->
+  <!-- Context: Hotkey Dialog -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUnsafeHotkey" comment="Hotkey dialog - warning of hotkey conflict with standard keyboard use">Phím tắt %1$s sẽ mâu thuẫn với việc sử dụng bàn phím thông thường. Bạn nên sử dụng ít nhất Ctrl hoặc Alt. Bạn có muốn thay đổi điều này ngay bây giờ không?</string>
+  <!-- Parameters: %1$s = Hotkey, %2$s = Conflicting keyboard -->
+  <!-- Context: Hotkey Dialog -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKHotkeyConflicts_Keyboard" comment="Hotkey dialog - warning of hotkey conflict with hotkey for another keyboard">Phím nóng %1$s xung đột với phím tắt được chọn cho bàn phím %2$s. Nếu bạn tiếp tục, phím tắt cho bàn phím %2$s sẽ bị xóa. Tiếp tục\?</string>
+  <!-- Parameters: %1$s = Hotkey -->
+  <!-- Context: Hotkey Dialog -->
+  <!-- Introduced: 14.0.117 -->
+  <!-- String Type: FormatString -->
+  <string name="SKHotkeyConflicts_Interface" comment="Hotkey dialog - warning of hotkey conflict with hotkey for another interface hotkey">Phím tắt %1$s xung đột với phím tắt khác. Nếu bạn tiếp tục, phím tắt kia sẽ bị xóa. Tiếp tục\?</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0.230.0 -->
+  <string name="S_Update" comment="Update tab name">Cập nhật</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">Các thành phần Keyman đã cập nhật khả dụng</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Update_NewVersionAvailable" comment="Update dialog - updates available text">Bản cập nhật cho Keyman hiện đã có sẵn</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.255.0 -->
+  <string name="S_Update_NewVersionPrompt" comment="Update dialog - prompt to select updates">Vui lòng chọn bản cập nhật bạn muốn cài đặt:</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Update_DownloadFrom" comment="Update dialog - download information">Bạn có thể tải phiên bản mới từ:</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Update_Button_InstallNow" comment="Update dialog - install now button">Cài đặt ngay</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Update_Button_InstallLater" comment="Update dialog - cancel button">Huỷ</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.255.0 -->
+  <string name="S_Update_OldVersionHead" comment="Update dialog - old version">Phiên bản cũ</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.255.0 -->
+  <string name="S_Update_ComponentHead" comment="Update dialog - update component">Hợp phần đã được cập nhật</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.1.255.0 -->
+  <string name="S_Update_SizeHead" comment="Update dialog - update size">Kích cỡ</string>
+  <!-- Parameters: %1$s = Current version number -->
+  <!-- Context: Online Update Dialog -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUpdate_KeymanText" comment="Update dialog - name and version of updatable product">Keyman %1$s</string>
+  <!-- Parameters: %1$s = Package description, %2$s = Current package version number -->
+  <!-- Context: Online Update Dialog -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUpdate_PackageText" comment="Update dialog - name and version of updatable keyboard layout package">Bàn phím %1$s %2$s</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKUpdate_UnableToContact" comment="Update dialog - unable to access keyman.com warning">Không thể liên hệ với keyman.com - vui lòng đảm bảo rằng bạn có kết nối Internet đang hoạt động và thử lại.</string>
+  <!-- Parameters: %1$s = Error message -->
+  <!-- Context: Online Update Dialog -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUpdate_UnableToContact_Error" comment="Update dialog - unable to access keyman.com error message">Không thể liên hệ với keyman.com - vui lòng đảm bảo rằng bạn có kết nối Internet đang hoạt động và thử lại. Lỗi nhận được là: %1$s</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.288.0 -->
+  <string name="SKUpdate_IconTitle" comment="Update icon - title">Bản cập nhật Keyman hiện có sẵn</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.288.0 -->
+  <string name="SKUpdate_IconText" comment="Update icon - text">Nhấp vào biểu tượng này để tải xuống và cài đặt bản cập nhật</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.288.0 -->
+  <string name="SKUpdate_IconMenuText" comment="Update icon - install menu item">Xem và &amp;tải các bản cập nhật Keyman</string>
+  <!-- Context: Online Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.288.0 -->
+  <string name="SKUpdate_IconMenuExit" comment="Update icon - exit menu item">Thoát &amp;kiểm tra cập nhật trực tuyến</string>
+  <!-- Context: Update Dialog -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 17.0233.0 -->
+  <string name="S_Button_Update_ApplyNow" comment="Apply update now button - update dialog">Áp dụng cập nhật ngay</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">Kiểm tra các bản cập nhật mới</string>
+  <!-- Context: Splash Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.288.0 -->
+  <!-- Context: Splash Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_Splash_Start" comment="Start Keyman button">Khởi động Keyman</string>
+  <!-- Context: Splash Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 18.0 -->
+  <string name="S_Splash_Start_2" comment="Start {Keyman} button">Khởi động %1$s</string>
+  <!-- Context: Splash Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_Splash_Exit" comment="Exit button">Thoát</string>
+  <!-- Context: Splash Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_Splash_Configuration" comment="Keyman Configuration link">Cấu hình</string>
+  <!-- Context: Splash Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.341.0 -->
+  <string name="S_Splash_ShowAtStartup" comment="Show at Startup toggle">Hiển thị màn hình này khi khởi động</string>
+  <!-- Context: _LanguageInfo -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.278.0 -->
+  <string name="S_DisplayIn" comment="'Display In' text label for UI language menu">Hiển thị</string>
+  <!-- Context: _LanguageInfo -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 8.0.278.0 -->
+  <string name="S_MoreUILanguagesMenu" comment="More UI languages online menu item">Tìm ngôn ngữ hiển thị khác trực tuyến...</string>
+  <!-- Context: _LanguageInfo -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 9.0.525.0 -->
+  <string name="S_ContributeUILanguagesMenu" comment="Link to contribute to language UI">Giúp dịch giao diện người dùng...</string>
+  <!-- Context: _LanguageInfo -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKUILanguageName" comment="User interface language name in the UI language">Tiếng Việt</string>
+  <!-- Context: _LanguageInfo -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKUILanguageNameWithEnglish" comment="UI language name in the UI language with the English name in parentheses  (this message is used when the user gets stuck in a strange UI language)">Tiếng Việt</string>
+  <!-- Context: _LanguageInfo -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKLanguageCode" comment="The language code for the current translation">vi</string>
+  <!-- Context: _LanguageInfo -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKDefaultLanguageCode" comment="The default language code for this product.  This should be the language that the product is created in. For Keyman this must stay 'en', for all translations.">vi</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- Context: Hints -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.244.0 -->
+  <string name="S_Button_ResetHints" comment="Hint - options tab button to reset hints">Đặt lại gợi ý</string>
+  <!-- Context: Hints -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.244.0 -->
+  <string name="SKHintsReset" comment="Hint - options tab dialog confirming reset of hints">Tất cả tin nhắn gợi ý đã được đặt lại và sẽ hiển thị lại.</string>
+  <!-- Context: Hints -->
+  <!-- Introduced: 7.0.244.0 -->
+  <!-- String Type: HintTitle -->
+  <!-- DevNote: this is a constructed identifier so won't appear in a search with i18n-check-unused-strings.sh -->
+  <string name="HintTitle_KH_EXITPRODUCT" comment="Hint - dialog title upon attempting to exit product">Bạn có muốn thoát phần mềm Keyman?</string>
+  <!-- Context: Hints -->
+  <!-- Introduced: 7.0.244.0 -->
+  <!-- String Type: Hint -->
+  <!-- DevNote: this is a constructed identifier so won't appear in a search with i18n-check-unused-strings.sh -->
+  <string name="Hint_KH_EXITPRODUCT" comment="Hint - asks for confirmation, explains the difference between de-activating a keyboard layout and closing Product">Bạn có chắc chắn muốn thoát khỏi Keyman\? Bàn phím Keyman của bạn vẫn sẽ được liệt kê theo ngôn ngữ Windows nhưng sẽ không hoạt động cho đến khi bạn khởi động lại Keyman.</string>
+  <!-- Context: Hints -->
+  <!-- Introduced: 7.0.244.0 -->
+  <!-- String Type: HintTitle -->
+  <!-- DevNote: this is a constructed identifier so won't appear in a search with i18n-check-unused-strings.sh -->
+  <string name="HintTitle_KH_CLOSEOSK" comment="Hint - dialog title upon closing the OSK">Đã đóng bàn phím ảo</string>
+  <!-- Context: Hints -->
+  <!-- Introduced: 7.0.244.0 -->
+  <!-- String Type: Hint -->
+  <!-- DevNote: this is a constructed identifier so won't appear in a search with i18n-check-unused-strings.sh -->
+  <string name="Hint_KH_CLOSEOSK" comment="Hint - explains that Product is still running and informs how to reopen OSK">Bạn đã đóng Bàn phím ảo. Keyman vẫn đang chạy. Bạn có thể mở bàn phím ảo bất kỳ lúc nào bằng cách nhấp vào Biểu tượng Keyman và chọn \"Bàn phím ảo\"</string>
+  <!-- Context: Hints -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 10.0.836.0 -->
+  <string name="S_HintDialog_DontShowHintAgain" comment="Hint dialog - caption of checkbox at bottom of dialog">Đừng hiển thị gợi ý này nữa</string>
+  <!-- Context: Help Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_HelpTitle" comment="Help - product name help">Hướng dẫn Keyman</string>
+  <!-- Context: Help Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Help_Product" comment="Help - help contents link title">Nội dung hướng dẫn</string>
+  <!-- Context: Help Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Help_Keyboard_Prefix" comment="Help - text preceding keyboard name">Trợ giúp về \"</string>
+  <!-- Context: Help Dialog -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Help_Keyboard_Suffix" comment="Help - text following keyboard name">Bàn phím \"</string>
+  <!-- Context: Toolbar Context Help -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Toolbar_ViewOnScreenKeyboard" comment="Toolbar help - View OSK pop-up text">Xem Bàn phím ảo</string>
+  <!-- Context: Toolbar Context Help -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Toolbar_ViewFontHelper" comment="Toolbar help - View Font Helper pop-up text">Xem Trình hướng dẫn phông chữ</string>
+  <!-- Context: Toolbar Context Help -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Toolbar_ViewCharacterMap" comment="Toolbar help - View Character Map pop-up text">Xem Bảng ký tự</string>
+  <!-- Context: Toolbar Context Help -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Toolbar_OpenConfiguration" comment="Toolbar help - Open Keyman Configuration pop-up text">Mở Cấu hình Keyman</string>
+  <!-- Context: Toolbar Context Help -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Toolbar_OpenHelp" comment="Toolbar help - Open help pop-up text">Mở trợ giúp</string>
+  <!-- Context: Toolbar Context Help -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Toolbar_CloseOnScreenKeyboard" comment="Toolbar help - Close OSK pop-up text">Đóng bàn phìm ảo</string>
+  <!-- Context: System Tray Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_SwitchKeymanOff" comment="Systray item - Switch Keyman Off [&amp; precedes alt + access-character]">&amp;Tắt bộ gõ Keyman</string>
+  <!-- Context: System Tray Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_OnScreenKeyboard" comment="Systray item - OSK [&amp; precedes alt + access-character]">&amp;Bàn phím ảo</string>
+  <!-- Context: System Tray Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_FontHelper" comment="Systray item - Font Helper [&amp; precedes alt + access-character]">Trình hướng dẫn &amp;phông chữ</string>
+  <!-- Context: System Tray Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_CharacterMap" comment="Systray item - Character Map [&amp; precedes alt + access-character]">&amp;Bản đồ ký tự</string>
+  <!-- Context: System Tray Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_TextEditor" comment="Systray item - Text Editor [&amp; precedes alt + access-character]">Trình soạn thảo &amp;văn bản...</string>
+  <!-- Context: System Tray Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_Configuration" comment="Systray item - Configuration [&amp; precedes alt + access-character]">&amp;Cấu hình...</string>
+  <!-- Context: System Tray Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_Help" comment="Systray item - Help [&amp; precedes alt + access-character]">&amp;Trợ giúp...</string>
+  <!-- Context: System Tray Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_Menu_Exit" comment="Systray item - Exit [&amp; precedes alt + access-character]">&amp;Thoát</string>
+  <!-- Context: On Screen Keyboard Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_OSKContext_FadeWhenInactive" comment="OSK right-click menu - fade OSK when mouse is elsewhere">Mờ dần khi không hoạt động</string>
+  <!-- Context: On Screen Keyboard Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_OSKContext_ShowToolbar" comment="OSK right-click menu - show/hide OSK toolbar">Hiển thi thanh công cụ</string>
+  <!-- Context: On Screen Keyboard Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_OSKContext_SaveAsWebPage" comment="OSK right-click menu - save diagram of active keyboard layout as a web page">Lưu với dạng trang web...</string>
+  <!-- Context: On Screen Keyboard Menu Items -->
+  <!-- String Type: PlainText -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="S_OSKContext_Print" comment="OSK right-click menu - print diagram of active keyboard layout">In...</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- Parameters: %1$s = Version number string -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKSplashVersion" comment="Version number">Phiên bản %1$s</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.239.0 -->
+  <string name="SKButtonPrint" comment="Print button in Welcome dialog for keyboards">&amp;In...</string>
+  <!-- Parameters: %1$s = Package to be uninstalled -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKPackageAlreadyInstalled" comment="Notice during package installation that a package with the same name is already installed.">Một gói tên %1$s đã được cài đặt. Bạn có muốn gỡ nó mà cài đặt cái mới không\?</string>
+  <!-- Parameters: %1$s = Keyboard name -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKKeyboardAlreadyInstalled" comment="Notice during keyboard layout installation that a keyboard layout with the same name is already installed.">Bàn phím có tên \'%1$s\' đã được cài đặt. Nếu bạn tiếp tục, nó sẽ bị gỡ cài đặt trước khi bàn phím mới được cài đặt. Tiếp tục\?</string>
+  <!-- Parameters: %1$s = Keyboard name, %2$s = Package name -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKKeyboardPartOfPackage" comment="Notice of need to uninstall an entire package">Bàn phím \'%1$s\' là một phần của gói \'%2$s\'. Bạn phải gỡ cài đặt toàn bộ gói. Tiếp tục\?</string>
+  <!-- PArameters: %1$s = BCP 47 code -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 14.0.211 -->
+  <!-- String Type: FormatString -->
+  <string name="SKInstallLanguageTransientLimit" comment="Message shown when Keyman is unable to install a Windows language for a keyboard">Không tải được ngôn ngữ bàn phím; Windows có giới hạn 4 ngôn ngữ tuỳ chọn \'nhất thời\', và bạn có thể đã đạt mức giới hạn này.</string>
+  <!-- Parameters: %1$s = Package Name -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKPackageDoesNotIncludeWelcome" comment="Notice of lack of introductory help">Gói hay bàn phím %1$s không có hướng dẫn sử dụng.</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKOSNotSupported" comment="Notice of unsupported operating system">Hệ điều hành này không được hỗ trợ.</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKOnlineHelpFile" comment="File name of the help file - must be .chm format.  The locale folder will be checked first for the file">KeymanDesktop.chm</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKCouldNotFindHelp" comment="Notice of help file not found">Tập tin hướng dẫn không tìm thấy.</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKANSIEncoding" comment="Keyboard with an ANSI or Codepage encoding">Trang code</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKUnicodeEncoding" comment="Keyboard with a Unicode encoding">Unicode</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKDownloadProgress_Title" comment="Notice of file downloading">Tập tin đang tải xuống</string>
+  <!-- Parameters: %1$s = Keyboard name -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUninstallOnScreenKeyboard" comment="Request for confirmation to uninstall OSK for a keyboard layout">Bạn có chắc chắn muốn xóa bàn phím trên màn hình được cài đặt cho %1$s không\?</string>
+  <!-- Parameters: %1$s = Keyboard name -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.239.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUninstallKeyboard" comment="Request for confirmation to uninstall keyboard layout">Bạn có chắc bạn muốn gỡ cài đặt bàn phím %1$s không\?</string>
+  <!-- Parameters: %1$s = Package name, %2$s: Fonts list -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.239.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUninstallPackage" comment="Request for confirmation to uninstall a package">Bạn có chắc bạn muốn gỡ cài đặt gói phần mềm %1$s không\?\n\n%2$s</string>
+  <!-- Parameters: %1$s = Fonts list -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.1.270.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUninstallPackageFonts" comment="Text embedded in SKUninstallPackage when fonts are ready for uninstall.">Các phông chữ sau đây sẽ bị gỡ: %1$s.</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKUnicodeData_Build" comment="Request to build Unicode Character Map database">Bảng ký tự có cơ sỡ dữ liệu các ký tự cần được dựng trước khi dùng. Bạn có muốn dựng nó không\?</string>
+  <!-- Parameters: %1$s = Error detail string -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUnicodeData_DatabaseCouldNotBeDeleted" comment="Error deleting Unicode Character Map database">Cơ sỡ dữ liệu ký tự Unicode không thể xoá cho một bản dựng lại. Chi tiết lỗi là: %1$s</string>
+  <!-- Parameters: %1$s = Error details -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUnicodeData_CouldNotCreateDatabase" comment="Error creating Unicode Character Map database">Cơ sỡ dữ liệu ký tự Unicode không thể tạo ra và đã bị vô hiệu hoá. Chi tiết lỗi là: %1$s</string>
+  <!-- Parameters: %1$s = Error message -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.230.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKUnicodeData_DatabaseLoadFailedRebuild" comment="Error loading Unicode Character Map database. Request to rebuild.">Cơ sở dữ liệu ký tự Unicode đã không được tải thành công (%1$s). Bạn có muốn dựng lại nó không\?</string>
+  <!-- Parameters: %1$s: error message -->
+  <!-- Context: Formatted Messages -->
+  <!-- Introduced: 7.0.241.0 -->
+  <!-- String Type: FormatString -->
+  <string name="SKCannotStartProduct" comment="Error from Keyman failing to start keyman.exe due to an access denied or file not found">Không khởi động được Keyman. Vui lòng kiểm tra cài đặt bảo mật của bạn để đảm bảo chương trình keyman.exe được phép khởi động trước khi tiếp tục. Lỗi trả về là:\n\n\"%1$s\"\n\nBạn có muốn thử khởi động lại Keyman ngay bây giờ không\?</string>
+  <!-- Context: Formatted Messages -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 7.0.230.0 -->
+  <string name="SKDebuggingWarning" comment="Warning upon starting debugging in the Options tab">Thông tin gỡ lỗi Keyman sẽ được lưu trữ trong tệp nhật ký có tên %LOCALAPPDATA%\Keyman\Diag\system#.etl (trong đó # là một số). Bạn nên thoát khỏi Keyman trước khi cố gắng xóa tệp này.\n\n\CẢNH BÁO: Tệp này có thể tăng kích thước rất nhanh. Việc bật gỡ lỗi có thể làm chậm hệ thống của bạn và chỉ nên thực hiện nếu được bộ phận hỗ trợ kỹ thuật khuyên dùng.\n\nCẢNH BÁO VỀ QUYỀN RIÊNG TƯ: Xin lưu ý rằng tệp nhật ký gỡ lỗi ghi lại tất cả các lần nhấn phím mà bạn nhập. Bạn chỉ nên bật nhật ký gỡ lỗi trong thời gian diễn ra phiên gỡ lỗi hoặc chẩn đoán.</string>
+  <!-- Context: OSK Font Helper -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_OSK_FontHelper_PleaseWait" comment="OSK Font helper message">Xin chờ khi chúng tôi đang tìm phông chữ liên kết với bàn phím %1$s</string>
+  <!-- Context: OSK Font Helper -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_OSK_FontHelper_NonUnicode" comment="OSK Font helper non-Unicode keyboard">Bàn phím %1$s này không phải là bàn phìm sử dụng bộ mã chuẩn quốc tế Unicode. Phông chữ không thể tự động xác định được. Xin gửi đến hướng dẫn sử dụng của bàn phím về thông tin phông chữ.</string>
+  <!-- Context: OSK Font Helper -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_OSK_FontHelper_NoKeyboards" comment="OSK Font helper no keyboards">Hiện không có bàn phím nào được tải về hoặc được mở.</string>
+  <!-- Context: OSK Font Helper -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 8.0.294.0 -->
+  <string name="S_OSK_FontHelper_ChooseKeyboard" comment="OSK Font helper choose keyboard">Xin hãy chọn một bàn phím Keyman để tìm phông liên quan.</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">Không tìm thấy phông chữ nào được đề xuất cho bàn phím %1$s.</string>
+  <!-- Context: Text Editor -->
+  <!-- String Type: FormatString -->
+  <!-- Introduced: 10.0.836.0 -->
+  <string name="SKTextEditorCaption" comment="Caption of Text Editor">Trình soạn thảo - Keyman</string>
+</resources>
diff --git a/windows/src/desktop/kmshell/main/Keyman.System.RemoteUpdateCheck.pas b/windows/src/desktop/kmshell/main/Keyman.System.RemoteUpdateCheck.pas
index 55dde4eb1a..82c5bb26fe 100644
--- a/windows/src/desktop/kmshell/main/Keyman.System.RemoteUpdateCheck.pas
+++ b/windows/src/desktop/kmshell/main/Keyman.System.RemoteUpdateCheck.pas
@@ -216,7 +216,7 @@ begin
 
   Registry := TRegistryErrorControlled.Create; // I2890
   try
-    if Registry.OpenKey(SRegKey_KeymanDesktop_CU, True) then
+    if Registry.OpenKey(SRegKey_KeymanEngine_CU, True) then
       Registry.WriteDateTime(SRegValue_LastUpdateCheckTime, Now);
   finally
     Registry.Free;
@@ -232,7 +232,7 @@ begin
   try
     Registry := TRegistryErrorControlled.Create; // I2890
     try
-      if Registry.OpenKeyReadOnly(SRegKey_KeymanDesktop_CU) then
+      if Registry.OpenKeyReadOnly(SRegKey_KeymanEngine_CU) then
       begin
         if Registry.ValueExists(SRegValue_CheckForUpdates) and
           not Registry.ReadBool(SRegValue_CheckForUpdates) then
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/OnlineUpdateCheck.pas b/windows/src/desktop/kmshell/main/OnlineUpdateCheck.pas
index ba5d835a17..38dcd4bd4d 100644
--- a/windows/src/desktop/kmshell/main/OnlineUpdateCheck.pas
+++ b/windows/src/desktop/kmshell/main/OnlineUpdateCheck.pas
@@ -37,15 +37,10 @@ unit OnlineUpdateCheck;  // I3306
 interface
 
 uses
-  System.Classes,
   System.SysUtils,
-  System.UITypes,
   Vcl.Forms,
 
-  httpuploader,
-  Keyman.System.UpdateCheckResponse,
   UfrmDownloadProgress;
-
 type
   EOnlineUpdateCheck = class(Exception);
 
@@ -91,32 +86,13 @@ type
     FSilent: Boolean;
     FForce: Boolean;
     FParams: TOnlineUpdateCheckParams;
-
     FErrorMessage: string;
 
-    DownloadTempPath: string;
-
     FShowErrors: Boolean;
-    FDownload: TOnlineUpdateCheckDownloadParams;
     FCheckOnly: Boolean;
-
-    function DownloadUpdates: Boolean;
-    procedure DoDownloadUpdates(AOwner: TfrmDownloadProgress; var Result: Boolean);
-    function DoRun: TOnlineUpdateCheckResult;
-    procedure ShutDown;
-    procedure DownloadUpdatesHTTPStatus(Sender: THTTPUploader;
-      const Message: string; Position, Total: Int64); // I2855
-    procedure DoInstallKeyman;
-    function DoInstallPackage(Package: TOnlineUpdateCheckParamsPackage): Boolean;
-    procedure SavePackageUpgradesToDownloadTempPath;
   public
-
-  public
-    function ResponseToParams(const ucr: TUpdateCheckResponse): TOnlineUpdateCheckParams;
-
     constructor Create(AOwner: TCustomForm; AForce, ASilent: Boolean; ACheckOnly: Boolean = False);
     destructor Destroy; override;
-    function Run: TOnlineUpdateCheckResult;
     property ShowErrors: Boolean read FShowErrors write FShowErrors;
   end;
 
@@ -132,34 +108,11 @@ type
     constructor Create(AParams: TOnlineUpdateCheckParams);
     function Params: TOnlineUpdateCheckParams;
   end;
-
-procedure OnlineUpdateAdmin(OwnerForm: TCustomForm; Path: string);
-
 implementation
-
 uses
-  System.WideStrUtils,
   Vcl.Dialogs,
-  Winapi.ShellApi,
-  Winapi.Windows,
-  Winapi.WinINet,
+  KLog;
 
-  GlobalProxySettings,
-  KLog,
-  keymanapi_TLB,
-  KeymanVersion,
-  Keyman.System.UpdateCheckStorage,
-  kmint,
-  ErrorControlledRegistry,
-  RegistryKeys,
-  Upload_Settings,
-  utildir,
-  utilexecute,
-  OnlineUpdateCheckMessages,
-  utilkmshell,
-  utilsystem,
-  utiluac,
-  versioninfo;
 
 const
   SPackageUpgradeFilename = 'upgrade_packages.inf';
@@ -187,434 +140,12 @@ begin
   if (FErrorMessage <> '') and not FSilent and FShowErrors then
     ShowMessage(FErrorMessage);
 
-  if FParams.Result = oucShutDown then
-    ShutDown;
-
   KL.Log('TOnlineUpdateCheck.Destroy: FErrorMessage = '+FErrorMessage);
   KL.Log('TOnlineUpdateCheck.Destroy: FParams.Result = '+IntToStr(Ord(FParams.Result)));
 
   inherited Destroy;
 end;
 
-function TOnlineUpdateCheck.Run: TOnlineUpdateCheckResult;
-begin
-  Result := DoRun;
-
-  if Result in [oucShutDown, oucSuccess] then
-  begin
-    kmcom.Keyboards.Refresh;
-    kmcom.Keyboards.Apply;
-    kmcom.Packages.Refresh;
-  end;
-
-  FParams.Result := Result;
-end;
-
-procedure TOnlineUpdateCheck.DownloadUpdatesHTTPStatus(Sender: THTTPUploader; const Message: string; Position, Total: Int64); // I2855
-begin
-  FDownload.Owner.HTTPStatus(Sender, Message, Position+FDownload.StartPosition, FDownload.TotalSize);
-end;
-
-procedure TOnlineUpdateCheck.DoDownloadUpdates(AOwner: TfrmDownloadProgress; var Result: Boolean);
-var
-  i: Integer;
-
-    function DownloadFile(const url, savepath: string): TModalResult;
-    begin
-      Result := mrCancel;
-      with THttpUploader.Create(AOwner) do
-      try
-        OnCheckCancel := AOwner.HTTPCheckCancel;
-        OnStatus := DownloadUpdatesHTTPStatus;
-        Proxy.Server := GetProxySettings.Server;
-        Proxy.Port := GetProxySettings.Port;
-        Proxy.Username := GetProxySettings.Username;
-        Proxy.Password := GetProxySettings.Password;
-        Request.Agent := API_UserAgent;
-
-        Request.SetURL(url);
-        Upload;
-        if Response.StatusCode = 200 then
-        begin
-          with TFileStream.Create(savepath, fmCreate) do
-          try
-            Write(Response.PMessageBody^, Response.MessageBodyLength);
-          finally
-            Free;
-          end;
-          Result := mrOk;
-        end
-        else // I2742
-          case MessageDlg('Unable to download file '+ExtractFileName(savepath)+' from the Keyman Update Server: the error code '+
-              IntToStr(Response.StatusCode)+' was received.  Do you want to continue to try and install any other selected updates?', mtError, mbYesNoCancel, 0) of
-            mrYes: Result := mrYes;
-            mrNo, mrCancel: Exit;
-            else Exit;
-          end;
-      finally
-        Free;
-      end;
-    end;
-
-
-begin
-  Result := False;
-  try
-    FDownload.TotalSize := 0;
-    FDownload.Owner := AOwner;
-    FDownload.TotalDownloads := 0;
-
-    for i := 0 to High(FParams.Packages) do
-      if FParams.Packages[i].Install then
-      begin
-        Inc(FDownload.TotalDownloads);
-        Inc(FDownload.TotalSize, FParams.Packages[i].DownloadSize);
-
-        FParams.Packages[i].SavePath := DownloadTempPath + FParams.Packages[i].FileName;
-      end;
-
-    if FParams.Keyman.Install then
-    begin
-      Inc(FDownload.TotalDownloads);
-      Inc(FDownload.TotalSize, FParams.Keyman.DownloadSize);
-      FParams.Keyman.SavePath := DownloadTempPath + FParams.Keyman.FileName;
-    end;
-
-    FDownload.StartPosition := 0;
-    for i := 0 to High(FParams.Packages) do
-      if FParams.Packages[i].Install then
-      begin
-        case DownloadFile(FParams.Packages[i].DownloadURL, FParams.Packages[i].SavePath) of  // I2742
-          mrCancel: Exit;
-          mrOk: ;
-          mrYes: FParams.Packages[i].Install := False; // Download failed but user wants to install other files
-        end;
-        FDownload.StartPosition := FDownload.StartPosition + FParams.Packages[i].DownloadSize;
-      end;
-
-    if FParams.Keyman.Install then
-      case DownloadFile(FParams.Keyman.DownloadURL, FParams.Keyman.SavePath) of  // I2742
-        mrCancel: Exit;
-        mrOk: ;
-        mrYes: FParams.Keyman.Install := False;  // Download failed but user wants to install other files
-      end;
-
-    Result := True;
-  except
-    on E:EHTTPUploader do
-    begin
-      if (E.ErrorCode = 12007) or (E.ErrorCode = 12029)
-        then ShowMessage(S_OnlineUpdate_UnableToContact)
-        else ShowMessage(WideFormat(S_OnlineUpdate_UnableToContact_Error, [E.Message]));
-      Result := False;
-    end;
-  end;
-end;
-
-function TOnlineUpdateCheck.DownloadUpdates: Boolean;
-var
-  i: Integer;
-begin
-  DownloadTempPath := IncludeTrailingPathDelimiter(CreateTempPath);
-
-  with TfrmDownloadProgress.Create(nil) do
-  try
-    Callback := DoDownloadUpdates;
-    Result := ShowModal = mrOk;
-  finally
-    Free;
-  end;
-
-  for i := 0 to High(FParams.Packages) do
-    if FParams.Packages[i].Install and FileExists(FParams.Packages[i].SavePath) then
-      if Result
-        then DeleteFileOnReboot(FParams.Packages[i].SavePath)
-        else System.SysUtils.DeleteFile(FParams.Packages[i].SavePath);
-
-  if FParams.Keyman.Install and FileExists(FParams.Keyman.SavePath) then
-    if Result
-      then DeleteFileOnReboot(FParams.Keyman.SavePath)
-      else System.SysUtils.DeleteFile(FParams.Keyman.SavePath);
-
-  if not Result
-    then RemoveDir(ExcludeTrailingPathDelimiter(DownloadTempPath))
-    else DeleteFileOnReboot(ExcludeTrailingPathDelimiter(DownloadTempPath));
-end;
-
-function TOnlineUpdateCheck.DoInstallPackage(Package: TOnlineUpdateCheckParamsPackage): Boolean;
-var
-  FPackage: IKeymanPackageFile2;
-begin
-  Result := True;
-
-  FPackage := kmcom.Packages.GetPackageFromFile(Package.SavePath) as IKeymanPackageFile2;
-  FPackage.Install2(True);  // Force overwrites existing package and leaves most settings for it intact
-  FPackage := nil;
-
-  kmcom.Refresh;
-  kmcom.Apply;
-  System.SysUtils.DeleteFile(Package.SavePath);
-end;
-
-procedure TOnlineUpdateCheck.DoInstallKeyman;
-var
-  s: string;
-  FResult: Boolean;
-begin
-  s := LowerCase(ExtractFileExt(FParams.Keyman.SavePath));
-  if s = '.msp' then
-    FResult := TUtilExecute.Shell(0, 'msiexec.exe', '', '/qb /p "'+FParams.Keyman.SavePath+'" AUTOLAUNCHPRODUCT=1')  // I3349
-  else if s = '.msi' then
-    FResult := TUtilExecute.Shell(0, 'msiexec.exe', '', '/qb /i "'+FParams.Keyman.SavePath+'" AUTOLAUNCHPRODUCT=1')  // I3349
-  else if s = '.exe' then
-    FResult := TUtilExecute.Shell(0, FParams.Keyman.SavePath, '', '-au')  // I3349
-  else
-    Exit;
-  if not FResult then
-    ShowMessage(SysErrorMessage(GetLastError));
-end;
-
-procedure TOnlineUpdateCheck.SavePackageUpgradesToDownloadTempPath;
-var
-  i: Integer;
-begin
-  with TStringList.Create do
-  try
-    for i := 0 to High(FParams.Packages) do
-      if FParams.Packages[i].NewID <> '' then
-        Add(FParams.Packages[i].NewID+'='+FParams.Packages[i].ID);
-    if Count > 0 then
-      SaveToFile(DownloadTempPath + SPackageUpgradeFileName);
-  finally
-    Free;
-  end;
-end;
-
-procedure TOnlineUpdateCheck.ShutDown;
-begin
-  if Assigned(Application) then
-    Application.Terminate;
-end;
-
-function TOnlineUpdateCheck.DoRun: TOnlineUpdateCheckResult;
-var
-  flags: DWord;
-  i: Integer;
-  ucr: TUpdateCheckResponse;
-  pkg: IKeymanPackage;
-begin
-  {FProxyHost := '';
-  FProxyPort := 0;}
-
-  { Check if user is currently online and don't force dialup dialog to appear if not }
-  if FSilent then
-    if not InternetGetConnectedState(@flags, 0) then
-    begin
-      Result := oucOffline;
-      Exit;
-    end;
-
-  { Verify that it has been at least 7 days since last update check - only if FSilent = TRUE }
-  try
-    with TRegistryErrorControlled.Create do  // I2890
-    try
-      if OpenKeyReadOnly(SRegKey_KeymanDesktop_CU) then
-      begin
-        if ValueExists(SRegValue_CheckForUpdates) and not ReadBool(SRegValue_CheckForUpdates) and not FForce then
-        begin
-          Result := oucNoUpdates;
-          Exit;
-        end;
-        if ValueExists(SRegValue_LastUpdateCheckTime) and (Now - ReadDateTime(SRegValue_LastUpdateCheckTime) < 7) and FSilent and not FForce then
-        begin
-          Result := oucNoUpdates;
-          Exit;
-        end;
-
-        {if ValueExists(SRegValue_UpdateCheck_UseProxy) and ReadBool(SRegValue_UpdateCheck_UseProxy) then
-        begin
-          FProxyHost := ReadString(SRegValue_UpdateCheck_ProxyHost);
-          FProxyPort := StrToIntDef(ReadString(SRegValue_UpdateCheck_ProxyPort), 80);
-        end;}
-      end;
-    finally
-      Free;
-    end;
-  except
-    { we will not run the check if an error occurs reading the settings }
-    on E:Exception do
-    begin
-      Result := oucFailure;
-      FErrorMessage := E.Message;
-      Exit;
-    end;
-  end;
-
-  Result := oucNoUpdates;
-
-  try
-    with THTTPUploader.Create(nil) do
-    try
-      ShowUI := not FSilent;
-      Fields.Add('version', ansistring(CKeymanVersionInfo.Version));
-      Fields.Add('tier', ansistring(CKeymanVersionInfo.Tier));
-      if FForce
-        then Fields.Add('manual', '1')
-        else Fields.Add('manual', '0');
-
-      for i := 0 to kmcom.Packages.Count - 1 do
-      begin
-        pkg := kmcom.Packages[i];
-
-        // Due to limitations in PHP parsing of query string parameters names with
-        // space or period, we need to split the parameters up. The legacy pattern
-        // is still supported on the server side. Relates to #4886.
-        Fields.Add(AnsiString('packageid_'+IntToStr(i)), AnsiString(pkg.ID));
-        Fields.Add(AnsiString('packageversion_'+IntToStr(i)), AnsiString(pkg.Version));
-        pkg := nil;
-      end;
-
-      Proxy.Server := GetProxySettings.Server;
-      Proxy.Port := GetProxySettings.Port;
-      Proxy.Username := GetProxySettings.Username;
-      Proxy.Password := GetProxySettings.Password;
-
-      Request.HostName := API_Server;
-      Request.Protocol := API_Protocol;
-      Request.UrlPath := API_Path_UpdateCheck_Windows;
-      //OnStatus :=
-      Upload;
-      if Response.StatusCode = 200 then
-      begin
-        if ucr.Parse(Response.MessageBodyAsString, 'bundle', CKeymanVersionInfo.Version) then
-        begin
-          ResponseToParams(ucr);
-          TUpdateCheckStorage.SaveUpdateCacheData(ucr);
-          Result := FParams.Result;
-        end
-        else
-        begin
-          FErrorMessage := ucr.ErrorMessage;
-          Result := oucFailure;
-        end;
-      end
-      else
-        raise EOnlineUpdateCheck.Create('Error '+IntToStr(Response.StatusCode));
-    finally
-      Free;
-    end;
-  except
-    on E:EHTTPUploader do
-    begin
-      if (E.ErrorCode = 12007) or (E.ErrorCode = 12029)
-        then FErrorMessage := S_OnlineUpdate_UnableToContact
-        else FErrorMessage := WideFormat(S_OnlineUpdate_UnableToContact_Error, [E.Message]);
-      Result := oucFailure;
-    end;
-    on E:Exception do
-    begin
-      FErrorMessage := E.Message;
-      Result := oucFailure;
-    end;
-  end;
-
-  with TRegistryErrorControlled.Create do  // I2890
-  try
-    if OpenKey(SRegKey_KeymanDesktop_CU, True) then
-      WriteDateTime(SRegValue_LastUpdateCheckTime, Now);
-  finally
-    Free;
-  end;
-end;
-
-function TOnlineUpdateCheck.ResponseToParams(const ucr: TUpdateCheckResponse): TOnlineUpdateCheckParams;
-var
-  i, j, n: Integer;
-  pkg: IKeymanPackage;
-begin
-  SetLength(FParams.Packages,0);
-  for i := Low(ucr.Packages) to High(ucr.Packages) do
-  begin
-    n := kmcom.Packages.IndexOf(ucr.Packages[i].ID);
-    if n >= 0 then
-    begin
-      pkg := kmcom.Packages[n];
-      j := Length(FParams.Packages);
-      SetLength(FParams.Packages, j+1);
-      FParams.Packages[j].NewID := ucr.Packages[i].NewID;
-      FParams.Packages[j].ID := ucr.Packages[i].ID;
-      FParams.Packages[j].Description := ucr.Packages[i].Name;
-      FParams.Packages[j].OldVersion := pkg.Version;
-      FParams.Packages[j].NewVersion := ucr.Packages[i].NewVersion;
-      FParams.Packages[j].DownloadSize := ucr.Packages[i].DownloadSize;
-      FParams.Packages[j].DownloadURL := ucr.Packages[i].DownloadURL;
-      FParams.Packages[j].FileName := ucr.Packages[i].FileName;
-      pkg := nil;
-    end
-    else
-      FErrorMessage := 'Unable to find package '+ucr.Packages[i].ID;
-  end;
-
-  case ucr.Status of
-    ucrsNoUpdate:
-      begin
-        FErrorMessage := ucr.ErrorMessage;
-      end;
-    ucrsUpdateReady:
-      begin
-        FParams.Keyman.OldVersion := ucr.CurrentVersion;
-        FParams.Keyman.NewVersion := ucr.NewVersion;
-        FParams.Keyman.DownloadURL := ucr.InstallURL;
-        FParams.Keyman.DownloadSize := ucr.InstallSize;
-        FParams.Keyman.FileName := ucr.FileName;
-      end;
-  end;
-
-  Result := FParams;
-end;
-
-procedure OnlineUpdateAdmin(OwnerForm: TCustomForm; Path: string);
-var
-  Package: TOnlineUpdateCheckParamsPackage;
-  f: TSearchRec;
-  ext: string;
-  FPackageUpgradeList: TStringList;
-begin
-  Path := IncludeTrailingPathDelimiter(Path);
-  FPackageUpgradeList := TStringList.Create;
-  with TOnlineUpdateCheck.Create(OwnerForm,False,True) do
-  try
-    if FileExists(Path + SPackageUpgradeFileName) then
-      FPackageUpgradeList.LoadFromFile(Path + SPackageUpgradeFilename);
-
-    if FindFirst(Path + '*.k??', 0, f) = 0 then
-    begin
-      repeat
-        ext := LowerCase(ExtractFileExt(f.Name));
-        if (ext = '.kmx') or (ext = '.kmp') then
-        begin
-          Package.SavePath := Path + f.Name;
-          Package.NewID := ChangeFileExt(f.Name, '');
-          Package.ID := FPackageUpgradeList.Values[Package.NewID];
-          DoInstallPackage(Package);
-        end;
-      until FindNext(f) <> 0;
-
-      System.SysUtils.FindClose(f);
-    end;
-
-    if FindFirst(Path + '*.exe', 0, f) = 0 then
-    begin
-      FParams.Keyman.SavePath := Path + f.Name;
-      DoInstallKeyman;
-      System.SysUtils.FindClose(f);
-    end;
-  finally
-    Free;
-    FPackageUpgradeList.Free;
-  end;
-end;
-
 { TOnlineUpdateSharedData }
 
 constructor TOnlineUpdateSharedData.Create(AParams: TOnlineUpdateCheckParams);
diff --git a/windows/src/desktop/kmshell/main/UImportOlderVersionSettings.pas b/windows/src/desktop/kmshell/main/UImportOlderVersionSettings.pas
index 9b56a08500..278f36a2df 100644
--- a/windows/src/desktop/kmshell/main/UImportOlderVersionSettings.pas
+++ b/windows/src/desktop/kmshell/main/UImportOlderVersionSettings.pas
@@ -144,10 +144,9 @@ begin
       ResetAllHints;
   end;
 
-  if DoStartWithWindows then kmcom.Options['koStartWithWindows'].Value := True; // I2753
-  if DoCheckForUpdates then kmcom.Options['koCheckForUpdates'].Value := True;  // I2753
-  if DoAutomaticallyReportUsage then kmcom.Options['koAutomaticallyReportUsage'].Value := True;
-
+  kmcom.Options['koStartWithWindows'].Value := DoStartWithWindows; // I2753
+  kmcom.Options['koCheckForUpdates'].Value := DoCheckForUpdates;  // I2753
+  kmcom.Options['koAutomaticallyReportUsage'].Value := DoAutomaticallyReportUsage;
 
   if DoDefaults then
   begin
diff --git a/windows/src/desktop/kmshell/main/UfrmOnlineUpdateIcon.dfm b/windows/src/desktop/kmshell/main/UfrmOnlineUpdateIcon.dfm
deleted file mode 100644
index ab14f6bbda..0000000000
--- a/windows/src/desktop/kmshell/main/UfrmOnlineUpdateIcon.dfm
+++ /dev/null
@@ -1,38 +0,0 @@
-object frmOnlineUpdateIcon: TfrmOnlineUpdateIcon
-  Left = 0
-  Top = 0
-  Caption = 'Online Update Check Hidden Form'
-  ClientHeight = 292
-  ClientWidth = 554
-  Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
-  Font.Color = clWindowText
-  Font.Height = -11
-  Font.Name = 'Tahoma'
-  Font.Style = []
-  OldCreateOrder = False
-  OnClose = FormClose
-  OnCreate = FormCreate
-  PixelsPerInch = 96
-  TextHeight = 13
-  object trayMenu: TPopupMenu
-    Left = 272
-    Top = 152
-    object cmdView: TMenuItem
-      Caption = 'View and &install updates'
-      Default = True
-      OnClick = cmdViewClick
-    end
-    object cmdExit: TMenuItem
-      Caption = 'E&xit online update check'
-      OnClick = cmdExitClick
-    end
-  end
-  object tmrShowBalloon: TTimer
-    Enabled = False
-    Interval = 5000
-    OnTimer = tmrShowBalloonTimer
-    Left = 328
-    Top = 152
-  end
-end
diff --git a/windows/src/desktop/kmshell/main/UfrmOnlineUpdateIcon.pas b/windows/src/desktop/kmshell/main/UfrmOnlineUpdateIcon.pas
deleted file mode 100644
index edb66a2d79..0000000000
--- a/windows/src/desktop/kmshell/main/UfrmOnlineUpdateIcon.pas
+++ /dev/null
@@ -1,140 +0,0 @@
-(*
-  Name:             UfrmOnlineUpdateIcon
-  Copyright:        Copyright (C) 2003-2017 SIL International.
-  Documentation:    
-  Description:      
-  Create Date:      18 May 2012
-
-  Modified Date:    18 May 2012
-  Authors:          mcdurdin
-  Related Files:    
-  Dependencies:     
-
-  Bugs:             
-  Todo:             
-  Notes:            
-  History:          18 May 2012 - mcdurdin - I3306 - V9.0 - Remove TntControls + Win9x support
-*)
-unit UfrmOnlineUpdateIcon;  // I3306
-
-interface
-
-uses
-  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, KeymanTrayIcon, Menus, ExtCtrls;
-
-type
-  TfrmOnlineUpdateIcon = class(TForm)
-    trayMenu: TPopupMenu;
-    cmdView: TMenuItem;
-    cmdExit: TMenuItem;
-    tmrShowBalloon: TTimer;
-    procedure FormCreate(Sender: TObject);
-    procedure trayClick(Sender: TObject);
-    procedure cmdViewClick(Sender: TObject);
-    procedure cmdExitClick(Sender: TObject);
-    procedure FormClose(Sender: TObject; var Action: TCloseAction);
-    procedure tmrShowBalloonTimer(Sender: TObject);
-  private
-    tray: TKeymanTrayIcon;
-  end;
-
-procedure ShowUpdateIcon;
-
-implementation
-
-{$R *.dfm}
-
-uses
-  DebugPaths,
-  initprog,
-  KeymanPaths,
-  OnlineUpdateCheck,
-  OnlineUpdateCheckMessages,
-  ShellApi;
-
-procedure ShowUpdateIcon;
-var
-  frmOnlineUpdateIcon: TfrmOnlineUpdateIcon;
-begin
-  if ApplicationRunning then
-  begin
-    TfrmOnlineUpdateIcon.Create(nil);
-  end
-  else
-  begin
-    Application.CreateForm(TfrmOnlineUpdateIcon, frmOnlineUpdateIcon);
-    if Application.MainForm = frmOnlineUpdateIcon then
-      Application.ShowMainForm := False;
-  end;
-end;
-
-procedure TfrmOnlineUpdateIcon.cmdExitClick(Sender: TObject);
-begin
-  Close;
-end;
-
-procedure TfrmOnlineUpdateIcon.cmdViewClick(Sender: TObject);
-begin
-  trayClick(Sender);
-end;
-
-procedure TfrmOnlineUpdateIcon.FormClose(Sender: TObject;
-  var Action: TCloseAction);
-begin
-  Action := caFree;
-end;
-
-procedure TfrmOnlineUpdateIcon.FormCreate(Sender: TObject);
-var
-  FIcon: WideString;
-begin
-  tray := TKeymanTrayIcon.Create(Self);
-  tray.OnClick := trayClick;
-  tray.OnBalloonClick := trayClick;
-  tray.PopupMenu := trayMenu;
-  tray.Icon := TIcon.Create;
-
-  FIcon := TKeymanPaths.KeymanDesktopInstallPath('cfgicon.ico'); // GetDebugPath(FIcon, ExtractFilePath(ParamStr(0)) + FIcon, False);
-  if FileExists(FIcon) then
-    tray.Icon.LoadFromFile(FIcon);
-
-  tray.Hint := S_OnlineUpdate_IconTitle + #13#10 + S_OnlineUpdate_IconText;
-  tray.Visible := True;
-
-  cmdView.Caption := S_OnlineUpdate_IconMenuText;
-  cmdExit.Caption := S_OnlineUpdate_IconMenuExit;
-
-  tmrShowBalloon.Enabled := True;
-end;
-
-procedure TfrmOnlineUpdateIcon.tmrShowBalloonTimer(Sender: TObject);
-begin
-  tmrShowBalloon.Enabled := False;
-  tray.BalloonHint := S_OnlineUpdate_IconText;
-  tray.BalloonTitle := S_OnlineUpdate_IconTitle;
-  tray.BalloonTimeout := 15000;
-  tray.BalloonIcon := tray.Icon.Handle;
-  tray.BalloonFlags := bfUser;
-  tray.ShowBalloonHint;
-end;
-
-procedure TfrmOnlineUpdateIcon.trayClick(Sender: TObject);
-begin
-  tmrShowBalloon.Enabled := False;
-  tray.Visible := False;
-  with TOnlineUpdateCheck.Create(nil, True, False) do
-  try
-    if Run = oucUnknown {Cancel clicked} then
-    begin
-      tray.Visible := True;
-      Exit;
-    end;
-  finally
-    Free;
-  end;
-
-  Close;
-end;
-
-end.
diff --git a/windows/src/desktop/kmshell/main/UfrmOnlineUpdateNewVersion.dfm b/windows/src/desktop/kmshell/main/UfrmOnlineUpdateNewVersion.dfm
deleted file mode 100644
index efcce97088..0000000000
--- a/windows/src/desktop/kmshell/main/UfrmOnlineUpdateNewVersion.dfm
+++ /dev/null
@@ -1,15 +0,0 @@
-inherited frmOnlineUpdateNewVersion: TfrmOnlineUpdateNewVersion
-  Left = 385
-  Top = 410
-  BorderIcons = [biSystemMenu]
-  BorderStyle = bsSingle
-  Caption = 'Keyman'
-  ClientHeight = 375
-  ClientWidth = 469
-  Font.Charset = ANSI_CHARSET
-  Position = poScreenCenter
-  ExplicitWidth = 475
-  ExplicitHeight = 404
-  PixelsPerInch = 96
-  TextHeight = 13
-end
diff --git a/windows/src/desktop/kmshell/main/UfrmOnlineUpdateNewVersion.pas b/windows/src/desktop/kmshell/main/UfrmOnlineUpdateNewVersion.pas
deleted file mode 100644
index 78deb2d809..0000000000
--- a/windows/src/desktop/kmshell/main/UfrmOnlineUpdateNewVersion.pas
+++ /dev/null
@@ -1,115 +0,0 @@
-(*
-  Name:             UfrmOnlineUpdateNewVersion
-  Copyright:        Copyright (C) SIL International.
-  Documentation:
-  Description:
-  Create Date:      5 Dec 2006
-
-  Modified Date:    18 May 2012
-  Authors:          mcdurdin
-  Related Files:
-  Dependencies:
-
-  Bugs:
-  Todo:
-  Notes:
-  History:          05 Dec 2006 - mcdurdin - Initial version
-                    12 Dec 2006 - mcdurdin - Make 'installnow' work
-                    12 Dec 2006 - mcdurdin - Fix CurrentVersion tag, capitalize form name
-                    27 Mar 2008 - mcdurdin - Refer to FActiveProduct when creating form
-                    16 Jan 2009 - mcdurdin - I1730 - Online update of keyboards
-                    18 May 2012 - mcdurdin - I3306 - V9.0 - Remove TntControls + Win9x support
-*)
-unit UfrmOnlineUpdateNewVersion;  // I3306
-
-interface
-
-uses
-  System.Contnrs,
-  System.UITypes,
-  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  ShellAPI, UfrmWebContainer, OnlineUpdateCheck;
-
-type
-  TfrmOnlineUpdateNewVersion = class(TfrmWebContainer)
-    procedure TntFormShow(Sender: TObject);
-    procedure TntFormDestroy(Sender: TObject);
-  private
-    FParams: TOnlineUpdateCheckParams;
-    PageTag: Integer;
-  protected
-    procedure FireCommand(const command: WideString; params: TStringList); override;
-  public
-    property Params: TOnlineUpdateCheckParams read FParams write FParams;
-  end;
-
-function OnlineUpdateNewVersion(AOwner: TComponent): TfrmOnlineUpdateNewVersion;
-
-implementation
-
-uses
-  kmint,
-  Keyman.Configuration.System.UmodWebHttpServer,
-  MessageIdentifiers,
-  MessageIdentifierConsts,
-  strutils,
-  utilxml;
-
-{$R *.DFM}
-
-function OnlineUpdateNewVersion(AOwner: TComponent): TfrmOnlineUpdateNewVersion;
-begin
-  Result := TfrmOnlineUpdateNewVersion.Create(AOwner);
-end;
-
-procedure TfrmOnlineUpdateNewVersion.FireCommand(const command: WideString; params: TStringList);
-var
-  n: Integer;
-begin
-  //if command='openwebsite' then OpenURL(FDownloadURL)
-  //else if command='visitwebsitenow' then begin OpenURL(FDownloadURL); ModalResult := mrOk; end
-  //else if command='visitwebsitelater' then ModalResult := mrCancel
-  //else
-  if command='installnow' then ModalResult := mrYes
-  else if command='installlater' then ModalResult := mrCancel
-  else if (command='tickupdate') or (command='untickupdate') then
-  begin
-    n := StrToIntDef(params.Values['id'],-1);
-    if n = 0 then
-      FParams.Keyman.Install := command='tickupdate'
-    else if (n > 0) and (n <= Length(FParams.Packages)) then
-      FParams.Packages[n-1].Install := command='tickupdate';
-  end
-  else
-    inherited;
-end;
-
-procedure TfrmOnlineUpdateNewVersion.TntFormDestroy(Sender: TObject);
-begin
-  inherited;
-  modWebHttpServer.SharedData.Remove(PageTag);
-end;
-
-procedure TfrmOnlineUpdateNewVersion.TntFormShow(Sender: TObject);
-var
-  i: Integer;
-  Data: IOnlineUpdateSharedData;
-begin
-  inherited;
-
-  if FParams.Keyman.DownloadURL <> '' then
-    FParams.Keyman.Install := True;
-
-  for i := 0 to High(FParams.Packages) do
-    FParams.Packages[i].Install := True;
-
-  Data := TOnlineUpdateSharedData.Create(FParams);
-  PageTag := modWebHttpServer.SharedData.Add(Data);
-
-  FRenderPage := 'onlineupdate';
-  HelpTopic := 'context/online-update';
-  Content_Render('tag='+IntToStr(PageTag));
-end;
-
-end.
-
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/keyman_update.xsl b/windows/src/desktop/kmshell/xml/keyman_update.xsl
index 5d86ada04b..4d71162032 100644
--- a/windows/src/desktop/kmshell/xml/keyman_update.xsl
+++ b/windows/src/desktop/kmshell/xml/keyman_update.xsl
@@ -31,10 +31,12 @@
         </div>
 
         <div class="grid_container_update" id="update_details">
+          <!-- hide header if no updates but keep the grid layout -->
+          <xsl:if test="$isNewKeymanVersionAvailable or $isNewKeyboardVersionAvailable">
             <div class='grid_item'><xsl:value-of select="$locale/string[@name='S_Update_ComponentHead']"/></div>
             <div class='grid_item'><xsl:value-of select="$locale/string[@name='S_Update_OldVersionHead']"/></div>
             <div class='grid_item'><xsl:value-of select="$locale/string[@name='S_Update_SizeHead']"/></div>
-
+          </xsl:if>
             <xsl:apply-templates select="/Keyman/Updates/Update" />
 
         </div>
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/UfrmRunDesktop.pas b/windows/src/desktop/setup/UfrmRunDesktop.pas
index 170d142a28..08d80e52eb 100644
--- a/windows/src/desktop/setup/UfrmRunDesktop.pas
+++ b/windows/src/desktop/setup/UfrmRunDesktop.pas
@@ -129,6 +129,7 @@ type
     procedure SetupMSI;  // I2644
     procedure BackupKey(Root: HKEY; Path: WideString);  // I2642
     procedure GetDefaultSettings;
+    procedure GetSavedSettings;
     procedure FillActionText;
     procedure FillLanguageList;
     procedure FillStrings;
@@ -547,7 +548,6 @@ procedure TfrmRunDesktop.FormCreate(Sender: TObject);
 var
   oldHeight: Integer;
 begin
-  FAutomaticallyReportUsage := True;
 
   FillStrings;
 
@@ -564,7 +564,7 @@ begin
   CheckVersion9Upgrade;
   CheckVersion10Upgrade;
 
-  GetDefaultSettings;  // I2651
+  GetSavedSettings;
 
   FillLanguageList;
   FillStrings;
@@ -693,6 +693,7 @@ begin
     CanUpgradeKeyman := FCanUpgrade6 or FCanUpgrade7 or FCanUpgrade8 or FCanUpgrade9 or FCanUpgrade10;   // I4293
     if ShowModal = mrOk then
     begin
+      FAutomaticallyReportUsage := AutomaticallyReportUsage;
       FStartWithWindows := StartWithWindows;
       FStartAfterInstall := StartAfterInstall;
       FCheckForUpdates := CheckForUpdates;
@@ -1031,18 +1032,43 @@ end;
 
 procedure TfrmRunDesktop.GetDefaultSettings; // I2651
 begin
+  // Due to the way the TUtilKeymanOptionEntry.Save works it only
+  // saves the values that are different from the defaults.  So we
+  // need to set the defaults here. Two locations for the defaults is
+  // not ideal, but leave for now.
   FStartWithWindows := True; // I2607
   FCheckForUpdates := True;  // I2609
+  FAutomaticallyReportUsage := True;
+end;
 
+procedure TfrmRunDesktop.GetSavedSettings;
+var
+  CheckForUpdatesKeyFound: Boolean;
+begin
+  GetDefaultSettings;
+  CheckForUpdatesKeyFound := False;
   try
     with CreateHKCURegistry do  // I2749
     try
+      if OpenKeyReadOnly('\' + SRegKey_KeymanEngine_CU) then
+      begin
+        // only update the flag if the value exists in the registry, otherwise leave them as defaults
+        // leave as the the default values
+        if ValueExists(SRegValue_AutomaticallyReportUsage) then
+        begin
+          FAutomaticallyReportUsage := ReadBool(SRegValue_AutomaticallyReportUsage);
+        end;
+        if ValueExists(SRegValue_CheckForUpdates) then
+        begin
+          FCheckForUpdates := ReadBool(SRegValue_CheckForUpdates);
+          CheckForUpdatesKeyFound := True;
+        end;
+      end;
       if OpenKeyReadOnly(SRegKey_KeymanDesktop_CU) then
       begin
-        FCheckForUpdates := ValueExists(SRegValue_CheckForUpdates) and ReadBool(SRegValue_CheckForUpdates);
+        FCheckForUpdates := (not CheckForUpdatesKeyFound) and ValueExists(SRegValue_CheckForUpdates) and ReadBool(SRegValue_CheckForUpdates);
         FStartWithWindows := ValueExists(SRegValue_UpgradeRunKeyman) or
           (OpenKeyReadOnly('\' + SRegKey_WindowsRun_CU) and ValueExists(SRegValue_WindowsRun_Keyman));
-
       end
       else if FCanUpgrade10 and OpenKeyReadOnly(SRegKey_KeymanEngine100_ProductOptions_Desktop_CU) then   // I4293
       begin
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/desktop/setup/locale/vi-VN/strings.xml b/windows/src/desktop/setup/locale/vi-VN/strings.xml
new file mode 100644
index 0000000000..1302263090
--- /dev/null
+++ b/windows/src/desktop/setup/locale/vi-VN/strings.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="ssLanguageName" comment="User interface language name in the UI language">Tiếng Việt</string>
+  <string name="ssApplicationTitle">Trình cài đặt $APPNAME $VERSION</string>
+  <string name="ssTitle">Cài đặt $APPNAME $VERSION</string>
+  <string name="ssInstallSuccess">$APPNAME $VERSION đã được cài đặt xong.</string>
+  <string name="ssCancelQuery">Bạn có muốn huỷ cài đặt $APPNAME?</string>
+  <string name="ssBootstrapExtractingBundle">Đang giải nén gói...</string>
+  <string name="ssBootstrapCheckingPackages">Đang kiểm tra gói phần mềm...</string>
+  <string name="ssBootstrapCheckingForUpdates">Đang kiểm tra cập nhật trực tuyến...</string>
+  <string name="ssBootstrapCheckingInstalledVersions">Đang kiểm tra các phiên bản đã được cài đặt...</string>
+  <string name="ssBootstrapReady">Đang hoàn tất...</string>
+  <!-- Parameters: %0:s: version, %1:s: ssActionDownload -->
+  <string name="ssActionInstallKeyman">• $APPNAME %0:s %1:s</string>
+  <!-- Parameters: %0:s: package name %1:s: version %2:s: ssActionDownload -->
+  <string name="ssActionInstallPackage">• %0:s %1:s %2:s</string>
+  <!-- Parameters: %0:s: package name %1:s: version %2:s: language %3:s: ssActionDownload -->
+  <string name="ssActionInstallPackageLanguage">• %0:s %1:s cho %2:s %3:s</string>
+  <string name="ssActionNothingToInstall">Không có gì để cài đặt.</string>
+  <!-- Parameters: %0:s download size -->
+  <string name="ssActionDownload">(%0:s tải xuống)</string>
+  <string name="ssActionInstall">Trình cài đặt sẽ cài đặt:</string>
+  <string name="ssFreeCaption">$APPNAME $VERSION là miễn phí và mã nguồn mở</string>
+  <string name="ssLicenseLink">&amp;Đọc giấy phép</string>
+  <string name="ssInstallOptionsLink">&amp;Tuỳ chọn cài đặt</string>
+  <string name="ssMessageBoxTitle">Trình cài đặt $APPNAME</string>
+  <string name="ssOkButton">Vâng</string>
+  <string name="ssInstallButton">&amp;Cài đặt</string>
+  <string name="ssCancelButton">Huỷ</string>
+  <string name="ssExitButton">&amp;Thoát</string>
+  <string name="ssStatusInstalling">Đang tải $APPNAME</string>
+  <string name="ssStatusRemovingOlderVersions">Xóa phiên bản cũ</string>
+  <string name="ssStatusComplete">Cài đặt thành công</string>
+  <string name="ssQueryRestart">Bạn cần khởi động lại Windows trước khi trình cài đặt hoàn tất. Khi bạn khởi động lại Windows, trình cài đặt sẽ tiếp tục.
+
+Khởi động lại ngay bay giờ không?</string>
+  <string name="ssErrorUnableToAutomaticallyRestart">Windows không thể tự động khởi động lại. Bạn nên khởi động lại Windows trước khi bạn thử và bắt đầu $APPNAME.</string>
+  <string name="ssMustRestart">Bạn phải khởi động lại Windows để hoàn thành trình cài đặt. Khi bạn khởi động lại Windows, trình cài đặt sẽ hoàn tất.</string>
+  <string name="ssOldOsVersionInstallKeyboards">$APPNAME $VERSION cần Windows 7 trở lên để tải xuống. Tuy nhiên, Keyman Desktop 7, 8 hoặc 9 đã được phát hiện. Bạn có muốn cài đặt các bàn phím trong trình cài đặt này vào phiên bản Keyman Desktop đã cài đặt hay không?</string>
+  <string name="ssOldOsVersionDownload">Phiên bản này $APPNAME cần Windows 7 trở lên để cài đặt. Bạn có muốn tải Keyman Desktop 8 hay không?</string>
+  <string name="ssOptionsTitle">Tuỳ chọn cài đặt</string>
+  <string name="ssOptionsTitleInstallOptions">Tuỳ chọn cài đặt</string>
+  <string name="ssOptionsTitleDefaultKeymanSettings">Làm mặc định cấu hình $APPNAME</string>
+  <string name="ssOptionsTitleSelectModulesToInstall">Các mô-đun để cài đặt hoặc nâng cấp</string>
+  <string name="ssOptionsTitleAssociatedKeyboardLanguage">Ngôn ngữ gắn liền với bàn phím</string>
+  <string name="ssOptionsTitleLocation">Phiên bản để cài đặt</string>
+  <string name="ssOptionsStartWithWindows">Chạy $APPNAME khi Windows khởi động</string>
+  <string name="ssOptionsStartAfterInstall">Chạy $APPNAME khi hoàn tất cài đặt</string>
+  <string name="ssOptionsCheckForUpdates">Tự động kiểm tra trực tuyến phiên bản mới</string>
+  <string name="ssOptionsUpgradeKeyboards">Nâng cấp bàn phím được cài đặt với phiên bản cũ hơn lên phiên bản $VERSION</string>
+  <string name="ssOptionsAutomaticallyReportUsage">Chia sẻ thống kê sử dụng ẩn danh với keyman.com</string>
+  <!-- Parameters: %0:s: version of installer (may differ from Keyman version) -->
+  <string name="ssInstallerVersion">Phiên bản cài đặt: %0:s</string>
+  <string name="ssOptionsInstallKeyman">Cài đặt $APPNAME</string>
+  <string name="ssOptionsUpgradeKeyman">Nâng cấp $APPNAME</string>
+  <!-- Parameters: %0:s: installed version -->
+  <string name="ssOptionsKeymanAlreadyInstalled">$APPNAME %0:s đã được cài đặt.</string>
+  <!-- Parameters: %0:s: version, %1:s: size -->
+  <string name="ssOptionsDownloadKeymanVersion">Tải về phiên bản %0:s (%1:s)</string>
+  <!-- Parameters: %0:s: version -->
+  <string name="ssOptionsInstallKeymanVersion">Phiên bản %0:s</string>
+  <!-- Parameters: %0:s: package name %1:s -->
+  <string name="ssOptionsInstallPackage">Cài đặt %0:s</string>
+  <!-- Parameters: %0:s: package version %1:s package size -->
+  <string name="ssOptionsDownloadPackageVersion">Tải về phiên bản %0:s (%1:s)</string>
+  <!-- Parameters: %0:s: package version -->
+  <string name="ssOptionsInstallPackageVersion">Phiên bản %0:s</string>
+  <!-- Parameters: %0:s package name -->
+  <string name="ssOptionsPackageLanguageAssociation">Chọn ngôn ngữ mà bạn muốn liên kết với bàn phím %0:s</string>
+  <string name="ssOptionsDefaultLanguage">Ngôn ngữ mặc định</string>
+  <!-- Parameters: %0:s: filename -->
+  <string name="ssDownloadingTitle">Đang tải %0:s</string>
+  <!-- Parameters: %0:s: filename -->
+  <string name="ssDownloadingText">Đang tải %0:s</string>
+  <string name="ssOffline">Trình cài đặt $APPNAME không thể kết nối tới keyman.com để tải về các tài nguyên bổ sung.</string>
+  <string name="ssOffline2">Vui lòng kiểm tra bạn có đang trực tuyến hay không, và cấp phép Trình cài đặt $APPNAME để kết nối Internet trong thiết lập tường lửa.</string>
+  <string name="ssOffline3">Nhấp vào Huỷ bỏ để thoát trình cài đặt, Thử lại để thử tải lại tài nguyên, hoặc Từ chối để tiếp tục ngoại tuyến.</string>
+</resources>
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/UfrmKeyman7Main.pas b/windows/src/engine/keyman/UfrmKeyman7Main.pas
index c0f6e9d62f..7f948d0518 100644
--- a/windows/src/engine/keyman/UfrmKeyman7Main.pas
+++ b/windows/src/engine/keyman/UfrmKeyman7Main.pas
@@ -1842,7 +1842,7 @@ procedure TfrmKeyman7Main.tmrBackgroundUpdateCheckTimer(Sender: TObject);
 begin
   with TRegistryErrorControlled.Create do  // I2890
   try
-    if OpenKeyReadOnly(SRegKey_KeymanDesktop_CU) then
+    if OpenKeyReadOnly(SRegKey_KeymanEngine_CU) then
     begin
       if ValueExists(SRegValue_CheckForUpdates) and not ReadBool(SRegValue_CheckForUpdates) then Exit;
       if ValueExists(SRegValue_LastUpdateCheckTime) and (Now - ReadDateTime(SRegValue_LastUpdateCheckTime) < 7) then Exit;
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/kmcomapi/com/system/keymancontrol.pas b/windows/src/engine/kmcomapi/com/system/keymancontrol.pas
index 4adf198844..90bab26746 100644
--- a/windows/src/engine/kmcomapi/com/system/keymancontrol.pas
+++ b/windows/src/engine/kmcomapi/com/system/keymancontrol.pas
@@ -202,8 +202,6 @@ const
 const
   SWnd_MasterController = 'TfrmKeyman7Main';
   SWnd_VisualKeyboard = 'TfrmVisualKeyboard';
-  SWnd_OnlineUpdateIcon = 'TfrmOnlineUpdateIcon';
-  SWnd_OnlineUpdateNewVersion = 'TfrmOnlineUpdateNewVersion';
 
 function TKeymanControl.GetAutoApply: Boolean;
 begin
@@ -292,10 +290,10 @@ begin
   Result := (FindMasterControllerWindow <> 0);
 end;
 
+// Deprecated interface needs to remain
 function TKeymanControl.IsOnlineUpdateCheckOpen: WordBool;
 begin
-  Result := (FindWindow(SWnd_OnlineUpdateIcon, nil) <> 0) or
-    (FindWindow(SWnd_OnlineUpdateNewVersion, nil) <> 0);
+  Result := False;
 end;
 
 function TKeymanControl.IsTextEditorOpen: WordBool;
diff --git a/windows/src/engine/kmcomapi/util/utilkeymanoption.pas b/windows/src/engine/kmcomapi/util/utilkeymanoption.pas
index 144f761fa2..653fea1d96 100644
--- a/windows/src/engine/kmcomapi/util/utilkeymanoption.pas
+++ b/windows/src/engine/kmcomapi/util/utilkeymanoption.pas
@@ -121,6 +121,7 @@ type
     GroupName: string;
   end;
 
+// The Default options here need to be consistent with the defaults set in TfrmRunDesktop.GetDefaultSettings
 const KeymanOptionInfo: array[0..16] of TKeymanOptionInfo = (  // I3331   // I3620   // I4552
   // Global options
 
@@ -143,7 +144,7 @@ const KeymanOptionInfo: array[0..16] of TKeymanOptionInfo = (  // I3331   // I36
 
   // Startup options
 
-  (opt: koStartWithWindows;                  RegistryName: '';                                         OptionType: kotBool; BoolValue: False; GroupName: 'kogStartup'),
+  (opt: koStartWithWindows;                  RegistryName: '';                                         OptionType: kotBool; BoolValue: True; GroupName: 'kogStartup'),
   (opt: koShowStartup;                       RegistryName: SRegValue_ShowStartup;                      OptionType: kotBool; BoolValue: True;  GroupName: 'kogStartup'),
   (opt: koTestKeymanFunctioning;             RegistryName: SRegValue_TestKeymanFunctioning;            OptionType: kotBool; BoolValue: True;  GroupName: 'kogStartup'),
 
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
diff --git a/windows/src/test/unit-tests/standards-data/Keyman.Test.System.CanonicalLanguageCodeUtilsTest.pas b/windows/src/test/unit-tests/standards-data/Keyman.Test.System.CanonicalLanguageCodeUtilsTest.pas
index 514a2ffb68..46b31d652e 100644
--- a/windows/src/test/unit-tests/standards-data/Keyman.Test.System.CanonicalLanguageCodeUtilsTest.pas
+++ b/windows/src/test/unit-tests/standards-data/Keyman.Test.System.CanonicalLanguageCodeUtilsTest.pas
@@ -67,8 +67,8 @@ end;
 
 procedure TCanonicalLanguageCodeUtilsTest.TestSomeTags;
 begin
-  Assert.AreEqual('sa-Latn', TCanonicalLanguageCodeUtils.FindBestTag('sa-Latn', True, True));
-  Assert.AreEqual('he-Latn', TCanonicalLanguageCodeUtils.FindBestTag('he-Latn', True, True));
+  Assert.AreEqual('sa-Latn', TCanonicalLanguageCodeUtils.FindBestTag('sa-Latn', False, True)); // don't add region for this test
+  Assert.AreEqual('he-Latn', TCanonicalLanguageCodeUtils.FindBestTag('he-Latn', False, True)); // don't add region for this test
   Assert.AreEqual('hi-Latn-IN', TCanonicalLanguageCodeUtils.FindBestTag('hi-Latn', True, True));
 end;