diff --git a/tools/cldr-apps/js/package-lock.json b/tools/cldr-apps/js/package-lock.json
index effb41a5d85..56f3f2b8aca 100644
--- a/tools/cldr-apps/js/package-lock.json
+++ b/tools/cldr-apps/js/package-lock.json
@@ -1292,12 +1292,12 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -2048,9 +2048,9 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
diff --git a/tools/cldr-apps/js/src/esm/cldrLoad.mjs b/tools/cldr-apps/js/src/esm/cldrLoad.mjs
index 25fcaf2df04..1cdde412622 100644
--- a/tools/cldr-apps/js/src/esm/cldrLoad.mjs
+++ b/tools/cldr-apps/js/src/esm/cldrLoad.mjs
@@ -1049,10 +1049,30 @@ function getLocaleDir(locale) {
   return localeDir;
 }
 
+/** @returns true if locmap has been loaded from data */
+function localeMapReady() {
+  return !!locmap.locmap;
+}
+
+/** event ID for localeMap changes */
+const LOCALEMAP_EVENT = "localeMapReady";
+
+/**
+ * Calls the callback when the localeMap is ready (with real data).
+ * Calls right away if the localeMap was already loaded.
+ */
+function onLocaleMapReady(callback) {
+  if (localeMapReady()) {
+    callback();
+  } else {
+    cldrStatus.on(LOCALEMAP_EVENT, callback);
+  }
+}
+
 function setTheLocaleMap(lm) {
   locmap = lm;
+  cldrStatus.dispatchEvent(new Event(LOCALEMAP_EVENT));
 }
-
 /**
  * Convenience for calling getTheLocaleMap().getLocaleName(loc)
  * @param {String} loc
@@ -1062,6 +1082,10 @@ function getLocaleName(loc) {
   return locmap.getLocaleName(loc);
 }
 
+function getLocaleInfo(loc) {
+  return locmap.getLocaleInfo(loc);
+}
+
 /**
  * Get the window location hash
  *
@@ -1145,6 +1169,7 @@ export {
   flipToOtherDiv,
   getHash,
   getLocaleDir,
+  getLocaleInfo,
   getLocaleName,
   getTheLocaleMap,
   handleCoverageChanged,
@@ -1152,6 +1177,7 @@ export {
   linkToLocale,
   localeSpecialNote,
   myLoad,
+  onLocaleMapReady,
   parseHashAndUpdate,
   reloadV,
   replaceHash,
diff --git a/tools/cldr-apps/js/src/esm/cldrStatus.mjs b/tools/cldr-apps/js/src/esm/cldrStatus.mjs
index da6b0d94d29..862b875c6ec 100644
--- a/tools/cldr-apps/js/src/esm/cldrStatus.mjs
+++ b/tools/cldr-apps/js/src/esm/cldrStatus.mjs
@@ -49,6 +49,10 @@ function on(type, callback) {
   getStatusTarget().addEventListener(type, callback);
 }
 
+/**
+ * Fire off an event manually
+ * @param type the type to dispatch
+ */
 function dispatchEvent(type) {
   return getStatusTarget().dispatchEvent(type);
 }
@@ -75,6 +79,9 @@ function updateAll(status) {
   if (status.phase) {
     setPhase(status.phase);
   }
+  if (status.extendedPhase) {
+    setExtendedPhase(status.extendedPhase);
+  }
   if (status.specialHeader) {
     setSpecialHeader(status.specialHeader);
   }
@@ -300,6 +307,16 @@ function setPhase(p) {
   phase = p;
 }
 
+let extendedPhase = "";
+
+function getExtendedPhase() {
+  return extendedPhase;
+}
+
+function setExtendedPhase(p) {
+  extendedPhase = p;
+}
+
 /**
  * Is this a "beta" phase of Survey Tool? (Boolean)
  */
@@ -466,6 +483,7 @@ function setAutoImportBusy(busy) {
 }
 
 export {
+  dispatchEvent,
   getAutoImportBusy,
   getContextPath,
   getCurrentId,
@@ -474,6 +492,7 @@ export {
   getCurrentPage,
   getCurrentSection,
   getCurrentSpecial,
+  getExtendedPhase,
   getIsPhaseBeta,
   getIsUnofficial,
   getNewVersion,
@@ -500,6 +519,7 @@ export {
   setCurrentPage,
   setCurrentSection,
   setCurrentSpecial,
+  setExtendedPhase,
   setIsDisconnected,
   setIsPhaseBeta,
   setIsUnofficial,
diff --git a/tools/cldr-apps/js/src/views/MainHeader.vue b/tools/cldr-apps/js/src/views/MainHeader.vue
index 3a8d4a7532c..46b77c9e032 100644
--- a/tools/cldr-apps/js/src/views/MainHeader.vue
+++ b/tools/cldr-apps/js/src/views/MainHeader.vue
@@ -1,7 +1,17 @@
 <template>
   <header id="st-header">
+    <a-spin v-if="!loaded" :delay="250" />
     <ul>
-      <li>{{ stVersionPhase }}</li>
+      <li>
+        {{ stVersion }} {{ stPhase }}
+        <span
+          class="extendedException"
+          v-if="extendedException"
+          title="Note: This phase has been extended for this locale."
+        >
+          (extended)
+        </span>
+      </li>
       <li>
         <a href="#menu///"><span class="main-menu-icon">☰</span></a>
       </li>
@@ -79,6 +89,7 @@
 <script>
 import * as cldrAnnounce from "../esm/cldrAnnounce.mjs";
 import * as cldrCoverage from "../esm/cldrCoverage.mjs";
+import * as cldrLoad from "../esm/cldrLoad.mjs";
 import * as cldrMenu from "../esm/cldrMenu.mjs";
 import * as cldrStatus from "../esm/cldrStatus.mjs";
 import * as cldrText from "../esm/cldrText.mjs";
@@ -87,6 +98,7 @@ import * as cldrVote from "../esm/cldrVote.mjs";
 export default {
   data() {
     return {
+      loaded: false,
       announcementsTitle: null,
       coverageLevel: null,
       coverageMenu: [],
@@ -96,7 +108,10 @@ export default {
       orgCoverage: null,
       sessionMessage: null,
       specialHeader: null,
-      stVersionPhase: null,
+      stPhase: null,
+      stVersion: null,
+      tcLocale: true,
+      extendedException: false,
       unreadAnnouncementCount: 0,
       userName: null,
       voteCountMenu: null,
@@ -105,7 +120,12 @@ export default {
   },
 
   mounted() {
-    this.updateData();
+    // load after the localemap is ready
+    cldrLoad.onLocaleMapReady(() => {
+      this.updateData();
+    });
+    // reload if locale changes
+    cldrStatus.on("locale", () => this.updateData());
   },
 
   methods: {
@@ -114,9 +134,9 @@ export default {
      * This function is called both locally, to initialize, and from other module(s), to update.
      */
     updateData() {
-      const orgCoverage = cldrCoverage.getSurveyOrgCov(
-        cldrStatus.getCurrentLocale()
-      );
+      this.loaded = true;
+      const loc = cldrStatus.getCurrentLocale();
+      const orgCoverage = cldrCoverage.getSurveyOrgCov(loc);
       if (orgCoverage != this.orgCoverage) {
         this.orgCoverage = orgCoverage;
       }
@@ -155,11 +175,13 @@ export default {
       }
       this.sessionMessage = cldrStatus.getSessionMessage();
       this.specialHeader = cldrStatus.getSpecialHeader();
-      this.stVersionPhase =
-        "Survey Tool " +
-        cldrStatus.getNewVersion() +
-        " " +
-        cldrStatus.getPhase();
+      this.stVersion = "Survey Tool " + cldrStatus.getNewVersion();
+      this.extendedException = cldrLoad.getLocaleInfo(loc)?.extended;
+      if (!loc || !this.extendedException) {
+        this.stPhase = cldrStatus.getPhase();
+      } else if (this.extendedException) {
+        this.stPhase = cldrStatus.getExtendedPhase();
+      }
       cldrAnnounce.getUnreadCount(this.setUnreadCount);
     },
 
@@ -261,4 +283,8 @@ label {
 #coverageLevel {
   width: 16ch;
 }
+
+.extendedException {
+  background-color: yellow;
+}
 </style>
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java
index ac19827e85c..83d9f379857 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java
@@ -457,7 +457,12 @@ public JSONObject toJSONObject() throws JSONException {
 
     @Override
     public CheckCLDR.Phase getPhase() {
-        return SurveyMain.phase().getCPhase();
+        return SurveyMain.getOverallSurveyPhase().toCheckCLDRPhase();
+    }
+
+    @Override
+    public CheckCLDR.Phase getExtendedPhase() {
+        return SurveyMain.getOverallExtendedPhase().toCheckCLDRPhase();
     }
 
     @Override
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DBUtils.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DBUtils.java
index 841fcb0b4ba..a62b47a2ba3 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DBUtils.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DBUtils.java
@@ -53,7 +53,6 @@
 import org.unicode.cldr.util.CldrUtility;
 import org.unicode.cldr.util.PathHeader;
 import org.unicode.cldr.util.StackTracker;
-import org.unicode.cldr.web.SurveyMain.Phase;
 
 /** Singleton utility class for simple(r) DB access. */
 public class DBUtils {
@@ -963,8 +962,7 @@ public static StringBuilder appendVersionString(
 
     /** Append a versioned string */
     public static StringBuilder appendVersionString(StringBuilder sb) {
-        return appendVersionString(
-                sb, SurveyMain.getNewVersion(), SurveyMain.phase() == SurveyMain.Phase.BETA);
+        return appendVersionString(sb, SurveyMain.getNewVersion(), SurveyMain.isPhaseBeta());
     }
 
     private static String[] arrayOfResult(ResultSet rs) throws SQLException {
@@ -1380,8 +1378,7 @@ public synchronized String toString() {
                             "Error: don't use Table.toString before CLDRConfig is setup.");
                 }
                 defaultString =
-                        forVersion(SurveyMain.getNewVersion(), SurveyMain.phase() == Phase.BETA)
-                                .toString();
+                        forVersion(SurveyMain.getNewVersion(), SurveyMain.isPhaseBeta()).toString();
             }
             return defaultString;
         }
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DataPage.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DataPage.java
index 767ecee8cba..607c126658f 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DataPage.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DataPage.java
@@ -988,8 +988,7 @@ public Map<String, String> getNonDistinguishingAttributes() {
          */
         public StatusAction getStatusAction(InputMethod inputMethod) {
             // null because this is for display.
-            return SurveyMain.phase()
-                    .getCPhase()
+            return SurveyMain.checkCLDRPhase(locale)
                     .getShowRowAction(this, inputMethod, getPathHeader(), userForVotelist);
         }
 
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
index 71a9bce2f18..b743b70c393 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyAjax.java
@@ -1118,6 +1118,8 @@ private static JSONObject createJSONLocMap(SurveyMain sm) throws JSONException {
             locale.put("highestParent", loc.getHighestNonrootParent());
             locale.put("dcParent", dcParent);
             locale.put("dcChild", dcChild);
+            locale.put("tc", SubmissionLocales.isTcLocale(loc));
+            locale.put("extended", SubmissionLocales.isOpenForExtendedSubmission(loc));
             locale.put(
                     "type",
                     Factory.getSourceTreeType(disk.getSourceDirectoryForLocale(loc.getBaseName())));
@@ -2656,7 +2658,7 @@ public static void handleBulkSubmit(
         final List<CheckCLDR.CheckStatus> checkResult = new ArrayList<>();
         TestCache.TestResultBundle cc = stf.getTestResult(loc, DataPage.getOptions(cs, loc));
         UserRegistry.User u = theirU;
-        CheckCLDR.Phase cPhase = CLDRConfig.getInstance().getPhase();
+        CheckCLDR.Phase cPhase = SurveyMain.checkCLDRPhase(loc);
         Set<String> allValidPaths = stf.getPathsForFile(loc);
         CLDRProgressTask progress = sm.openProgress("Bulk:" + loc, all.size());
         CLDRFile cldrUnresolved = cf.getUnresolved();
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
index 3b162f5eafc..08c09c31f02 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/SurveyMain.java
@@ -65,6 +65,7 @@
 import org.unicode.cldr.test.CheckCLDR;
 import org.unicode.cldr.test.ExampleGenerator;
 import org.unicode.cldr.test.HelpMessages;
+import org.unicode.cldr.test.SubmissionLocales;
 import org.unicode.cldr.util.CLDRCacheDir;
 import org.unicode.cldr.util.CLDRConfig;
 import org.unicode.cldr.util.CLDRConfigImpl;
@@ -176,7 +177,7 @@ public String toString() {
          * @see org.unicode.cldr.test.CheckCLDR.Phase
          * @return the CheckCLDR.Phase
          */
-        public CheckCLDR.Phase getCPhase() {
+        public CheckCLDR.Phase toCheckCLDRPhase() {
             return cphase;
         }
     }
@@ -209,6 +210,7 @@ public String display() {
 
     // ===== Configuration state
     private static Phase currentPhase = Phase.VETTING;
+    private static Phase currentExtendedPhase = Phase.VETTING;
     /** set by CLDR_PHASE property. * */
     private static String oldVersion = "OLDVERSION";
 
@@ -2077,9 +2079,9 @@ public String getLocaleLink(WebContext ctx, CLDRLocale locale, String n) {
         if (canModify) {
             rv = rv + (modifyThing(ctx));
             int odisp;
-            if ((SurveyMain.phase() == Phase.VETTING
-                            || SurveyMain.phase() == Phase.SUBMIT
-                            || isPhaseVettingClosed())
+            if ((SurveyMain.surveyPhase(locale) == Phase.VETTING
+                            || SurveyMain.surveyPhase(locale) == Phase.SUBMIT
+                            || isPhaseVettingClosed(locale))
                     && ((odisp = DisputePageManager.getOrgDisputeCount(ctx)) > 0)) {
                 rv = rv + ctx.iconHtml("disp", "(" + odisp + " org disputes)");
             }
@@ -2444,7 +2446,7 @@ private synchronized String getDirectionalityFor(CLDRLocale id) {
      * @see org.unicode.cldr.test.CheckCoverage#check(String, String, String, Map, List)
      */
     public static org.unicode.cldr.test.CheckCLDR.Phase getTestPhase() {
-        return phase().getCPhase();
+        return getOverallSurveyPhase().toCheckCLDRPhase();
     }
 
     /**
@@ -2823,8 +2825,35 @@ private void doStartup() {
                                     + phaseString);
                 }
                 currentPhase = newPhase;
+                String extendedPhaseString = survprops.getProperty("CLDR_EXTENDED_PHASE", null);
+                Phase extendedPhase = null;
+                try {
+                    if (extendedPhaseString != null && !extendedPhaseString.isEmpty()) {
+                        if (currentPhase == Phase.READONLY) {
+                            busted(
+                                    "Error: Cannot have a CLDR_EXTENDED_PHASE when CLDR_PHASE=READONLY. Remove the CLDR_EXTENDED_PHASE.");
+                        }
+                        extendedPhase = (Phase.valueOf(extendedPhaseString));
+                    }
+                } catch (IllegalArgumentException iae) {
+                    logger.warning("Error trying to parse CLDR_EXTENDED_PHASE: " + iae);
+                }
+                if (extendedPhase == null) {
+                    extendedPhase = newPhase;
+                    logger.warning("CLDR_EXTENDED_PHASE unset, so will use main phase " + newPhase);
+                }
+                currentExtendedPhase = extendedPhase;
             }
-            logger.info("Phase: " + phase() + ", cPhase: " + phase().getCPhase());
+            logger.info(
+                    "Phase: "
+                            + getOverallSurveyPhase()
+                            + ", CheckCLDR Phase: "
+                            + getOverallSurveyPhase().toCheckCLDRPhase()
+                            + ", Extended Phase: "
+                            + currentExtendedPhase);
+            logger.info(
+                    "CLDR_EXTENDED_SUBMISSION="
+                            + String.join(" ", SubmissionLocales.ADDITIONAL_EXTENDED_SUBMISSION));
             progress.update("Setup props..");
             newVersion = survprops.getProperty(CLDR_NEWVERSION, CLDR_NEWVERSION);
             oldVersion = survprops.getProperty(CLDR_OLDVERSION, CLDR_OLDVERSION);
@@ -3554,22 +3583,47 @@ public static String localhost() {
 
     // ============= Following have to do with phases
 
-    public static boolean isPhaseVettingClosed() {
-        return phase() == Phase.VETTING_CLOSED;
+    public static boolean isPhaseVettingClosed(CLDRLocale locale) {
+        return surveyPhase(locale) == Phase.VETTING_CLOSED;
     }
 
     public static boolean isPhaseReadonly() {
-        return phase() == Phase.READONLY;
+        return getOverallSurveyPhase() == Phase.READONLY;
     }
 
     public static boolean isPhaseBeta() {
-        return phase() == Phase.BETA;
+        return getOverallSurveyPhase() == Phase.BETA;
     }
 
-    public static Phase phase() {
+    /** Internal- returns the overall phase. Not locale specific. */
+    public static Phase getOverallSurveyPhase() {
         return currentPhase;
     }
 
+    /**
+     * @returns the SurveyTool Phase for the locale
+     */
+    public static Phase surveyPhase(CLDRLocale locale) {
+        return (SubmissionLocales.isOpenForExtendedSubmission(locale)
+                ? getOverallExtendedPhase()
+                : getOverallSurveyPhase());
+    }
+
+    /**
+     * @returns the current CheckCLDR phase for the locale. This is the preferred API.
+     */
+    public static CheckCLDR.Phase checkCLDRPhase(CLDRLocale loc) {
+        return surveyPhase(loc).toCheckCLDRPhase();
+    }
+
+    /**
+     * the DDL (non-TC) overall phase. It is preferred to use one of the phase functions which takes
+     * a locale.
+     */
+    public static Phase getOverallExtendedPhase() {
+        return currentExtendedPhase;
+    }
+
     public static String getOldVersion() {
         return oldVersion;
     }
@@ -3641,7 +3695,8 @@ private class StatusForFrontEnd implements JSONString {
         private String organizationName = null;
         private final int pages = SurveyMain.pages;
         private Object permissions = null;
-        private final Phase phase = phase();
+        private final Phase phase = getOverallSurveyPhase();
+        private final Phase extendedPhase = getOverallExtendedPhase();
         private String sessionId = null;
         private final String specialHeader = getSpecialHeaderText();
         private final long surveyRunningStamp = SurveyMain.surveyRunningStamp.current();
@@ -3675,6 +3730,7 @@ private JSONObject toJSONObject() throws JSONException {
                     .put("pages", pages)
                     .put("permissions", permissions)
                     .put("phase", phase)
+                    .put("extendedPhase", extendedPhase)
                     .put("sessionId", sessionId)
                     .put("sessionMessage", sessionMessage)
                     .put("specialHeader", specialHeader)
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/UserRegistry.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/UserRegistry.java
index d7a2f67ef45..36f0575f96b 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/UserRegistry.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/UserRegistry.java
@@ -1821,7 +1821,7 @@ public static boolean userCanCreateUsers(User u) {
     }
 
     static boolean userCanSubmit(User u, SurveyMain.Phase phase) {
-        return (u != null) && u.getLevel().canSubmit(phase.getCPhase());
+        return (u != null) && u.getLevel().canSubmit(phase.toCheckCLDRPhase());
     }
 
     /**
@@ -1978,7 +1978,7 @@ public static ModifyDenial userCanModifyLocaleWhy(User u, CLDRLocale locale) {
         if (userIsAdmin(u) || userIsTC(u)) return null;
 
         // Otherwise, if closed, deny
-        if (SurveyMain.isPhaseVettingClosed()) return ModifyDenial.DENY_PHASE_CLOSED;
+        if (SurveyMain.isPhaseVettingClosed(locale)) return ModifyDenial.DENY_PHASE_CLOSED;
         if (SurveyMain.isPhaseReadonly()) return ModifyDenial.DENY_PHASE_READONLY;
 
         return null;
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/WebContext.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/WebContext.java
index 2500d12590f..423c178d78e 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/WebContext.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/WebContext.java
@@ -1089,7 +1089,7 @@ public static HTMLDirection fromCldr(String dir) {
      * @return true if the user can modify this locale
      */
     public Boolean canModify() {
-        if (STFactory.isReadOnlyLocale(locale) || SurveyMain.phase() == Phase.READONLY)
+        if (STFactory.isReadOnlyLocale(locale) || SurveyMain.surveyPhase(locale) == Phase.READONLY)
             return (canModify = false);
         if (canModify == null) {
             if (session != null && session.user != null) {
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/api/Summary.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/api/Summary.java
index 22ca409ae1b..468e8d13e32 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/api/Summary.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/api/Summary.java
@@ -336,7 +336,7 @@ public void run() {
     private void makeAutoPriorityItemsSnapshot() throws IOException, JSONException {
         boolean summarizeAllLocales = false;
         if (ENABLE_ALL_LOCALE_SUMMARY) {
-            final SurveyMain.Phase phase = SurveyMain.phase();
+            final SurveyMain.Phase phase = SurveyMain.getOverallSurveyPhase();
             summarizeAllLocales =
                     (phase == SurveyMain.Phase.VETTING || phase == SurveyMain.Phase.VETTING_CLOSED);
         }
diff --git a/tools/cldr-apps/src/test/java/org/unicode/cldr/web/TestUserLevel.java b/tools/cldr-apps/src/test/java/org/unicode/cldr/web/TestUserLevel.java
index 12f9417538a..cc26378d3cb 100644
--- a/tools/cldr-apps/src/test/java/org/unicode/cldr/web/TestUserLevel.java
+++ b/tools/cldr-apps/src/test/java/org/unicode/cldr/web/TestUserLevel.java
@@ -302,7 +302,8 @@ void TestVoteResolverLevel(
                 assertEquals(expected, l.canUseVettingSummary(), onFail);
                 break;
             case "userCanSubmit_SUBMIT":
-                assertEquals(expected, l.canSubmit(SurveyMain.Phase.SUBMIT.getCPhase()), onFail);
+                assertEquals(
+                        expected, l.canSubmit(SurveyMain.Phase.SUBMIT.toCheckCLDRPhase()), onFail);
                 break;
             case "userCanCreateSummarySnapshot":
                 assertEquals(expected, l.canCreateSummarySnapshot(), onFail);
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckWidths.java b/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckWidths.java
index f4692940c71..01371c40a9e 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckWidths.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/test/CheckWidths.java
@@ -35,10 +35,10 @@ public class CheckWidths extends CheckCLDR {
     private static UnitWidthUtil UNIT_WIDTHS_UTIL = UnitWidthUtil.getInstance();
 
     /** Controls for the warning about too many components, and for when to cause error. */
-    public static final int WARN_COMPONENTS_PER_ANNOTATION = 10;
+    public static final int WARN_COMPONENTS_PER_ANNOTATION = 12;
 
     // TBD lower this down after Meta data added
-    public static final int MAX_COMPONENTS_PER_ANNOTATION = 45;
+    public static final int MAX_COMPONENTS_PER_ANNOTATION = 20;
 
     SupplementalDataInfo supplementalData;
 
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/test/SubmissionLocales.java b/tools/cldr-code/src/main/java/org/unicode/cldr/test/SubmissionLocales.java
index a0ec4cc629b..11a8a19650e 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/test/SubmissionLocales.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/test/SubmissionLocales.java
@@ -12,6 +12,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.unicode.cldr.util.CLDRConfig;
+import org.unicode.cldr.util.CLDRLocale;
 import org.unicode.cldr.util.GrammarInfo;
 import org.unicode.cldr.util.Level;
 import org.unicode.cldr.util.Organization;
@@ -69,6 +71,16 @@ public final class SubmissionLocales {
     /** Subset of CLDR_LOCALES, minus special which are only those which are TC orgs */
     public static final Set<String> TC_ORG_LOCALES;
 
+    /** Space-separated list of TC locales to extend submission */
+    public static final String DEFAULT_EXTENDED_SUBMISSION = "";
+
+    /** Additional TC locales which have extended submission. Do not add non-tc locales here. */
+    public static final Set<String> ADDITIONAL_EXTENDED_SUBMISSION =
+            ImmutableSet.copyOf(
+                    CLDRConfig.getInstance()
+                            .getProperty("CLDR_EXTENDED_SUBMISSION", "")
+                            .split(" "));
+
     /**
      * Set to true iff ONLY grammar locales should be limited submission {@link
      * GrammarInfo#getGrammarLocales()}
@@ -248,4 +260,43 @@ public static boolean pathAllowedInLimitedSubmission(String path) {
     public static Set<ReportId> getReportsAvailableInLimited() {
         return LIMITED_SUBMISSION_REPORTS;
     }
+
+    /**
+     * @returns true if the locale or its parent is considered a TC Org Locale. Returns true for
+     *     ROOT.
+     */
+    public static boolean isTcLocale(CLDRLocale loc) {
+        if (loc == CLDRLocale.ROOT
+                || SubmissionLocales.TC_ORG_LOCALES.contains(loc.getBaseName())) {
+            // root or explicitly listed locale is a TC locale
+            return true;
+        } else if (loc.isParentRoot()) {
+            // any sublocale of root not listed is not a tc locale
+            return false;
+        } else {
+            return isTcLocale(loc.getParent());
+        }
+    }
+
+    /**
+     * @returns true if the locale or its parent is considered a TC Org Locale. Returns true for
+     *     ROOT.
+     */
+    public static boolean isOpenForExtendedSubmission(CLDRLocale loc) {
+        if (loc == CLDRLocale.ROOT) {
+            return false; // root is never open
+        } else if (SubmissionLocales.ADDITIONAL_EXTENDED_SUBMISSION.contains(loc.getBaseName())) {
+            // explicitly listed locale is a open for additional
+            return true;
+        } else if (SubmissionLocales.TC_ORG_LOCALES.contains(loc.getBaseName())) {
+            // TC locale but not listed as extended - NOT open for extended submission.
+            return false;
+        } else if (loc.isParentRoot()) {
+            // Not a TC locale, so it's open.
+            return true;
+        } else {
+            // child locale of an open locale is open
+            return isOpenForExtendedSubmission(loc.getParent());
+        }
+    }
 }
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/Chart.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/Chart.java
index 697d1e24dd6..7c6c786905b 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/Chart.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/Chart.java
@@ -38,7 +38,7 @@ public abstract class Chart {
     public static final String CHART_VERSION_DIRECTORY =
             ToolConstants.getBaseDirectory(ToolConstants.CHART_VERSION);
 
-    public static final String GITHUB_ROOT = CLDRURLS.CLDR_REPO_ROOT + "/blob/main/";
+    public static final String GITHUB_ROOT = CLDRURLS.CLDR_REPO_MAIN;
     public static final String LDML_SPEC = "https://unicode.org/reports/tr35/";
 
     public static String dataScrapeMessage(String specPart, String testFile, String... dataFiles) {
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateTransformCharts.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateTransformCharts.java
index c5691638fca..a30d01372c9 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateTransformCharts.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/GenerateTransformCharts.java
@@ -36,6 +36,7 @@
 import org.unicode.cldr.util.CLDRPaths;
 import org.unicode.cldr.util.CLDRTransforms;
 import org.unicode.cldr.util.CLDRTransforms.ParsedTransformID;
+import org.unicode.cldr.util.CLDRURLS;
 import org.unicode.cldr.util.CldrUtility;
 import org.unicode.cldr.util.FileCopier;
 import org.unicode.cldr.util.Pair;
@@ -367,7 +368,9 @@ private static void showAllLatin() throws IOException {
                         + "These charts do not show the available script and language transliterations that are not to/from Latin. "
                         + "It also does not show other transforms that are available in CLDR, such as the casing transformations, "
                         + "full-width and half-width transformations, and specialized transformations such as IPA-XSampa. "
-                        + "For the latest snapshot of the data files, see <a href='https://github.com/unicode-org/cldr/tree/main/common/transforms'>Transform XML Data</a>. "
+                        + "For the latest snapshot of the data files, see <a href='"
+                        + CLDRURLS.CLDR_REPO_BASE
+                        + "tree/main/common/transforms'>Transform XML Data</a>. "
                         + "For more information, see below.</blockquote>");
         index.flush();
         index.println("<ul>");
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/ShowLanguages.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/ShowLanguages.java
index 8433d9e72b1..3f0155fc307 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/ShowLanguages.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/ShowLanguages.java
@@ -8,9 +8,9 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
+import com.google.common.collect.Sets;
 import com.google.common.collect.TreeMultimap;
 import com.ibm.icu.impl.Relation;
 import com.ibm.icu.impl.Row.R2;
@@ -1362,7 +1362,7 @@ private String getLanguagePluralMessage(String msg, String languageCode) {
         }
 
         private String getLanguageName(String languageCode) {
-            String result = english.getName(languageCode);
+            String result = english.getName(languageCode, true, CLDRFile.SHORT_ALTS);
             if (!result.equals(languageCode)) return result;
             Set<String> names = Iso639Data.getNames(languageCode);
             if (names != null && names.size() != 0) {
@@ -1372,171 +1372,189 @@ private String getLanguageName(String languageCode) {
         }
 
         static final Set<Organization> TC_Vendors =
-                ImmutableSet.of(
-                        Organization.apple,
-                        Organization.google,
-                        Organization.microsoft,
-                        Organization.cldr);
+                Sets.union(
+                        Organization.getTCOrgs(),
+                        // This adds the CLDR org at the end of the list
+                        Set.of(Organization.cldr));
 
         private void showCoverageGoals(PrintWriter pw) throws IOException {
-            PrintWriter pw2 =
-                    new PrintWriter(
-                            new FormattedFileWriter(
-                                    null,
-                                    "Coverage Goals",
-                                    null
-                                    // "<p>" +
-                                    // "The following show default coverage goals for larger
-                                    // organizations. " +
-                                    // "<i>[n/a]</i> shows where there is no specific value for a
-                                    // given organization, " +
-                                    // "while <i>(...)</i> indicates that the goal is inherited from
-                                    // the parent. " +
-                                    // "A * is added if the goal differs from the parent locale's
-                                    // goal. " +
-                                    // "For information on what these goals mean (comprehensive,
-                                    // modern, moderate,...), see the LDML specification "
-                                    // +
-                                    // "<a
-                                    // href='http://www.unicode.org/reports/tr35/#Coverage_Levels'>Appendix M: Coverage Levels</a>. " +
-                                    // +
-                                    // "</p>"
-                                    ,
-                                    null));
-
-            TablePrinter tablePrinter =
-                    new TablePrinter()
-                            // tablePrinter.setSortPriorities(0,4)
-                            .addColumn("Language", "class='source'", null, "class='source'", false)
-                            .setSortPriority(0)
-                            .setBreakSpans(false)
+            try (PrintWriter pw2 =
+                            new PrintWriter(
+                                    new FormattedFileWriter(
+                                            null,
+                                            "Coverage Goals",
+                                            null,
+                                            SUPPLEMENTAL_INDEX_ANCHORS));
+                    PrintWriter coverageGoalsTsv =
+                            FileUtilities.openUTF8Writer(
+                                    CLDRPaths.CHART_DIRECTORY + "tsv/", "coverage_goals.tsv"); ) {
+
+                TablePrinter tablePrinter =
+                        new TablePrinter()
+                                // tablePrinter.setSortPriorities(0,4)
+                                .addColumn(
+                                        "Language", "class='source'", null, "class='source'", false)
+                                .setSortPriority(0)
+                                .setBreakSpans(false)
+                                .addColumn(
+                                        "Code",
+                                        "class='source'",
+                                        "<a href=\""
+                                                + CLDRURLS.CLDR_REPO_ROOT
+                                                + "/blob/main/common/main/{0}.xml\">{0}</a>",
+                                        "class='source'",
+                                        false)
+                                .addColumn(
+                                        "D. Votes",
+                                        "class='target'",
+                                        null,
+                                        "class='target'",
+                                        false);
+
+                Map<Organization, Map<String, Level>> vendordata = sc.getLocaleTypes();
+                Set<String> locales = new TreeSet<>();
+                Set<Organization> vendors = new LinkedHashSet<>();
+                Set<Organization> smallVendors = new LinkedHashSet<>();
+
+                for (Organization organization : TC_Vendors) {
+                    // if (vendor.equals(Organization.java)) continue;
+                    Map<String, Level> data = vendordata.get(organization);
+                    vendors.add(organization);
+                    tablePrinter
                             .addColumn(
-                                    "Code",
-                                    "class='source'",
-                                    "<a href=\"http://www.unicode.org/cldr/data/common/main/{0}.xml\">{0}</a>",
-                                    "class='source'",
+                                    organization.getDisplayName(),
+                                    "class='target'",
+                                    null,
+                                    "class='target'",
                                     false)
-                            .addColumn("D. Votes", "class='target'", null, "class='target'", false);
+                            .setSpanRows(false);
+                    locales.addAll(data.keySet());
+                    showTabbedOrgLevels(coverageGoalsTsv, organization, data);
+                }
 
-            Map<Organization, Map<String, Level>> vendordata = sc.getLocaleTypes();
-            Set<String> locales = new TreeSet<>();
-            Set<Organization> vendors = new LinkedHashSet<>();
-            Set<Organization> smallVendors = new LinkedHashSet<>();
+                for (Entry<Organization, Map<String, Level>> vendorData : vendordata.entrySet()) {
+                    Organization organization = vendorData.getKey();
+                    if (!TC_Vendors.contains(organization)) {
+                        smallVendors.add(organization);
+                        Map<String, Level> data = vendordata.get(organization);
+                        showTabbedOrgLevels(coverageGoalsTsv, organization, data);
+                        continue;
+                    }
+                }
 
-            for (Organization organization : TC_Vendors) {
-                // if (vendor.equals(Organization.java)) continue;
-                Map<String, Level> data = vendordata.get(organization);
-                vendors.add(organization);
-                tablePrinter
-                        .addColumn(
-                                organization.getDisplayName(),
-                                "class='target'",
-                                null,
-                                "class='target'",
-                                false)
-                        .setSpanRows(false);
-                locales.addAll(data.keySet());
-            }
+                Collection<Comparable[]> data = new ArrayList<>();
+                List<String> list = new ArrayList<>();
+                LanguageTagParser ltp = new LanguageTagParser();
+                // String alias2 = getAlias("sh_YU");
 
-            for (Entry<Organization, Map<String, Level>> vendorData : vendordata.entrySet()) {
-                Organization vendor = vendorData.getKey();
-                if (!TC_Vendors.contains(vendor)) {
-                    smallVendors.add(vendor);
-                    continue;
-                }
-            }
+                pw2.append("<h2>TC Orgs</h2>");
 
-            Collection<Comparable[]> data = new ArrayList<>();
-            List<String> list = new ArrayList<>();
-            LanguageTagParser ltp = new LanguageTagParser();
-            // String alias2 = getAlias("sh_YU");
-
-            pw2.append("<h2>TC Orgs</h2>");
-
-            for (String locale : locales) {
-                list.clear();
-                String localeCode = locale.equals("*") ? "und" : locale;
-                String alias = getAlias(localeCode);
-                if (!alias.equals(localeCode)) {
-                    throw new IllegalArgumentException(
-                            "Should use canonical form: " + locale + " => " + alias);
-                }
-                String baseLang = ltp.set(localeCode).getLanguage();
-                String baseLangName = getLanguageName(baseLang);
-                list.add("und".equals(localeCode) ? "other" : baseLangName);
-                list.add(locale);
-                int defaultVotes =
-                        supplementalDataInfo.getRequiredVotes(CLDRLocale.getInstance(locale), null);
-                list.add(String.valueOf(defaultVotes));
-                for (Organization vendor : vendors) {
-                    String status = getVendorStatus(locale, vendor, vendordata);
-                    //                    if (!baseLang.equals(locale) && !status.startsWith("<")) {
-                    //                        String langStatus = getVendorStatus(baseLang, vendor,
-                    // vendordata);
-                    //                        if (!langStatus.equals(status)) {
-                    //                            status += "*";
-                    //                        }
-                    //                    }
-                    list.add(status);
+                for (String locale : locales) {
+                    list.clear();
+                    String localeCode = locale.equals("*") ? "und" : locale;
+                    String alias = getAlias(localeCode);
+                    if (!alias.equals(localeCode)) {
+                        throw new IllegalArgumentException(
+                                "Should use canonical form: " + locale + " => " + alias);
+                    }
+                    // String baseLang = ltp.set(localeCode).getLanguage();
+                    String baseLangName = getLanguageName(localeCode);
+                    list.add("und".equals(localeCode) ? "other" : baseLangName);
+                    list.add(locale);
+                    int defaultVotes =
+                            supplementalDataInfo.getRequiredVotes(
+                                    CLDRLocale.getInstance(locale), null);
+                    list.add(String.valueOf(defaultVotes));
+                    for (Organization vendor : vendors) {
+                        String status = getVendorStatus(locale, vendor, vendordata);
+                        //                    if (!baseLang.equals(locale) &&
+                        // !status.startsWith("<")) {
+                        //                        String langStatus = getVendorStatus(baseLang,
+                        // vendor,
+                        // vendordata);
+                        //                        if (!langStatus.equals(status)) {
+                        //                            status += "*";
+                        //                        }
+                        //                    }
+                        list.add(status);
+                    }
+                    data.add(list.toArray(new String[list.size()]));
                 }
-                data.add(list.toArray(new String[list.size()]));
-            }
-            Comparable[][] flattened = data.toArray(new Comparable[data.size()][]);
-            String value = tablePrinter.addRows(flattened).toTable();
-            pw2.println(value);
-
-            pw2.append("<h2>Others</h2><div align='left'><ul>");
-
-            for (Organization vendor2 : smallVendors) {
-                pw2.append("<li><b>");
-                pw2.append(TransliteratorUtilities.toHTML.transform(vendor2.getDisplayName()))
-                        .append(": </b>");
-                boolean first1 = true;
-                for (Level level : Level.values()) {
-                    boolean first2 = true;
-                    Level other = null;
-                    for (Entry<String, Level> data2 : vendordata.get(vendor2).entrySet()) {
-                        String key = data2.getKey();
-                        Level level2 = data2.getValue();
-                        if (level != level2) {
-                            continue;
-                        }
-                        if (key.equals("*")) {
-                            other = level2;
-                            continue;
-                        }
-                        if (first2) {
-                            if (first1) {
-                                first1 = false;
+                Comparable[][] flattened = data.toArray(new Comparable[data.size()][]);
+                String value = tablePrinter.addRows(flattened).toTable();
+                pw2.println(value);
+
+                pw2.append("<h2>Others</h2><div align='left'><ul>");
+
+                for (Organization vendor2 : smallVendors) {
+                    pw2.append("<li><b>");
+                    pw2.append(TransliteratorUtilities.toHTML.transform(vendor2.getDisplayName()))
+                            .append(": </b>");
+                    boolean first1 = true;
+                    for (Level level : Level.values()) {
+                        boolean first2 = true;
+                        Level other = null;
+                        for (Entry<String, Level> data2 : vendordata.get(vendor2).entrySet()) {
+                            String key = data2.getKey();
+                            Level level2 = data2.getValue();
+                            if (level != level2) {
+                                continue;
+                            }
+                            if (key.equals("*")) {
+                                other = level2;
+                                continue;
+                            }
+                            if (first2) {
+                                if (first1) {
+                                    first1 = false;
+                                } else {
+                                    pw2.append("; ");
+                                }
+                                pw2.append(level2.toString()).append(": ");
+                                first2 = false;
                             } else {
-                                pw2.append("; ");
+                                pw2.append(", ");
                             }
-                            pw2.append(level2.toString()).append(": ");
-                            first2 = false;
-                        } else {
-                            pw2.append(", ");
+                            pw2.append(TransliteratorUtilities.toHTML.transform(key));
                         }
-                        pw2.append(TransliteratorUtilities.toHTML.transform(key));
-                    }
-                    if (other != null) {
-                        if (first2) {
-                            if (first1) {
-                                first1 = false;
+                        if (other != null) {
+                            if (first2) {
+                                if (first1) {
+                                    first1 = false;
+                                } else {
+                                    pw2.append("; ");
+                                }
+                                pw2.append(level.toString()).append(": ");
+                                first2 = false;
                             } else {
-                                pw2.append("; ");
+                                pw2.append(", ");
                             }
-                            pw2.append(level.toString()).append(": ");
-                            first2 = false;
-                        } else {
-                            pw2.append(", ");
+                            pw2.append("<i>other</i>");
                         }
-                        pw2.append("<i>other</i>");
                     }
+                    pw2.append("</li>");
                 }
-                pw2.append("</li>");
+                pw2.append("</ul></div>");
+            }
+        }
+
+        public void showTabbedOrgLevels(
+                PrintWriter coverageGoalsTsv, Organization organization, Map<String, Level> data) {
+            coverageGoalsTsv.println(
+                    String.format(
+                            "\n#%s\t;\t%s\t;\t%s\t;\t%s\n",
+                            "Org", "Locale", "Level", "Locale Name"));
+            for (Entry<String, Level> entry : data.entrySet()) {
+                String locale = entry.getKey();
+                Level level = entry.getValue();
+                final String name =
+                        locale.equals("*")
+                                ? "ALL"
+                                : english.getName(locale, true, CLDRFile.SHORT_ALTS);
+                coverageGoalsTsv.println(
+                        String.format(
+                                "%s\t;\t%s\t;\t%s\t;\t%s", organization, locale, level, name));
             }
-            pw2.append("</ul></div>");
-            pw2.close();
         }
 
         LanguageTagParser lpt2 = new LanguageTagParser();
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/ShowLocaleCoverage.java b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/ShowLocaleCoverage.java
index 01c700eadf5..946a06fd10c 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/tool/ShowLocaleCoverage.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/tool/ShowLocaleCoverage.java
@@ -40,6 +40,7 @@
 import org.unicode.cldr.util.CLDRFile.DraftStatus;
 import org.unicode.cldr.util.CLDRLocale;
 import org.unicode.cldr.util.CLDRPaths;
+import org.unicode.cldr.util.CLDRURLS;
 import org.unicode.cldr.util.CldrUtility;
 import org.unicode.cldr.util.CoreCoverageInfo;
 import org.unicode.cldr.util.CoreCoverageInfo.CoreItems;
@@ -67,7 +68,8 @@
 public class ShowLocaleCoverage {
 
     private static final String TSV_BASE =
-            "https://github.com/unicode-org/cldr-staging/blob/main/docs/charts/"
+            CLDRURLS.CLDR_STAGING_REPO_MAIN
+                    + "docs/charts/"
                     + ToolConstants.CHART_VI.getVersionString(1, 2)
                     + "/tsv/";
     public static final Splitter LF_SPLITTER = Splitter.on('\n');
@@ -887,7 +889,7 @@ private static void showCoverage(
                     tablePrinter
                             .addRow()
                             .addCell(language)
-                            .addCell(ENGLISH.getName(language))
+                            .addCell(ENGLISH.getName(language, true, CLDRFile.SHORT_ALTS))
                             .addCell(file.getName(language))
                             .addCell(script)
                             .addCell(defRegion)
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRConfig.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRConfig.java
index 3e0f7d17596..4d1f1131908 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRConfig.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRConfig.java
@@ -400,6 +400,15 @@ public synchronized Phase getPhase() {
         return phase;
     }
 
+    /**
+     * @returns the phase for extended submission locales. Defaults to same as main phase. {@link
+     *     SubmissionLocales#isOpenForExtendedSubmission}
+     */
+    public Phase getExtendedPhase() {
+        // by default, same as main phase.
+        return getPhase();
+    }
+
     @Override
     public String getProperty(String key, String d) {
         String result = getProperty(key);
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRURLS.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRURLS.java
index be875502384..78a3dc24e45 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRURLS.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRURLS.java
@@ -10,9 +10,13 @@ public abstract class CLDRURLS {
     public static final String CLDR_SCHEMA_BASE = "https://schemas.unicode.org/cldr";
     public static final String CLDR_CURVER_BASE = CLDR_SCHEMA_BASE + "/" + CLDRFile.GEN_VERSION;
     /** Base URL for the CLDR repository */
-    public static final String CLDR_REPO_BASE = "https://github.com/unicode-org/cldr";
+    public static final String CLDR_REPO_BASE = "https://github.com/unicode-org/cldr/";
 
-    public static final String DEFAULT_COMMIT_BASE = CLDR_REPO_BASE + "/commit/";
+    public static final String CLDR_REPO_MAIN = CLDR_REPO_BASE + "blob/main/";
+    public static final String CLDR_STAGING_REPO_MAIN =
+            "https://github.com/unicode-org/cldr-staging/blob/main/";
+
+    public static final String DEFAULT_COMMIT_BASE = CLDR_REPO_BASE + "commit/";
     /** Hostname for the Survey Tool */
     public static final String DEFAULT_HOST = "st.unicode.org";
 
diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/PathHeader.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/PathHeader.java
index 4768aac4a46..c9a37ddf49a 100644
--- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/PathHeader.java
+++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/PathHeader.java
@@ -228,7 +228,8 @@ public enum PageId {
         Measurement_Systems(SectionId.Units, "Measurement Systems"),
         Duration(SectionId.Units),
         Graphics(SectionId.Units),
-        Length(SectionId.Units),
+        Length_Metric(SectionId.Units, "Length Metric"),
+        Length_Other(SectionId.Units, "Length Other"),
         Area(SectionId.Units),
         Volume_Metric(SectionId.Units, "Volume Metric"),
         Volume_US(SectionId.Units, "Volume US"),
@@ -2221,12 +2222,7 @@ private static String fix(String input, int orderIn) {
             while (true) {
                 int functionStart = input.indexOf('&', pos);
                 if (functionStart < 0) {
-                    if ("Volume".equals(input)) {
-                        return getVolumePageId(args.value[0] /* path */).toString();
-                    } else if ("Other Units".equals(input)) {
-                        return getOtherUnitsPageId(args.value[0] /* path */).toString();
-                    }
-                    return input;
+                    return adjustPageForPath(input, args.value[0] /* path */).toString();
                 }
                 int functionEnd = input.indexOf('(', functionStart);
                 int argEnd =
@@ -2246,12 +2242,35 @@ private static String fix(String input, int orderIn) {
             }
         }
 
+        private static String adjustPageForPath(String input, String path) {
+            if ("Length".equals(input)) {
+                return getLengthPageId(path).toString();
+            }
+            if ("Other Units".equals(input)) {
+                return getOtherUnitsPageId(path).toString();
+            }
+            if ("Volume".equals(input)) {
+                return getVolumePageId(path).toString();
+            }
+            return input;
+        }
+
         private static Set<UnitConverter.UnitSystem> METRIC_UNITS =
                 Set.of(UnitConverter.UnitSystem.metric, UnitConverter.UnitSystem.metric_adjacent);
 
         private static Set<UnitConverter.UnitSystem> US_UNITS =
                 Set.of(UnitConverter.UnitSystem.ussystem);
 
+        private static PageId getLengthPageId(String path) {
+            final String shortUnitId = getShortUnitId(path);
+            if (isSystemUnit(shortUnitId, METRIC_UNITS)) {
+                return PageId.Length_Metric;
+            } else {
+                // Could further subdivide into US/Other with isSystemUnit(shortUnitId, US_UNITS)
+                return PageId.Length_Other;
+            }
+        }
+
         private static PageId getVolumePageId(String path) {
             final String shortUnitId = getShortUnitId(path);
             if (isSystemUnit(shortUnitId, METRIC_UNITS)) {
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/Locales.txt b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/Locales.txt
index 5305cb7a385..d20bde761ff 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/Locales.txt
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/Locales.txt
@@ -617,7 +617,7 @@ Cldr	;	to	;	moderate ; Tongan
 Cldr  ; yue_Hans  ; modern  ; Cantonese (Simplified)
 
 Cldr  ; fo  ; moderate  ; Faroese
-Cldr  ; qu  ; moderate  ; Quechua
+Cldr  ; qu ; modern  ; Quechua
 Cldr  ; br  ; moderate  ; Breton
 Cldr  ; sc  ; moderate  ; Sardinian
 Cldr  ; kgp ; moderate  ; Kaingang
@@ -629,11 +629,11 @@ Cldr  ; bs_Cyrl ; basic ; Bosnian (Cyrillic)
 Cldr  ; ia  ; basic ; Interlingua
 Cldr  ; kea ; basic ; Kabuverdianu
 Cldr  ; rm  ; basic ; Romansh
-Cldr	;	tg	;	basic ; Tajik
-Cldr	;	ti	;	basic ; Tigrinya
-Cldr	;	tt	;	basic ; Tatar
+Cldr	;	tg	;	moderate ; Tajik
+Cldr	;	ti	;	modern ; Tigrinya
+Cldr	;	tt	;	moderate ; Tatar
 Cldr  ; uz_Cyrl ; basic ; Uzbek (Cyrillic)
-Cldr	;	wo	;	basic ; Wolof
+Cldr	;	wo	;	moderate ; Wolof
 
 Bangor_Univ ;   cy   ;    modern  ; Welsh
 
@@ -721,12 +721,14 @@ Microsoft	;	ga	;	modern	;	Irish
 Microsoft	;	gd	;	modern	;	Scottish Gaelic
 Microsoft	;	gl	;	modern	;	Galician
 Microsoft	;	gu	;	modern	;	Gujarati
+Microsoft	;	ha	;	modern	;	Hausa
 Microsoft	;	he	;	modern	;	Hebrew
 Microsoft	;	hi	;	modern	;	Hindi
 Microsoft	;	hr	;	modern	;	Croatian
 Microsoft	;	hu	;	modern	;	Hungarian
 Microsoft	;	hy	;	modern	;	Armenian
 Microsoft	;	id	;	modern	;	Indonesian
+Microsoft	;	ig	;	modern	;	Igbo
 Microsoft	;	is	;	modern	;	Icelandic
 Microsoft	;	it	;	modern	;	Italian
 Microsoft	;	ja	;	modern	;	Japanese
@@ -747,13 +749,15 @@ Microsoft	;	mr	;	modern	;	Marathi
 Microsoft	;	ms	;	modern	;	Malay
 Microsoft	;	ne	;	modern	;	Nepali
 Microsoft	;	nl	;	modern	;	Dutch
-Microsoft	;	no	;	modern	;	Norwegian
+Microsoft	;	nn	;	modern  ; Norwegian Nynorsk
+Microsoft	;	no	;	modern	;	Norwegian Bokmål
 Microsoft	;	or	;	modern	;	Odia
 Microsoft	;	pa	;	modern	;	Punjabi
 Microsoft	;	pl	;	modern	;	Polish
 Microsoft	;	ps	;	modern	;	Pashto
 Microsoft	;	pt	;	modern	;	Portuguese (Brazil)
 Microsoft	;	pt_PT	;	modern	;	Portuguese (Portugal)
+Microsoft ; qu  ; modern  ; Quechua
 Microsoft	;	ro	;	modern	;	Romanian
 Microsoft	;	ru	;	modern	;	Russian
 Microsoft	;	sd	;	modern	;	Sindhi
@@ -766,26 +770,24 @@ Microsoft	;	sv	;	modern	;	Swedish
 Microsoft	;	sw	;	modern	;	Swahili
 Microsoft	;	ta	;	modern	;	Tamil
 Microsoft	;	te	;	modern	;	Telugu
+Microsoft	;	tg	;	moderate	;	Tajik
 Microsoft	;	th	;	modern	;	Thai
+Microsoft	;	ti	;	modern	;	Tigrinya
 Microsoft	;	tr	;	modern	;	Turkish
+Microsoft	;	tk	;	modern	;	Turkmen
 Microsoft	;	uk	;	modern	;	Ukrainian
 Microsoft	;	ur	;	modern	;	Urdu
 Microsoft	;	uz	;	modern	;	Uzbek
 Microsoft	;	vi	;	modern	;	Vietnamese
+Microsoft	;	yo	;	modern	;	Yoruba
 Microsoft	;	zh	;	modern	;	Chinese (Simplified)
 Microsoft	;	zh_Hant	;	modern	;	Chinese (Traditional)
 Microsoft	;	zh_Hant_HK	;	modern	;	Chinese (Traditional, Hong Kong)
 Microsoft	;	zu	;	modern	;	Zulu
-Microsoft	;	ig	;	basic	;	Igbo
 Microsoft	;	nn	;	moderate	;	Norwegian Nynorsk
-Microsoft	;	tk	;	modern	;	Turkmen
-Microsoft	;	ha	;	basic	;	Hausa
-Microsoft	;	mi	;	basic	;	Māori
-Microsoft	;	ti	;	basic	;	Tigrinya
-Microsoft	;	tg	;	basic	;	Tajik
-Microsoft	;	tt	;	basic	;	Tatar
-Microsoft	;	wo	;	basic	;	Wolof
-Microsoft	;	yo	;	basic	;	Yoruba
+Microsoft	;	mi	;	moderate	;	Māori
+Microsoft	;	tt	;	moderate	;	Tatar
+Microsoft	;	wo	;	moderate	;	Wolof
 Microsoft ; * ; moderate ; All Others, provisionally
 
 Pakistan	;	ur	;	modern	;	Urdu
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/test/TestSubmissionLocales.java b/tools/cldr-code/src/test/java/org/unicode/cldr/test/TestSubmissionLocales.java
index cd007c3cb2c..702dd517b76 100644
--- a/tools/cldr-code/src/test/java/org/unicode/cldr/test/TestSubmissionLocales.java
+++ b/tools/cldr-code/src/test/java/org/unicode/cldr/test/TestSubmissionLocales.java
@@ -3,13 +3,18 @@
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
+import java.util.List;
+import java.util.stream.Collectors;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvFileSource;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.unicode.cldr.util.CLDRLocale;
 
 public class TestSubmissionLocales {
     @ParameterizedTest
@@ -69,4 +74,66 @@ void TestSubmissionLocale() {
     public static final boolean bool(final String s) {
         return Boolean.parseBoolean(s);
     }
+
+    @ParameterizedTest
+    @CsvSource({
+        // loc, isTc
+        "root, true",
+        "de, true",
+        "de_IT, true",
+        "csw, false",
+        "csw_CA, false",
+        "cho_US, false",
+        "zh, true",
+        "zh_Hant_MO, true",
+        "smj, false",
+        "smj_NO, false",
+        "smj_SE, false",
+    })
+    public void testIsTcLocale(final String loc, final String tf) {
+        final CLDRLocale l = CLDRLocale.getInstance(loc);
+        assertNotNull(l, loc);
+        final Boolean isCldr = Boolean.parseBoolean(tf);
+        assertEquals(isCldr, SubmissionLocales.isTcLocale(l));
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+        // loc, isExtended
+        "root, false",
+        "de, false",
+        "de_IT, false",
+        "csw, true",
+        "csw_CA, true",
+        "cho_US, true",
+        "zh, false",
+        "zh_Hant_MO, false",
+        "smj, true",
+        "smj_NO, true",
+        "smj_SE, true",
+    })
+    public void testIsExtendedSubmissionLocale(final String loc, final String tf) {
+        final CLDRLocale l = CLDRLocale.getInstance(loc);
+        assertNotNull(l, loc);
+        final Boolean isExtendedSubmission = Boolean.parseBoolean(tf);
+        assertEquals(isExtendedSubmission, SubmissionLocales.isOpenForExtendedSubmission(l));
+    }
+
+    @Test
+    public void textAdditionalVsTcLocale() {
+        final List<CLDRLocale> extendedSubmissionButNotTcLocales =
+                SubmissionLocales.ADDITIONAL_EXTENDED_SUBMISSION.stream()
+                        .map(l -> CLDRLocale.getInstance(l))
+                        .filter(l -> !SubmissionLocales.isTcLocale(l))
+                        .collect(Collectors.toList());
+        assertTrue(
+                extendedSubmissionButNotTcLocales.isEmpty(),
+                () ->
+                        "Locales in SubmissionLocales.ADDITIONAL_EXTENDED_SUBMISSION that should be removed as they are not TC locales: "
+                                + String.join(
+                                        " ",
+                                        extendedSubmissionButNotTcLocales.stream()
+                                                .map(l -> l.getBaseName())
+                                                .collect(Collectors.toList())));
+    }
 }
diff --git a/tools/st-prom-exporter/package-lock.json b/tools/st-prom-exporter/package-lock.json
index d7dc8cc429e..890a9de8149 100644
--- a/tools/st-prom-exporter/package-lock.json
+++ b/tools/st-prom-exporter/package-lock.json
@@ -34,12 +34,12 @@
       "integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ="
     },
     "body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
       "requires": {
         "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
@@ -47,7 +47,7 @@
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
         "qs": "6.11.0",
-        "raw-body": "2.5.1",
+        "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
       }
@@ -63,12 +63,15 @@
       "integrity": "sha512-OuwahLpcvvYfFnxZL0E/Gx6D7U2A72JM8cXL+5uiiZP/x84B/arG5kL8QfRLCLKb/Ttp1Jk2bPDLeltP96dtbw=="
     },
     "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
       }
     },
     "caseless": {
@@ -85,14 +88,14 @@
       }
     },
     "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
     },
     "cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw=="
     },
     "cookie-signature": {
       "version": "1.0.6",
@@ -107,6 +110,16 @@
         "ms": "2.0.0"
       }
     },
+    "define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "requires": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      }
+    },
     "depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -127,6 +140,19 @@
       "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
     },
+    "es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "requires": {
+        "get-intrinsic": "^1.2.4"
+      }
+    },
+    "es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
+    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -138,16 +164,16 @@
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
     "express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
       "requires": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
+        "body-parser": "1.20.2",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -200,33 +226,56 @@
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
     },
     "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
     },
     "get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
       }
     },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "requires": {
-        "function-bind": "^1.1.1"
+        "get-intrinsic": "^1.1.3"
       }
     },
+    "has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "requires": {
+        "es-define-property": "^1.0.0"
+      }
+    },
+    "has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q=="
+    },
     "has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
     },
+    "hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "requires": {
+        "function-bind": "^1.1.2"
+      }
+    },
     "http-errors": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
@@ -306,9 +355,9 @@
       "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
     },
     "object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
     },
     "on-finished": {
       "version": "2.4.1",
@@ -359,9 +408,9 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
     },
     "raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
       "requires": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
@@ -417,19 +466,33 @@
         "send": "0.18.0"
       }
     },
+    "set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "requires": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      }
+    },
     "setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
     },
     "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
       "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
       }
     },
     "statuses": {
diff --git a/tools/st-prom-exporter/package.json b/tools/st-prom-exporter/package.json
index 4e95cf2040c..d4d12a8286f 100644
--- a/tools/st-prom-exporter/package.json
+++ b/tools/st-prom-exporter/package.json
@@ -12,7 +12,7 @@
   "license": "Unicode-3.0",
   "dependencies": {
     "bent": "^7.3.10",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
     "prom-client": "^12.0.0"
   },
   "repository": {