diff --git a/bower.json b/bower.json
index f3c1eec..443d83f 100755
--- a/bower.json
+++ b/bower.json
@@ -1,8 +1,8 @@
 {
   "name": "cldr-segments-modern",
-  "version": "36.0.0",
+  "version": "37.0.0",
   "dependencies": {
-    "cldr-core": "36.0.0"
+    "cldr-core": "37.0.0"
   },
   "main": "segments/**/*.json",
   "ignore": [
diff --git a/package.json b/package.json
index e7fe423..54331f3 100755
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "cldr-segments-modern",
-  "version": "36.0.0",
+  "version": "37.0.0",
   "peerDependencies": {
-    "cldr-core": "36.0.0"
+    "cldr-core": "37.0.0"
   },
   "homepage": "http://cldr.unicode.org",
   "author": "The Unicode Consortium",
diff --git a/segments/de/suppressions.json b/segments/de/suppressions.json
index 1684fcb..e289df2 100755
--- a/segments/de/suppressions.json
+++ b/segments/de/suppressions.json
@@ -2,7 +2,7 @@
   "segments": {
     "identity": {
       "version": {
-        "_cldrVersion": "36"
+        "_cldrVersion": "37"
       },
       "language": "de"
     },
diff --git a/segments/el/suppressions.json b/segments/el/suppressions.json
index 1b3cd83..cc37841 100755
--- a/segments/el/suppressions.json
+++ b/segments/el/suppressions.json
@@ -2,7 +2,7 @@
   "segments": {
     "identity": {
       "version": {
-        "_cldrVersion": "36"
+        "_cldrVersion": "37"
       },
       "language": "el"
     },
diff --git a/segments/en-US-POSIX/suppressions.json b/segments/en-US-POSIX/suppressions.json
index 70ec695..9dcc0e2 100755
--- a/segments/en-US-POSIX/suppressions.json
+++ b/segments/en-US-POSIX/suppressions.json
@@ -2,7 +2,7 @@
   "segments": {
     "identity": {
       "version": {
-        "_cldrVersion": "36"
+        "_cldrVersion": "37"
       },
       "language": "en",
       "territory": "US",
diff --git a/segments/en/suppressions.json b/segments/en/suppressions.json
index 06acf6e..5949304 100755
--- a/segments/en/suppressions.json
+++ b/segments/en/suppressions.json
@@ -2,7 +2,7 @@
   "segments": {
     "identity": {
       "version": {
-        "_cldrVersion": "36"
+        "_cldrVersion": "37"
       },
       "language": "en"
     },
diff --git a/segments/es/suppressions.json b/segments/es/suppressions.json
index 8131949..5cdf164 100755
--- a/segments/es/suppressions.json
+++ b/segments/es/suppressions.json
@@ -2,7 +2,7 @@
   "segments": {
     "identity": {
       "version": {
-        "_cldrVersion": "36"
+        "_cldrVersion": "37"
       },
       "language": "es"
     },
diff --git a/segments/fr/suppressions.json b/segments/fr/suppressions.json
index adc0b03..356de59 100755
--- a/segments/fr/suppressions.json
+++ b/segments/fr/suppressions.json
@@ -2,7 +2,7 @@
   "segments": {
     "identity": {
       "version": {
-        "_cldrVersion": "36"
+        "_cldrVersion": "37"
       },
       "language": "fr"
     },
diff --git a/segments/it/suppressions.json b/segments/it/suppressions.json
index 7f80528..4d78025 100755
--- a/segments/it/suppressions.json
+++ b/segments/it/suppressions.json
@@ -2,7 +2,7 @@
   "segments": {
     "identity": {
       "version": {
-        "_cldrVersion": "36"
+        "_cldrVersion": "37"
       },
       "language": "it"
     },
diff --git a/segments/ja/suppressions.json b/segments/ja/suppressions.json
index 26be445..7c9dc21 100755
--- a/segments/ja/suppressions.json
+++ b/segments/ja/suppressions.json
@@ -2,7 +2,7 @@
   "segments": {
     "identity": {
       "version": {
-        "_cldrVersion": "36"
+        "_cldrVersion": "37"
       },
       "language": "ja"
     },
diff --git a/segments/pt/suppressions.json b/segments/pt/suppressions.json
index aa1e7e5..f453d61 100755
--- a/segments/pt/suppressions.json
+++ b/segments/pt/suppressions.json
@@ -2,7 +2,7 @@
   "segments": {
     "identity": {
       "version": {
-        "_cldrVersion": "36"
+        "_cldrVersion": "37"
       },
       "language": "pt"
     },
diff --git a/segments/root/suppressions.json b/segments/root/suppressions.json
index 5a4e2e3..559a73d 100755
--- a/segments/root/suppressions.json
+++ b/segments/root/suppressions.json
@@ -2,7 +2,7 @@
   "segments": {
     "identity": {
       "version": {
-        "_cldrVersion": "36"
+        "_cldrVersion": "37"
       },
       "language": "root"
     },
@@ -106,6 +106,9 @@
           {
             "$CP": "\\\\p{Line_Break=CP}"
           },
+          {
+            "$CP30": "[$CP - [\\\\p{ea=F}\\\\p{ea=W}\\\\p{ea=H}]]"
+          },
           {
             "$CM1": "\\\\p{Line_Break=Combining_Mark}"
           },
@@ -163,6 +166,9 @@
           {
             "$OP": "\\\\p{Line_Break=Open_Punctuation}"
           },
+          {
+            "$OP30": "[$OP - [\\\\p{ea=F}\\\\p{ea=W}\\\\p{ea=H}]]"
+          },
           {
             "$PO": "\\\\p{Line_Break=Postfix_Numeric}"
           },
@@ -265,6 +271,9 @@
           {
             "$CP": "($CP $X)"
           },
+          {
+            "$CP30": "($CP30 $X)"
+          },
           {
             "$CM": "($CM $X)"
           },
@@ -313,6 +322,9 @@
           {
             "$OP": "($OP $X)"
           },
+          {
+            "$OP30": "($OP30 $X)"
+          },
           {
             "$PO": "($PO $X)"
           },
@@ -391,11 +403,7 @@
           "21.04": " $BB × ",
           "21.1": " $HL ($HY | $BA) × ",
           "21.2": " $SY × $HL ",
-          "22.01": " ($AL | $HL) × $IN ",
-          "22.02": " $EX × $IN ",
-          "22.03": " ($ID | $EB | $EM) × $IN ",
-          "22.04": " $IN × $IN ",
-          "22.05": " $NU × $IN ",
+          "22.01": " × $IN ",
           "23.02": " ($AL | $HL) × $NU ",
           "23.03": " $NU × ($AL | $HL) ",
           "23.12": " $PR × ($ID | $EB | $EM) ",
@@ -415,8 +423,8 @@
           "27.03": " $PR × $JL | $JV | $JT | $H2 | $H3 ",
           "28": " ($AL | $HL) × ($AL | $HL) ",
           "29": " $IS × ($AL | $HL) ",
-          "30.01": " ($AL | $HL | $NU) × $OP ",
-          "30.02": " $CP × ($AL | $HL | $NU) ",
+          "30.01": " ($AL | $HL | $NU) × $OP30 ",
+          "30.02": " $CP30 × ($AL | $HL | $NU) ",
           "30.11": " ^ ($RI $RI)* $RI × $RI ",
           "30.12": " [^$RI] ($RI $RI)* $RI × $RI ",
           "30.13": " $RI ÷ $RI ",
diff --git a/segments/ru/suppressions.json b/segments/ru/suppressions.json
index 9088042..ca67418 100755
--- a/segments/ru/suppressions.json
+++ b/segments/ru/suppressions.json
@@ -2,7 +2,7 @@
   "segments": {
     "identity": {
       "version": {
-        "_cldrVersion": "36"
+        "_cldrVersion": "37"
       },
       "language": "ru"
     },
diff --git a/segments/zh-Hant/suppressions.json b/segments/zh-Hant/suppressions.json
index 1503fba..5c0a19e 100755
--- a/segments/zh-Hant/suppressions.json
+++ b/segments/zh-Hant/suppressions.json
@@ -2,7 +2,7 @@
   "segments": {
     "identity": {
       "version": {
-        "_cldrVersion": "36"
+        "_cldrVersion": "37"
       },
       "language": "zh",
       "script": "Hant"
diff --git a/segments/zh/suppressions.json b/segments/zh/suppressions.json
index 2fbcbf1..c877a0c 100755
--- a/segments/zh/suppressions.json
+++ b/segments/zh/suppressions.json
@@ -2,7 +2,7 @@
   "segments": {
     "identity": {
       "version": {
-        "_cldrVersion": "36"
+        "_cldrVersion": "37"
       },
       "language": "zh"
     },