diff --git a/common/properties/scriptMetadata.txt b/common/properties/scriptMetadata.txt
index a432e69a0fe..0ac8ab4bc79 100644
--- a/common/properties/scriptMetadata.txt
+++ b/common/properties/scriptMetadata.txt
@@ -84,7 +84,7 @@ Gujr; 20; 0A95; IN; 1; RECOMMENDED; NO; NO; YES; NO; NO
 Beng; 21; 0995; BD; 1; RECOMMENDED; NO; NO; YES; NO; NO
 Guru; 22; 0A15; IN; 1; RECOMMENDED; NO; NO; YES; NO; NO
 Laoo; 23; 0EA5; LA; 1; RECOMMENDED; NO; YES; YES; NO; NO
-Zinh; 24; 0308; ZZ; -1; RECOMMENDED; UNKNOWN; UNKNOWN; MIN; UNKNOWN; UNKNOWN
+Zinh; 24; 030F; ZZ; -1; RECOMMENDED; UNKNOWN; UNKNOWN; MIN; UNKNOWN; UNKNOWN
 Khmr; 25; 1780; KH; 1; RECOMMENDED; NO; YES; YES; NO; NO
 Tibt; 26; 0F40; CN; 1; RECOMMENDED; NO; NO; YES; NO; NO
 Sinh; 27; 0D85; LK; 1; RECOMMENDED; NO; NO; YES; NO; NO
diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/Script_Metadata.csv b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/Script_Metadata.csv
index 6d4ec6d5087..bdf7170097b 100644
--- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/Script_Metadata.csv
+++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/Script_Metadata.csv
@@ -23,7 +23,7 @@ WR,Name,Script_Code,Age,Size,Sample,Sample_Code,Origin Country,~Density,Likely L
 21,Bengali,Beng,1.1,93,ক,995,Bangladesh,1,Bengali,bn,Recommended,no,no,Yes,no,no
 22,Gurmukhi,Guru,1.1,79,ਕ,A15,India,1,Punjabi,pa,Recommended,no,no,Yes,no,no
 23,Lao,Laoo,1.1,67,ລ,EA5,Laos,1,Lao,lo,Recommended,no,Yes,Yes,no,no
-24,Inherited,Zinh,1.1,562,̈,308,n/a,n/a,n/a,n/a,Recommended,n/a,n/a,min,n/a,n/a
+24,Inherited,Zinh,1.1,562,̏,30F,n/a,n/a,n/a,n/a,Recommended,n/a,n/a,min,n/a,n/a
 25,Khmer,Khmr,3.0,146,ក,1780,Cambodia,1,Khmer,km,Recommended,no,Yes,Yes,no,no
 26,Tibetan,Tibt,2.0,207,ཀ,F40,China,1,Tibetan,bo,Recommended,no,no,Yes,no,no
 27,Sinhala,Sinh,3.0,110,අ,D85,Sri Lanka,1,Sinhala,si,Recommended,no,no,Yes,no,no
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java
index a858b95265c..a239a63f518 100644
--- a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java
+++ b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java
@@ -827,7 +827,7 @@ public void TestDateFormatsWithContext() {
                         exampleGenerator.getExampleHtml(
                                 "//ldml/dates/calendars/calendar[@type=\"gregorian\"]/dateFormats/dateFormatLength[@type=\"short\"]/dateFormat[@type=\"standard\"]/pattern[@type=\"standard\"]",
                                 "d‏/M‏/y"));
-        assertEquals("Currency format example faulty", "【٥‏/٩‏/١٩٩٩〗【⃪٥‏/٩‏/١٩٩٩〗", actual);
+        assertEquals("Currency format example faulty", "【5‏/9‏/1999〗【⃪5‏/9‏/1999〗", actual);
     }
 
     public void TestDateTimeComboFormats() {
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestScriptMetadata.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestScriptMetadata.java
index cadc387d0d0..1b5a535e4b5 100644
--- a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestScriptMetadata.java
+++ b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestScriptMetadata.java
@@ -3,6 +3,7 @@
 import com.google.common.base.Joiner;
 import com.ibm.icu.impl.Relation;
 import com.ibm.icu.impl.Row;
+import com.ibm.icu.impl.Utility;
 import com.ibm.icu.lang.UCharacter;
 import com.ibm.icu.lang.UProperty;
 import com.ibm.icu.lang.UScript;
@@ -56,6 +57,8 @@ public void TestScriptOfSample() {
                         UScript.getScriptExtensions(info0.sampleChar.codePointAt(0), bitset);
                 assertTrue(
                         script
+                                + ", "
+                                + Utility.hex(info0.sampleChar)
                                 + ": The sample character must have a "
                                 + "single, valid script, no ScriptExtensions: "
                                 + scriptCode,
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestTransforms.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestTransforms.java
index af7bb955972..bdad4277e1c 100644
--- a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestTransforms.java
+++ b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestTransforms.java
@@ -926,6 +926,14 @@ public void TestLocales() {
                             + allMissing.dataSet.keySet().toPattern(false)
                             + "="
                             + allMissing.dataSet.keySet());
+            // Suppress Common/Inherited characters that are given scx properties
+            UnicodeSet suppressHack =
+                    new UnicodeSet(
+                                    "[\u0301\u0300\u0306\u0302\u030C\u030A\u0308\u0303\u0307\u0304\u0309\u0310\u0323-\u0325\u0330\u0331 \u00B7 \u02BC]")
+                            .freeze();
+            for (String s : suppressHack) {
+                allMissing.scriptMissing.remove(s);
+            }
             for (String script : allMissing.scriptMissing.values()) {
                 UnicodeSet missingFoScript = allMissing.scriptMissing.getKeys(script);
                 String localeForScript =