diff --git a/bower.json b/bower.json
index 441756d..927761c 100755
--- a/bower.json
+++ b/bower.json
@@ -1,9 +1,9 @@
 {
   "name": "cldr-rbnf",
-  "version": "35.1.0",
+  "version": "36.0.0",
   "main": "rbnf/*.json",
   "ignore": [
     ".gitattributes",
     "README.md"
   ]
-}
+}
diff --git a/package.json b/package.json
index fa65787..6048b68 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cldr-rbnf",
-  "version": "35.1.0",
+  "version": "36.0.0",
   "homepage": "http://cldr.unicode.org",
   "author": "The Unicode Consortium",
   "maintainers": [
@@ -20,5 +20,5 @@
       "url": "http://www.unicode.org/copyright.html"
     }
   ],
-  "bugs": "http://unicode.org/cldr/trac/newticket"
-}
+  "bugs": "https://unicode-org.atlassian.net/projects/CLDR/issues"
+}
diff --git a/rbnf/af.json b/rbnf/af.json
index 82fa8f1..e586492 100755
--- a/rbnf/af.json
+++ b/rbnf/af.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "af"
     },
@@ -104,4 +103,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/ak.json b/rbnf/ak.json
index e10e85c..aa41232 100755
--- a/rbnf/ak.json
+++ b/rbnf/ak.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 13680 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "ak"
     },
@@ -69,4 +68,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/am.json b/rbnf/am.json
index 268cb41..01f92cd 100755
--- a/rbnf/am.json
+++ b/rbnf/am.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "am"
     },
@@ -59,4 +58,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/ar.json b/rbnf/ar.json
index b396526..f3268d3 100755
--- a/rbnf/ar.json
+++ b/rbnf/ar.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 14199 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "ar"
     },
@@ -298,4 +297,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/az.json b/rbnf/az.json
index e598e29..b935ef7 100755
--- a/rbnf/az.json
+++ b/rbnf/az.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "az"
     },
@@ -108,4 +107,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/be.json b/rbnf/be.json
index dbf1b38..461a6c3 100755
--- a/rbnf/be.json
+++ b/rbnf/be.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "be"
     },
@@ -407,4 +406,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/bg.json b/rbnf/bg.json
index 26623b3..a661f53 100755
--- a/rbnf/bg.json
+++ b/rbnf/bg.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "bg"
     },
@@ -107,4 +106,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/bs.json b/rbnf/bs.json
index 62c2faa..eade4e6 100755
--- a/rbnf/bs.json
+++ b/rbnf/bs.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "bs"
     },
@@ -128,4 +127,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/ca.json b/rbnf/ca.json
index b02a246..6fde3e7 100755
--- a/rbnf/ca.json
+++ b/rbnf/ca.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "ca"
     },
@@ -277,4 +276,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/ccp.json b/rbnf/ccp.json
index efe103b..14d8266 100755
--- a/rbnf/ccp.json
+++ b/rbnf/ccp.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 13868 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "ccp"
     },
@@ -62,4 +61,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/chr.json b/rbnf/chr.json
index 6b4ead0..0013f28 100755
--- a/rbnf/chr.json
+++ b/rbnf/chr.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 13680 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "chr"
     },
@@ -64,4 +63,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/cs.json b/rbnf/cs.json
index 8767bf0..1c1046b 100755
--- a/rbnf/cs.json
+++ b/rbnf/cs.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "cs"
     },
@@ -137,4 +136,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/cy.json b/rbnf/cy.json
index bb37616..4e4c2d7 100755
--- a/rbnf/cy.json
+++ b/rbnf/cy.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "cy"
     },
@@ -115,4 +114,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/da.json b/rbnf/da.json
index d0ef0c0..0cc6bed 100755
--- a/rbnf/da.json
+++ b/rbnf/da.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "da"
     },
@@ -17,7 +16,7 @@
           "10000": "=%spellout-numbering=;"
         },
         "%spellout-numbering": {
-          "0": "=%spellout-cardinal-common=;"
+          "0": "=%spellout-cardinal-neuter=;"
         },
         "%spellout-cardinal-common": {
           "-x": "minus >>;",
@@ -189,4 +188,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/de-CH.json b/rbnf/de-CH.json
index 26705f8..9626d30 100755
--- a/rbnf/de-CH.json
+++ b/rbnf/de-CH.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 14450 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "de",
       "territory": "CH"
@@ -202,4 +201,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/de.json b/rbnf/de.json
index 7e98c77..50f643a 100755
--- a/rbnf/de.json
+++ b/rbnf/de.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "de"
     },
@@ -201,4 +200,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/ee.json b/rbnf/ee.json
index a733512..4217f40 100755
--- a/rbnf/ee.json
+++ b/rbnf/ee.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "ee"
     },
@@ -101,4 +100,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/el.json b/rbnf/el.json
index 1def080..050f368 100755
--- a/rbnf/el.json
+++ b/rbnf/el.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "el"
     },
@@ -309,4 +308,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/en-IN.json b/rbnf/en-IN.json
index f6de93f..af95ed4 100755
--- a/rbnf/en-IN.json
+++ b/rbnf/en-IN.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 13513 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "en",
       "territory": "IN"
@@ -201,4 +200,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/en.json b/rbnf/en.json
index f4a89eb..a92f23a 100755
--- a/rbnf/en.json
+++ b/rbnf/en.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12155 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "en"
     },
@@ -201,4 +200,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/eo.json b/rbnf/eo.json
index 5f2adc0..d9e0a6a 100755
--- a/rbnf/eo.json
+++ b/rbnf/eo.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "eo"
     },
@@ -51,4 +50,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/es-419.json b/rbnf/es-419.json
index 23d9382..d2eb8d8 100755
--- a/rbnf/es-419.json
+++ b/rbnf/es-419.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12154 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "es",
       "territory": "419"
@@ -37,4 +36,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/es.json b/rbnf/es.json
index a4dc1e9..a9c6750 100755
--- a/rbnf/es.json
+++ b/rbnf/es.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12733 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "es"
     },
@@ -310,4 +309,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/et.json b/rbnf/et.json
index a5ae0fc..6e4a44b 100755
--- a/rbnf/et.json
+++ b/rbnf/et.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "et"
     },
@@ -50,4 +49,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/fa-AF.json b/rbnf/fa-AF.json
index f2035e4..ae8de25 100755
--- a/rbnf/fa-AF.json
+++ b/rbnf/fa-AF.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "fa",
       "territory": "AF"
@@ -62,4 +61,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/fa.json b/rbnf/fa.json
index 05b4819..e4421c1 100755
--- a/rbnf/fa.json
+++ b/rbnf/fa.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "fa"
     },
@@ -65,4 +64,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/ff.json b/rbnf/ff.json
index f2b77a6..8a12666 100755
--- a/rbnf/ff.json
+++ b/rbnf/ff.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 13868 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "ff"
     },
@@ -97,4 +96,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/fi.json b/rbnf/fi.json
index 951bde8..3a63344 100755
--- a/rbnf/fi.json
+++ b/rbnf/fi.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 14551 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "fi"
     },
@@ -1343,4 +1342,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/fil.json b/rbnf/fil.json
index 1e1d7f2..3435da0 100755
--- a/rbnf/fil.json
+++ b/rbnf/fil.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "fil"
     },
@@ -69,4 +68,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/fo.json b/rbnf/fo.json
index 19ea568..0f0b88a 100755
--- a/rbnf/fo.json
+++ b/rbnf/fo.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "fo"
     },
@@ -123,4 +122,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/fr-BE.json b/rbnf/fr-BE.json
index 8b6cca3..1cd1a20 100755
--- a/rbnf/fr-BE.json
+++ b/rbnf/fr-BE.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "fr",
       "territory": "BE"
@@ -206,4 +205,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/fr-CH.json b/rbnf/fr-CH.json
index 58cf83e..004aff8 100755
--- a/rbnf/fr-CH.json
+++ b/rbnf/fr-CH.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "fr",
       "territory": "CH"
@@ -207,4 +206,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/fr.json b/rbnf/fr.json
index e077345..3156d20 100755
--- a/rbnf/fr.json
+++ b/rbnf/fr.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "fr"
     },
@@ -234,4 +233,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/ga.json b/rbnf/ga.json
index 62fc771..7e9553e 100755
--- a/rbnf/ga.json
+++ b/rbnf/ga.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "ga"
     },
@@ -236,4 +235,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/he.json b/rbnf/he.json
index 19280c4..710c203 100755
--- a/rbnf/he.json
+++ b/rbnf/he.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 13834 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "he"
     },
@@ -333,4 +332,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/hi.json b/rbnf/hi.json
index 8e81d08..00d7211 100755
--- a/rbnf/hi.json
+++ b/rbnf/hi.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 13336 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "hi"
     },
@@ -192,4 +191,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/hr.json b/rbnf/hr.json
index de32b34..e378c4f 100755
--- a/rbnf/hr.json
+++ b/rbnf/hr.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "hr"
     },
@@ -218,4 +217,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/hu.json b/rbnf/hu.json
index 6a666be..6c1f445 100755
--- a/rbnf/hu.json
+++ b/rbnf/hu.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 14198 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "hu"
     },
@@ -142,4 +141,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/hy.json b/rbnf/hy.json
index 0c57d2f..42e69b6 100755
--- a/rbnf/hy.json
+++ b/rbnf/hy.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "hy"
     },
@@ -49,4 +48,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/id.json b/rbnf/id.json
index 96c3cfb..fc8bed9 100755
--- a/rbnf/id.json
+++ b/rbnf/id.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 13238 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "id"
     },
@@ -57,4 +56,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/is.json b/rbnf/is.json
index 9d5995b..2af20dc 100755
--- a/rbnf/is.json
+++ b/rbnf/is.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "is"
     },
@@ -123,4 +122,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/it.json b/rbnf/it.json
index c6fdd7c..7f203ec 100755
--- a/rbnf/it.json
+++ b/rbnf/it.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "it"
     },
@@ -428,4 +427,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/ja.json b/rbnf/ja.json
index 66808c9..7808b9c 100755
--- a/rbnf/ja.json
+++ b/rbnf/ja.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 14872 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "ja"
     },
@@ -93,4 +92,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/ka.json b/rbnf/ka.json
index f88bf2f..93312f7 100755
--- a/rbnf/ka.json
+++ b/rbnf/ka.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "ka"
     },
@@ -75,4 +74,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/kl.json b/rbnf/kl.json
index 3ab2e59..2f8d245 100755
--- a/rbnf/kl.json
+++ b/rbnf/kl.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "kl"
     },
@@ -81,4 +80,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/km.json b/rbnf/km.json
index f1b1b28..6ee7640 100755
--- a/rbnf/km.json
+++ b/rbnf/km.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 11914 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "km"
     },
@@ -60,4 +59,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/ko.json b/rbnf/ko.json
index 6ba707e..e322cbc 100755
--- a/rbnf/ko.json
+++ b/rbnf/ko.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 13484 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "ko"
     },
@@ -273,4 +272,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/ky.json b/rbnf/ky.json
index 6ac9414..3f4aae9 100755
--- a/rbnf/ky.json
+++ b/rbnf/ky.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "ky"
     },
@@ -189,4 +188,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/lb.json b/rbnf/lb.json
index 08ee305..f3f04a2 100755
--- a/rbnf/lb.json
+++ b/rbnf/lb.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 13868 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "lb"
     },
@@ -222,4 +221,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/lo.json b/rbnf/lo.json
index df59948..8739b03 100755
--- a/rbnf/lo.json
+++ b/rbnf/lo.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "lo"
     },
@@ -56,4 +55,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/lrc.json b/rbnf/lrc.json
index df84131..1fb0c54 100755
--- a/rbnf/lrc.json
+++ b/rbnf/lrc.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 13680 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "lrc"
     },
@@ -65,4 +64,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/lt.json b/rbnf/lt.json
index 492266c..4e12135 100755
--- a/rbnf/lt.json
+++ b/rbnf/lt.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "lt"
     },
@@ -119,4 +118,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/lv.json b/rbnf/lv.json
index f57e5fa..da5d3b3 100755
--- a/rbnf/lv.json
+++ b/rbnf/lv.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "lv"
     },
@@ -93,4 +92,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/mk.json b/rbnf/mk.json
index f211684..235544b 100755
--- a/rbnf/mk.json
+++ b/rbnf/mk.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "mk"
     },
@@ -104,4 +103,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/ms.json b/rbnf/ms.json
index 3f3b141..3ccbcb2 100755
--- a/rbnf/ms.json
+++ b/rbnf/ms.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 14924 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "ms"
     },
@@ -62,4 +61,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/mt.json b/rbnf/mt.json
index 9fe8e56..3d52d20 100755
--- a/rbnf/mt.json
+++ b/rbnf/mt.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "mt"
     },
@@ -259,4 +258,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/my.json b/rbnf/my.json
index 583e095..fbeba85 100755
--- a/rbnf/my.json
+++ b/rbnf/my.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "my"
     },
@@ -62,4 +61,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/nb.json b/rbnf/nb.json
index b071db6..496d3f2 100755
--- a/rbnf/nb.json
+++ b/rbnf/nb.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "nb"
     },
@@ -342,4 +341,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/nl.json b/rbnf/nl.json
index 3320927..ae4063b 100755
--- a/rbnf/nl.json
+++ b/rbnf/nl.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "nl"
     },
@@ -121,4 +120,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/nn.json b/rbnf/nn.json
index fe26a11..03cd770 100755
--- a/rbnf/nn.json
+++ b/rbnf/nn.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "nn"
     },
@@ -78,4 +77,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/pl.json b/rbnf/pl.json
index 3c73965..f1c8cae 100755
--- a/rbnf/pl.json
+++ b/rbnf/pl.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "pl"
     },
@@ -433,4 +432,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/pt-PT.json b/rbnf/pt-PT.json
index 4a8d4d0..1523a34 100755
--- a/rbnf/pt-PT.json
+++ b/rbnf/pt-PT.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "pt",
       "territory": "PT"
@@ -199,4 +198,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/pt.json b/rbnf/pt.json
index 725e79d..5b8e2cd 100755
--- a/rbnf/pt.json
+++ b/rbnf/pt.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "pt"
     },
@@ -211,4 +210,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/qu.json b/rbnf/qu.json
index 2d7244c..83a57a2 100755
--- a/rbnf/qu.json
+++ b/rbnf/qu.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 13868 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "qu"
     },
@@ -54,4 +53,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/ro.json b/rbnf/ro.json
index 2739778..e287ac2 100755
--- a/rbnf/ro.json
+++ b/rbnf/ro.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "ro"
     },
@@ -100,4 +99,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/root.json b/rbnf/root.json
index 396ccfb..3118ffa 100755
--- a/rbnf/root.json
+++ b/rbnf/root.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "root"
     },
@@ -698,4 +697,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/ru.json b/rbnf/ru.json
index 1e392fd..eec6845 100755
--- a/rbnf/ru.json
+++ b/rbnf/ru.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "ru"
     },
@@ -1458,4 +1457,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/se.json b/rbnf/se.json
index f4b3343..d2506a2 100755
--- a/rbnf/se.json
+++ b/rbnf/se.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "se"
     },
@@ -46,4 +45,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/sk.json b/rbnf/sk.json
index 2799733..8b2cf5f 100755
--- a/rbnf/sk.json
+++ b/rbnf/sk.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 13498 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "sk"
     },
@@ -92,4 +91,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/sl.json b/rbnf/sl.json
index 3328930..c2410fd 100755
--- a/rbnf/sl.json
+++ b/rbnf/sl.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "sl"
     },
@@ -140,4 +139,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/sq.json b/rbnf/sq.json
index 0a0eda6..cfcf898 100755
--- a/rbnf/sq.json
+++ b/rbnf/sq.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "sq"
     },
@@ -74,4 +73,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/sr-Latn.json b/rbnf/sr-Latn.json
index ee96177..7ff4e51 100755
--- a/rbnf/sr-Latn.json
+++ b/rbnf/sr-Latn.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 14450 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "sr",
       "script": "Latn"
@@ -161,4 +160,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/sr.json b/rbnf/sr.json
index fdc4745..62ce717 100755
--- a/rbnf/sr.json
+++ b/rbnf/sr.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "sr"
     },
@@ -160,4 +159,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/sv.json b/rbnf/sv.json
index 8d53c57..90a9036 100755
--- a/rbnf/sv.json
+++ b/rbnf/sv.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 13481 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "sv"
     },
@@ -253,4 +252,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/sw.json b/rbnf/sw.json
index 68269a2..5149037 100755
--- a/rbnf/sw.json
+++ b/rbnf/sw.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 13868 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "sw"
     },
@@ -59,4 +58,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/ta.json b/rbnf/ta.json
index 10f477c..d91b5a6 100755
--- a/rbnf/ta.json
+++ b/rbnf/ta.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "ta"
     },
@@ -96,4 +95,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/th.json b/rbnf/th.json
index 4afd3aa..c5e2414 100755
--- a/rbnf/th.json
+++ b/rbnf/th.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "th"
     },
@@ -56,4 +55,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/tr.json b/rbnf/tr.json
index e69f9ab..ad040be 100755
--- a/rbnf/tr.json
+++ b/rbnf/tr.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "tr"
     },
@@ -103,4 +102,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/uk.json b/rbnf/uk.json
index 419895f..acb6f49 100755
--- a/rbnf/uk.json
+++ b/rbnf/uk.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 13062 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "uk"
     },
@@ -128,4 +127,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/vi.json b/rbnf/vi.json
index aae3c7e..5769342 100755
--- a/rbnf/vi.json
+++ b/rbnf/vi.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12723 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "vi"
     },
@@ -75,4 +74,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/yue-Hans.json b/rbnf/yue-Hans.json
index d22262c..a8bbde0 100755
--- a/rbnf/yue-Hans.json
+++ b/rbnf/yue-Hans.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 14877 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "yue",
       "script": "Hans"
@@ -182,23 +181,7 @@
           "2": "两;"
         },
         "%spellout-cardinal-alternate2": {
-          "3": "三;",
-          "4": "四;",
-          "5": "五;",
-          "6": "六;",
-          "7": "七;",
-          "8": "八;",
-          "9": "九;",
-          "10": "<%%cardinal-twenties<十[>%spellout-numbering>];",
-          "21": "廿[>%spellout-numbering>];",
-          "30": "<%spellout-numbering<十[>>];",
-          "100": "<%spellout-numbering<百[>%%number2>];",
-          "1000": "<%spellout-numbering<千[>%%number3>];",
-          "10000": "<%spellout-numbering<万[>%%number4>];",
-          "100000000": "<%spellout-numbering<亿[>%%number5>];",
-          "1000000000000": "<%spellout-numbering<兆[>%%number8>];",
-          "10000000000000000": "<%spellout-numbering<京[>%%number13>];",
-          "1000000000000000000": "=#,##0=;"
+          "3": "=%spellout-cardinal=;"
         },
         "%%cardinal-twenties": {
           "1": ";",
@@ -211,4 +194,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/yue.json b/rbnf/yue.json
index b2f85ce..7e959ae 100755
--- a/rbnf/yue.json
+++ b/rbnf/yue.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 14624 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "yue"
     },
@@ -181,23 +180,7 @@
           "2": "兩;"
         },
         "%spellout-cardinal-alternate2": {
-          "3": "三;",
-          "4": "四;",
-          "5": "五;",
-          "6": "六;",
-          "7": "七;",
-          "8": "八;",
-          "9": "九;",
-          "10": "<%%cardinal-twenties<十[>%spellout-numbering>];",
-          "21": "廿[>%spellout-numbering>];",
-          "30": "<%spellout-numbering<十[>>];",
-          "100": "<%spellout-numbering<百[>%%number2>];",
-          "1000": "<%spellout-numbering<千[>%%number3>];",
-          "10000": "<%spellout-numbering<萬[>%%number4>];",
-          "100000000": "<%spellout-numbering<億[>%%number5>];",
-          "1000000000000": "<%spellout-numbering<兆[>%%number8>];",
-          "10000000000000000": "<%spellout-numbering<京[>%%number13>];",
-          "1000000000000000000": "=#,##0=;"
+          "3": "=%spellout-cardinal=;"
         },
         "%%cardinal-twenties": {
           "1": ";",
@@ -210,4 +193,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/zh-Hant.json b/rbnf/zh-Hant.json
index 61c5a7c..0d281fd 100755
--- a/rbnf/zh-Hant.json
+++ b/rbnf/zh-Hant.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "zh",
       "script": "Hant"
@@ -257,4 +256,4 @@
       }
     }
   }
-}
+}
diff --git a/rbnf/zh.json b/rbnf/zh.json
index 2e5f0b3..9bdf328 100755
--- a/rbnf/zh.json
+++ b/rbnf/zh.json
@@ -2,8 +2,7 @@
   "rbnf": {
     "identity": {
       "version": {
-        "number": "$Revision: 12722 $",
-        "cldrVersion": "35.1"
+        "cldrVersion": "36"
       },
       "language": "zh"
     },
@@ -293,4 +292,4 @@
       }
     }
   }
-}
+}