Metadata updates for release 8.13.39 (#3531)

2 years ago · 86967e9e36
--- a/cpp/src/phonenumbers/lite_metadata.cc
+++ b/cpp/src/phonenumbers/lite_metadata.cc
--- a/cpp/src/phonenumbers/metadata.cc
+++ b/cpp/src/phonenumbers/metadata.cc
--- a/cpp/src/phonenumbers/short_metadata.cc
+++ b/cpp/src/phonenumbers/short_metadata.cc
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1305_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1305_en
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_FR
--- a/javascript/i18n/phonenumbers/demo-compiled.js
+++ b/javascript/i18n/phonenumbers/demo-compiled.js
@ -269,7 +269,7 @@ CZ:[,[,,"(?:[2-578]\\d|60)\\d{7}|9\\d{8,11}",,,,,,,[9,10,11,12]],[,,"(?:2\\d|3[1
 "1(?:1|5(?:4[018]|5[017])|77|88|9[69])|2(?:2(?:[127]|3[014-9])|3[0-269]|4[59]|5(?:[1-3]|5[0-69]|9[19])|62|7(?:[1-35]|8[0189])|8(?:[16]|3[0134]|9[0-5])|9(?:[028]|17))|4(?:2(?:[13-79]|8[014-6])|3[0-57]|[45]|6[248]|7[2-47]|8[1-9]|9[29])|5(?:2|3(?:[045]|9[0-8])|4[0-369]|5[29]|8[02389]|9[0-3])|7(?:2[02-46-9]|34|[58]|6[0249]|7[57]|9(?:[23]|4[0-59]|5[01569]|6[0167]))|8(?:2(?:[1258]|4[0-39]|9[0-2469])|3(?:[29]|60)|49|51|6(?:[0-24]|36|5[0-3589]|7[23]|9[01459])|7[0-468]|8[68])|9(?:[23][1-9]|4[15]|5[138]|6[1-3]|7[156]|8[189]|9(?:[1289]|3[34]|4[0178]))|(?:264|837)[016-9]|2(?:57|93)[015-9]|(?:25[0468]|422|838)[01]|(?:47[59]|59[89]|8(?:6[68]|9))[019]",
 "1(?:1|5(?:4[018]|5[017])|77|88|9[69])|2(?:2[127]|3[0-269]|4[59]|5(?:[1-3]|5[0-69]|9(?:17|99))|6(?:2|4[016-9])|7(?:[1-35]|8[0189])|8(?:[16]|3[0134]|9[0-5])|9(?:[028]|17))|4(?:2(?:[13-79]|8[014-6])|3[0-57]|[45]|6[248]|7[2-47]|9[29])|5(?:2|3(?:[045]|9(?:[0-58]|6[4-9]|7[0-35689]))|4[0-369]|5[29]|8[02389]|9[0-3])|7(?:2[02-46-9]|34|[58]|6[0249]|7[57]|9(?:[23]|4[0-59]|5[01569]|6[0167]))|8(?:2(?:[1258]|4[0-39]|9[0169])|3(?:[29]|60|7(?:[017-9]|6[6-8]))|49|51|6(?:[0-24]|36[2-57-9]|5(?:[0-389]|5[23])|6(?:[01]|9[178])|7(?:2[2-468]|3[78])|9[0145])|7[0-468]|8[68])|9(?:4[15]|5[138]|7[156]|8[189]|9(?:[1289]|3(?:31|4[357])|4[0178]))|(?:8294|96)[1-3]|2(?:57|93)[015-9]|(?:223|8699)[014-9]|(?:25[0468]|422|838)[01]|(?:48|8292|9[23])[1-9]|(?:47[59]|59[89]|8(?:68|9))[019]"],
 "0$1"],[,"(\\d{3})(\\d{2})(\\d{4})","$1-$2-$3",["[14]|[289][2-9]|5[3-9]|7[2-4679]"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["800"],"0$1"],[,"(\\d{2})(\\d{4})(\\d{4})","$1-$2-$3",["[257-9]"],"0$1"]],[,,"20\\d{8}",,,,"2012345678",,,[10]],,,[,,"00(?:777(?:[01]|(?:5|8\\d)\\d)|882[1245]\\d\\d)\\d\\d|00(?:37|66|78)\\d{6,13}"],[,,"570\\d{6}",,,,"570123456",,,[9]],,,[,,,,,,,,,[-1]]],KE:[,[,,"(?:[17]\\d\\d|900)\\d{6}|(?:2|80)0\\d{6,7}|[4-6]\\d{6,8}",,,,,,,[7,8,9,10]],[,,"(?:4[245]|5[1-79]|6[01457-9])\\d{5,7}|(?:4[136]|5[08]|62)\\d{7}|(?:[24]0|66)\\d{6,7}",
 ,,,"202012345",,,[7,8,9]],[,,"(?:1(?:0[0-8]|1[0-5]|2[014]|30)|7\\d\\d)\\d{6}",,,,"712123456",,,[9]],[,,"800[02-8]\\d{5,6}",,,,"800223456",,,[9,10]],[,,"900[02-9]\\d{5}",,,,"900223456",,,[9]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"KE",254,"000","0",,,"0",,,,[[,"(\\d{2})(\\d{5,7})","$1 $2",["[24-6]"],"0$1"],[,"(\\d{3})(\\d{6})","$1 $2",["[17]"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["[89]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],KG:[,[,,"8\\d{9}|[235-9]\\d{8}",
 ,,,"202012345",,,[7,8,9]],[,,"(?:1(?:0[0-8]|1[0-7]|2[014]|30)|7\\d\\d)\\d{6}",,,,"712123456",,,[9]],[,,"800[02-8]\\d{5,6}",,,,"800223456",,,[9,10]],[,,"900[02-9]\\d{5}",,,,"900223456",,,[9]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"KE",254,"000","0",,,"0",,,,[[,"(\\d{2})(\\d{5,7})","$1 $2",["[24-6]"],"0$1"],[,"(\\d{3})(\\d{6})","$1 $2",["[17]"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["[89]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],KG:[,[,,"8\\d{9}|[235-9]\\d{8}",
 ,,,,,,[9,10],[5,6]],[,,"312(?:5[0-79]\\d|9(?:[0-689]\\d|7[0-24-9]))\\d{3}|(?:3(?:1(?:2[0-46-8]|3[1-9]|47|[56]\\d)|2(?:22|3[0-479]|6[0-7])|4(?:22|5[6-9]|6\\d)|5(?:22|3[4-7]|59|6\\d)|6(?:22|5[35-7]|6\\d)|7(?:22|3[468]|4[1-9]|59|[67]\\d)|9(?:22|4[1-8]|6\\d))|6(?:09|12|2[2-4])\\d)\\d{5}",,,,"312123456",,,[9],[5,6]],[,,"312(?:58\\d|973)\\d{3}|(?:2(?:0[0-35]|2\\d)|5[0-24-7]\\d|600|7(?:[07]\\d|55)|88[08]|9(?:12|9[05-9]))\\d{6}",,,,"700123456",,,[9]],[,,"800\\d{6,7}",,,,"800123456"],[,,,,,,,,,[-1]],[,,,,
 ,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"KG",996,"00","0",,,"0",,,,[[,"(\\d{4})(\\d{5})","$1 $2",["3(?:1[346]|[24-79])"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[235-79]|88"],"0$1"],[,"(\\d{3})(\\d{3})(\\d)(\\d{2,3})","$1 $2 $3 $4",["8"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],KH:[,[,,"1\\d{9}|[1-9]\\d{7,8}",,,,,,,[8,9,10],[6,7]],[,,"23(?:4(?:[2-4]|[56]\\d)|[568]\\d\\d)\\d{4}|23[236-9]\\d{5}|(?:2[4-6]|3[2-6]|4[2-4]|[5-7][2-5])(?:(?:[237-9]|4[56]|5\\d)\\d{5}|6\\d{5,6})",
 ,,,"23756789",,,[8,9],[6,7]],[,,"(?:(?:1[28]|3[18]|9[67])\\d|6[016-9]|7(?:[07-9]|[16]\\d)|8(?:[013-79]|8\\d))\\d{6}|(?:1\\d|9[0-57-9])\\d{6}|(?:2[3-6]|3[2-6]|4[2-4]|[5-7][2-5])48\\d{5}",,,,"91234567",,,[8,9]],[,,"1800(?:1\\d|2[019])\\d{4}",,,,"1800123456",,,[10]],[,,"1900(?:1\\d|2[09])\\d{4}",,,,"1900123456",,,[10]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"KH",855,"00[14-9]","0",,,"0",,,,[[,"(\\d{2})(\\d{3})(\\d{3,4})","$1 $2 $3",["[1-9]"],"0$1"],[,"(\\d{4})(\\d{3})(\\d{3})","$1 $2 $3",["1"]]],
@ -433,12 +433,12 @@ TD:[,[,,"(?:22|[69]\\d|77)\\d{6}",,,,,,,[8]],[,,"22(?:[37-9]0|5[0-5]|6[89])\\d{4
 ,,,"311234567",,,[9],[5,6,7]],[,,"(?:39|50|6[36-8]|7[1-357]|9[1-9])\\d{7}",,,,"501234567",,,[9]],[,,"800[1-8]\\d{5,6}",,,,"800123456"],[,,"900[239]\\d{5,6}",,,,"900212345"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"89[1-579]\\d{6}",,,,"891234567",,,[9]],"UA",380,"00","0",,,"0",,"0~0",,[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["6[12][29]|(?:3[1-8]|4[136-8]|5[12457]|6[49])2|(?:56|65)[24]","6[12][29]|(?:35|4[1378]|5[12457]|6[49])2|(?:56|65)[24]|(?:3[1-46-8]|46)2[013-9]"],"0$1"],[,"(\\d{4})(\\d{5})","$1 $2",
 ["3[1-8]|4(?:[1367]|[45][6-9]|8[4-6])|5(?:[1-5]|6[0135689]|7[4-6])|6(?:[12][3-7]|[459])","3[1-8]|4(?:[1367]|[45][6-9]|8[4-6])|5(?:[1-5]|6(?:[015689]|3[02389])|7[4-6])|6(?:[12][3-7]|[459])"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{4})","$1 $2 $3",["[3-7]|89|9[1-9]"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["[89]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],UG:[,[,,"800\\d{6}|(?:[29]0|[347]\\d)\\d{7}",,,,,,,[9],[5,6,7]],[,,"20(?:(?:240|30[67])\\d|6(?:00[0-2]|30[0-4]))\\d{3}|(?:20(?:[017]\\d|2[5-9]|3[1-4]|5[0-4]|6[15-9])|[34]\\d{3})\\d{5}",
 ,,,"312345678",,,,[5,6,7]],[,,"72(?:[48]0|6[01])\\d{5}|7(?:[015-8]\\d|20|36|4[0-5]|9[89])\\d{6}",,,,"712345678"],[,,"800[1-3]\\d{5}",,,,"800123456"],[,,"90[1-3]\\d{6}",,,,"901123456"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"UG",256,"00[057]","0",,,"0",,,,[[,"(\\d{4})(\\d{5})","$1 $2",["202","2024"],"0$1"],[,"(\\d{3})(\\d{6})","$1 $2",["[27-9]|4(?:6[45]|[7-9])"],"0$1"],[,"(\\d{2})(\\d{7})","$1 $2",["[34]"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],US:[,
 [,,"[2-9]\\d{9}|3\\d{6}",,,,,,,[10],[7]],[,,"(?:5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",
 ,,,"2015550123",,,,[7]],[,,"(?:5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",
 ,,,"2015550123",,,,[7]],[,,"8(?:00|33|44|55|66|77|88)[2-9]\\d{6}",,,,"8002345678"],[,,"900[2-9]\\d{6}",,,,"9002345678"],[,,,,,,,,,[-1]],[,,"52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\\d{6}",,,,"5002345678"],[,,,,,,,,,[-1]],"US",1,"011","1",,,"1",,,1,[[,"(\\d{3})(\\d{4})","$1-$2",["310"],,,1],[,"(\\d{3})(\\d{4})","$1-$2",
 ["[24-9]|3(?:[02-9]|1[1-9])"]],[,"(\\d{3})(\\d{3})(\\d{4})","($1) $2-$3",["[2-9]"],,,1]],[[,"(\\d{3})(\\d{4})","$1-$2",["310"],,,1],[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["[2-9]"]]],[,,,,,,,,,[-1]],1,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],UY:[,[,,"0004\\d{2,9}|[1249]\\d{7}|(?:[49]\\d|80)\\d{5}",,,,,,,[6,7,8,9,10,11,12,13]],[,,"(?:1(?:770|9(?:20|87))|(?:2\\d|4[2-7])\\d\\d)\\d{4}",,,,"21231234",,,[8],[7]],[,,"9[1-9]\\d{6}",,,,"94231234",,,[8]],[,,"0004\\d{2,9}|(?:405|80[05])\\d{4}",,
 ,,"8001234"],[,,"90[0-8]\\d{4}",,,,"9001234",,,[7]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"UY",598,"0(?:0|1[3-9]\\d)","0"," int. ",,"0",,"00",,[[,"(\\d{3})(\\d{3,4})","$1 $2",["0"]],[,"(\\d{3})(\\d{4})","$1 $2",["[49]0|8"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["9"],"0$1"],[,"(\\d{4})(\\d{4})","$1 $2",["[124]"]],[,"(\\d{3})(\\d{3})(\\d{2,4})","$1 $2 $3",["0"]],[,"(\\d{3})(\\d{3})(\\d{3})(\\d{2,4})","$1 $2 $3 $4",["0"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,
 ,,,,,[-1]]],UZ:[,[,,"(?:20|33|[5-79]\\d|88)\\d{7}",,,,,,,[9]],[,,"(?:55\\d\\d|6(?:1(?:22|3[124]|4[1-4]|5[1-3578]|64)|2(?:22|3[0-57-9]|41)|5(?:22|3[3-7]|5[024-8])|6\\d\\d|7(?:[23]\\d|7[69])|9(?:22|4[1-8]|6[135]))|7(?:0(?:5[4-9]|6[0146]|7[124-6]|9[135-8])|(?:1[12]|[68]\\d)\\d|2(?:22|3[13-57-9]|4[1-3579]|5[14])|3(?:2\\d|3[1578]|4[1-35-7]|5[1-57]|61)|4(?:2\\d|3[1-579]|7[1-79])|5(?:22|5[1-9]|6[1457])|9(?:22|5[1-9])))\\d{5}",,,,"669050123"],[,,"(?:(?:[25]0|33|88|9[0-57-9])\\d{3}|6(?:1(?:2(?:2[01]|98)|35[0-4]|50\\d|61[23]|7(?:[01][017]|4\\d|55|9[5-9]))|2(?:(?:11|7\\d)\\d|2(?:[12]1|9[01379])|5(?:[126]\\d|3[0-4]))|5(?:19[01]|2(?:27|9[26])|(?:30|59|7\\d)\\d)|6(?:2(?:1[5-9]|2[0367]|38|41|52|60)|(?:3[79]|9[0-3])\\d|4(?:56|83)|7(?:[07]\\d|1[017]|3[07]|4[047]|5[057]|67|8[0178]|9[79]))|7(?:2(?:24|3[237]|4[5-9]|7[15-8])|5(?:7[12]|8[0589])|7(?:0\\d|[39][07])|9(?:0\\d|7[079]))|9(?:2(?:1[1267]|3[01]|5\\d|7[0-4])|(?:5[67]|7\\d)\\d|6(?:2[0-26]|8\\d)))|7(?:[07]\\d{3}|1(?:13[01]|6(?:0[47]|1[67]|66)|71[3-69]|98\\d)|2(?:2(?:2[79]|95)|3(?:2[5-9]|6[0-6])|57\\d|7(?:0\\d|1[17]|2[27]|3[37]|44|5[057]|66|88))|3(?:2(?:1[0-6]|21|3[469]|7[159])|(?:33|9[4-6])\\d|5(?:0[0-4]|5[579]|9\\d)|7(?:[0-3579]\\d|4[0467]|6[67]|8[078]))|4(?:2(?:29|5[0257]|6[0-7]|7[1-57])|5(?:1[0-4]|8\\d|9[5-9])|7(?:0\\d|1[024589]|2[0-27]|3[0137]|[46][07]|5[01]|7[5-9]|9[079])|9(?:7[015-9]|[89]\\d))|5(?:112|2(?:0\\d|2[29]|[49]4)|3[1568]\\d|52[6-9]|7(?:0[01578]|1[017]|[23]7|4[047]|[5-7]\\d|8[78]|9[079]))|9(?:22[128]|3(?:2[0-4]|7\\d)|57[02569]|7(?:2[05-9]|3[37]|4\\d|60|7[2579]|87|9[07]))))\\d{4}",
 [,,"[2-9]\\d{9}|3\\d{6}",,,,,,,[10],[7]],[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:305[3-9]|472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",
 ,,,"2015550123",,,,[7]],[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:305[3-9]|472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",
 ,,,"2015550123",,,,[7]],[,,"8(?:00|33|44|55|66|77|88)[2-9]\\d{6}",,,,"8002345678"],[,,"900[2-9]\\d{6}",,,,"9002345678"],[,,,,,,,,,[-1]],[,,"52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\\d{6}",,,,"5002345678"],[,,"305209\\d{4}",,,,"3052090123",,,,[7]],"US",1,"011","1",,,"1",,,1,[[,"(\\d{3})(\\d{4})","$1-$2",["310"],,,1],
 [,"(\\d{3})(\\d{4})","$1-$2",["[24-9]|3(?:[02-9]|1[1-9])"]],[,"(\\d{3})(\\d{3})(\\d{4})","($1) $2-$3",["[2-9]"],,,1]],[[,"(\\d{3})(\\d{4})","$1-$2",["310"],,,1],[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["[2-9]"]]],[,,,,,,,,,[-1]],1,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],UY:[,[,,"0004\\d{2,9}|[1249]\\d{7}|(?:[49]\\d|80)\\d{5}",,,,,,,[6,7,8,9,10,11,12,13]],[,,"(?:1(?:770|9(?:20|87))|(?:2\\d|4[2-7])\\d\\d)\\d{4}",,,,"21231234",,,[8],[7]],[,,"9[1-9]\\d{6}",,,,"94231234",,,[8]],[,,"0004\\d{2,9}|(?:405|80[05])\\d{4}",
 ,,,"8001234"],[,,"90[0-8]\\d{4}",,,,"9001234",,,[7]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"UY",598,"0(?:0|1[3-9]\\d)","0"," int. ",,"0",,"00",,[[,"(\\d{3})(\\d{3,4})","$1 $2",["0"]],[,"(\\d{3})(\\d{4})","$1 $2",["[49]0|8"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["9"],"0$1"],[,"(\\d{4})(\\d{4})","$1 $2",["[124]"]],[,"(\\d{3})(\\d{3})(\\d{2,4})","$1 $2 $3",["0"]],[,"(\\d{3})(\\d{3})(\\d{3})(\\d{2,4})","$1 $2 $3 $4",["0"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,
 ,,,,,,[-1]]],UZ:[,[,,"(?:20|33|[5-79]\\d|88)\\d{7}",,,,,,,[9]],[,,"(?:55\\d\\d|6(?:1(?:22|3[124]|4[1-4]|5[1-3578]|64)|2(?:22|3[0-57-9]|41)|5(?:22|3[3-7]|5[024-8])|6\\d\\d|7(?:[23]\\d|7[69])|9(?:22|4[1-8]|6[135]))|7(?:0(?:5[4-9]|6[0146]|7[124-6]|9[135-8])|(?:1[12]|[68]\\d)\\d|2(?:22|3[13-57-9]|4[1-3579]|5[14])|3(?:2\\d|3[1578]|4[1-35-7]|5[1-57]|61)|4(?:2\\d|3[1-579]|7[1-79])|5(?:22|5[1-9]|6[1457])|9(?:22|5[1-9])))\\d{5}",,,,"669050123"],[,,"(?:(?:[25]0|33|88|9[0-57-9])\\d{3}|6(?:1(?:2(?:2[01]|98)|35[0-4]|50\\d|61[23]|7(?:[01][017]|4\\d|55|9[5-9]))|2(?:(?:11|7\\d)\\d|2(?:[12]1|9[01379])|5(?:[126]\\d|3[0-4]))|5(?:19[01]|2(?:27|9[26])|(?:30|59|7\\d)\\d)|6(?:2(?:1[5-9]|2[0367]|38|41|52|60)|(?:3[79]|9[0-3])\\d|4(?:56|83)|7(?:[07]\\d|1[017]|3[07]|4[047]|5[057]|67|8[0178]|9[79]))|7(?:2(?:24|3[237]|4[5-9]|7[15-8])|5(?:7[12]|8[0589])|7(?:0\\d|[39][07])|9(?:0\\d|7[079]))|9(?:2(?:1[1267]|3[01]|5\\d|7[0-4])|(?:5[67]|7\\d)\\d|6(?:2[0-26]|8\\d)))|7(?:[07]\\d{3}|1(?:13[01]|6(?:0[47]|1[67]|66)|71[3-69]|98\\d)|2(?:2(?:2[79]|95)|3(?:2[5-9]|6[0-6])|57\\d|7(?:0\\d|1[17]|2[27]|3[37]|44|5[057]|66|88))|3(?:2(?:1[0-6]|21|3[469]|7[159])|(?:33|9[4-6])\\d|5(?:0[0-4]|5[579]|9\\d)|7(?:[0-3579]\\d|4[0467]|6[67]|8[078]))|4(?:2(?:29|5[0257]|6[0-7]|7[1-57])|5(?:1[0-4]|8\\d|9[5-9])|7(?:0\\d|1[024589]|2[0-27]|3[0137]|[46][07]|5[01]|7[5-9]|9[079])|9(?:7[015-9]|[89]\\d))|5(?:112|2(?:0\\d|2[29]|[49]4)|3[1568]\\d|52[6-9]|7(?:0[01578]|1[017]|[23]7|4[047]|[5-7]\\d|8[78]|9[079]))|9(?:22[128]|3(?:2[0-4]|7\\d)|57[02569]|7(?:2[05-9]|3[37]|4\\d|60|7[2579]|87|9[07]))))\\d{4}",
 ,,,"912345678"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"UZ",998,"00",,,,,,,,[[,"(\\d{2})(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[235-9]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],VA:[,[,,"0\\d{5,10}|3[0-8]\\d{7,10}|55\\d{8}|8\\d{5}(?:\\d{2,4})?|(?:1\\d|39)\\d{7,8}",,,,,,,[6,7,8,9,10,11,12]],[,,"06698\\d{1,6}",,,,"0669812345",,,[6,7,8,9,10,11]],[,,"3[1-9]\\d{8}|3[2-9]\\d{7}",,,,"3123456789",,,[9,10]],[,,"80(?:0\\d{3}|3)\\d{3}",
 ,,,"800123456",,,[6,9]],[,,"(?:0878\\d{3}|89(?:2\\d|3[04]|4(?:[0-4]|[5-9]\\d\\d)|5[0-4]))\\d\\d|(?:1(?:44|6[346])|89(?:38|5[5-9]|9))\\d{6}",,,,"899123456",,,[6,8,9,10]],[,,"84(?:[08]\\d{3}|[17])\\d{3}",,,,"848123456",,,[6,9]],[,,"1(?:78\\d|99)\\d{6}",,,,"1781234567",,,[9,10]],[,,"55\\d{8}",,,,"5512345678",,,[10]],"VA",39,"00",,,,,,,,,,[,,,,,,,,,[-1]],,"06698",[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,"3[2-8]\\d{9,10}",,,,"33101234501",,,[11,12]]],VC:[,[,,"(?:[58]\\d\\d|784|900)\\d{7}",,,,,,,[10],[7]],
 [,,"784(?:266|3(?:6[6-9]|7\\d|8[0-6])|4(?:38|5[0-36-8]|8[0-8])|5(?:55|7[0-2]|93)|638|784)\\d{4}",,,,"7842661234",,,,[7]],[,,"784(?:4(?:3[0-5]|5[45]|89|9[0-8])|5(?:2[6-9]|3[0-4])|720)\\d{4}",,,,"7844301234",,,,[7]],[,,"8(?:00|33|44|55|66|77|88)[2-9]\\d{6}",,,,"8002345678"],[,,"900[2-9]\\d{6}",,,,"9002345678"],[,,,,,,,,,[-1]],[,,"52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\\d{6}",
@ -560,9 +560,9 @@ function Kc(a,b){var c=a.v.toString();if(0<=c.substring(a.$).search(a.fa)){var d
 ,,,"120"],,,,"ES",,,,,,,,,,,,,,,,,,[,,"08[58]|112",,,,"085",,,[3]],,[,,"0(?:1[0-26]|6[0-257]|8[058]|9[12])|1(?:0[03-57]\\d{1,3}|1(?:2|6(?:000|111)|8\\d\\d)|2\\d{1,4}|[3-9]\\d\\d)|2(?:2\\d{1,4}|80\\d\\d)|90(?:5[124578]|7)|1(?:3[34]|77)|(?:2[01]\\d|[79]9[57])\\d{3}|[23][357]\\d{3}",,,,"010"],[,,"0(?:[16][0-2]|80|9[12])|21\\d{4}",,,,"010",,,[3,6]],[,,"1(?:3[34]|77)|[12]2\\d{1,4}",,,,"120"],,[,,"(?:2[0-2]\\d|3[357]|[79]9[57])\\d{3}|2(?:[2357]\\d|80)\\d\\d",,,,"22000",,,[5,6]]],ET:[,[,,"9\\d\\d?",,,,,
 ,,[2,3]],,,[,,"9(?:07|11?|2|39?|9[17])",,,,"91"],[,,,,,,,,,[-1]],,,,"ET",,,,,,,,,,,,,,,,,,[,,"9(?:11?|2|39?|9[17])",,,,"91"],,[,,"9(?:07|11?|2|39?|45|9[17])",,,,"91"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,[,,,,,,,,,[-1]]],FI:[,[,,"[17]\\d\\d(?:\\d{2,3})?",,,,,,,[3,5,6]],,,[,,"11(?:2|6\\d{3})",,,,"112",,,[3,6]],[,,,,,,,,,[-1]],,,,"FI",,,,,,,,,,,,,,,,,,[,,"112",,,,"112",,,[3]],,[,,"11(?:2|6(?:00[06]|1(?:1[17]|23)))|75[12]\\d\\d",,,,"112"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,[,,,,,,,,,[-1]]],FJ:[,[,,"[0-579]\\d(?:\\d(?:\\d{2})?)?",
 ,,,,,,[2,3,5]],,,[,,"91[17]",,,,"911",,,[3]],[,,,,,,,,,[-1]],,,,"FJ",,,,,,,,,,,,,,,,,,[,,"91[17]",,,,"911",,,[3]],,[,,"0(?:1[34]|8[1-4])|1(?:0[1-3]|[25]9)|2[289]|30|40404|91[137]|[45]4|75",,,,"22"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,[,,"404\\d\\d",,,,"40400",,,[5]]],FK:[,[,,"[19]\\d\\d",,,,,,,[3]],,,[,,"999",,,,"999"],[,,,,,,,,,[-1]],,,,"FK",,,,,,,,,,,,,,,,,,[,,"999",,,,"999"],,[,,"1\\d\\d|999",,,,"100"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,[,,,,,,,,,[-1]]],FM:[,[,,"[39]\\d\\d(?:\\d{3})?",,,,,,,[3,6]],
 ,,[,,"320\\d{3}|911",,,,"911"],[,,,,,,,,,[-1]],,,,"FM",,,,,,,,,,,,,,,,,,[,,"(?:32022|91)1",,,,"911"],,[,,"(?:32022|91)1",,,,"911"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,[,,,,,,,,,[-1]]],FO:[,[,,"1\\d{2,3}",,,,,,,[3,4]],,,[,,"1(?:1[24]|81\\d)",,,,"112"],[,,,,,,,,,[-1]],,,,"FO",,,,,,,,,,,,,,,,,,[,,"11[24]",,,,"112",,,[3]],,[,,"1(?:1[248]|819)|1(?:4[124]|71|8[7-9])\\d",,,,"112"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,[,,,,,,,,,[-1]]],FR:[,[,,"[1-8]\\d{1,5}",,,,,,,[2,3,4,5,6]],,,[,,"1(?:0(?:07|[13]3)|1[02459]|[578]|9[167])|224|(?:3370|74)0|(?:116\\d|3[01])\\d\\d",
 ,,,"15"],[,,"366\\d\\d|3[2-9]\\d\\d|(?:118|[4-8]\\d)\\d{3}",,,,"3200",,,[4,5,6]],,,,"FR",,,,,,,,,,,,,,,,,,[,,"1(?:12|[578])",,,,"15",,,[2,3]],,[,,"1(?:0\\d\\d|1(?:[02459]|6(?:000|111)|8\\d{3})|[578]|9[167])|2(?:0(?:00|2)0|24)|[3-8]\\d{4}|3\\d{3}|6(?:1[14]|34)|7(?:0[06]|22|40)",,,,"15"],[,,"10(?:[134]4|2[23]|5\\d|99)|202\\d|634|70[06]|(?:106|61)[14]",,,,"611",,,[3,4]],[,,"118777|224|6(?:1[14]|34)|7(?:0[06]|22|40)|20(?:0\\d|2)\\d",,,,"224",,,[3,4,5,6]],,[,,"114|[3-8]\\d{4}",,,,"114",,,[3,5]]],GA:[,
 [,,"1\\d(?:\\d{2})?",,,,,,,[2,4]],,,[,,"18|1(?:3\\d|73)\\d",,,,"18"],[,,,,,,,,,[-1]],,,,"GA",,,,,,,,,,,,,,,,,,[,,"1(?:3\\d\\d|730|8)",,,,"18"],,[,,"1(?:3\\d\\d|730|8)",,,,"18"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,[,,,,,,,,,[-1]]],GB:[,[,,"[1-46-9]\\d{2,5}",,,,,,,[3,4,5,6]],,,[,,"1(?:05|1(?:[29]|6\\d{3})|7[56]\\d|8000)|2(?:20\\d|48)|4444|999",,,,"105"],[,,,,,,,,,[-1]],,,,"GB",,,,,,,,,,,,,,,,,,[,,"112|999",,,,"112",,,[3]],,[,,"1(?:0[015]|1(?:[129]|6(?:000|1(?:11|23))|8\\d{3})|2(?:[1-3]|50)|33|4(?:1|7\\d)|571|7(?:0\\d|[56]0)|800\\d|9[15])|2(?:0202|1300|2(?:02|11)|3(?:02|336|45)|4(?:25|8))|3[13]3|4(?:0[02]|35[01]|44[45]|5\\d)|(?:[68]\\d|7[089])\\d{3}|15\\d|2[02]2|650|789|9(?:01|99)",
 ,,[,,"320\\d{3}|911",,,,"911"],[,,,,,,,,,[-1]],,,,"FM",,,,,,,,,,,,,,,,,,[,,"(?:32022|91)1",,,,"911"],,[,,"(?:32022|91)1",,,,"911"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,[,,,,,,,,,[-1]]],FO:[,[,,"1\\d{2,3}",,,,,,,[3,4]],,,[,,"1(?:1[24]|81\\d)",,,,"112"],[,,,,,,,,,[-1]],,,,"FO",,,,,,,,,,,,,,,,,,[,,"11[24]",,,,"112",,,[3]],,[,,"1(?:1[248]|819)|1(?:4[124]|71|8[7-9])\\d",,,,"112"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,[,,,,,,,,,[-1]]],FR:[,[,,"[1-8]\\d{1,5}",,,,,,,[2,3,4,5,6]],,,[,,"1(?:1[02459]|[578]|9[167])|224|(?:3370|74)0|(?:116\\d|3[01])\\d\\d",
 ,,,"15"],[,,"(?:1(?:0|18\\d)|366|[4-8]\\d\\d)\\d\\d|3[2-9]\\d\\d",,,,"1000",,,[4,5,6]],,,,"FR",,,,,,,,,,,,,,,,,,[,,"1(?:12|[578])",,,,"15",,,[2,3]],,[,,"1(?:0\\d\\d|1(?:[02459]|6(?:000|111)|8\\d{3})|[578]|9[167])|2(?:0(?:00|2)0|24)|[3-8]\\d{4}|3\\d{3}|6(?:1[14]|34)|7(?:0[06]|22|40)",,,,"15"],[,,"202\\d|6(?:1[14]|34)|70[06]",,,,"611",,,[3,4]],[,,"118777|224|6(?:1[14]|34)|7(?:0[06]|22|40)|20(?:0\\d|2)\\d",,,,"224",,,[3,4,5,6]],,[,,"114|[3-8]\\d{4}",,,,"114",,,[3,5]]],GA:[,[,,"1\\d(?:\\d{2})?",,,,,,
 ,[2,4]],,,[,,"18|1(?:3\\d|73)\\d",,,,"18"],[,,,,,,,,,[-1]],,,,"GA",,,,,,,,,,,,,,,,,,[,,"1(?:3\\d\\d|730|8)",,,,"18"],,[,,"1(?:3\\d\\d|730|8)",,,,"18"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,[,,,,,,,,,[-1]]],GB:[,[,,"[1-46-9]\\d{2,5}",,,,,,,[3,4,5,6]],,,[,,"1(?:05|1(?:[29]|6\\d{3})|7[56]\\d|8000)|2(?:20\\d|48)|4444|999",,,,"105"],[,,,,,,,,,[-1]],,,,"GB",,,,,,,,,,,,,,,,,,[,,"112|999",,,,"112",,,[3]],,[,,"1(?:0[015]|1(?:[129]|6(?:000|1(?:11|23))|8\\d{3})|2(?:[1-3]|50)|33|4(?:1|7\\d)|571|7(?:0\\d|[56]0)|800\\d|9[15])|2(?:0202|1300|2(?:02|11)|3(?:02|336|45)|4(?:25|8))|3[13]3|4(?:0[02]|35[01]|44[45]|5\\d)|(?:[68]\\d|7[089])\\d{3}|15\\d|2[02]2|650|789|9(?:01|99)",
 ,,,"100"],[,,,,,,,,,[-1]],[,,"1(?:(?:25|7[56])\\d|571)|2(?:02(?:\\d{2})?|[13]3\\d\\d|48)|4444|901",,,,"202",,,[3,4,5]],,[,,"(?:125|2(?:020|13\\d)|(?:7[089]|8[01])\\d\\d)\\d",,,,"1250",,,[4,5]]],GD:[,[,,"[19]\\d\\d",,,,,,,[3]],,,[,,"9(?:11|88)",,,,"911"],[,,,,,,,,,[-1]],,,,"GD",,,,,,,,,,,,,,,,,,[,,"911",,,,"911"],,[,,"176|9(?:11|88)",,,,"176"],[,,,,,,,,,[-1]],[,,"176",,,,"176"],,[,,"176",,,,"176"]],GE:[,[,,"[014]\\d\\d(?:\\d{2})?",,,,,,,[3,5]],,,[,,"0(?:11|33)|11[1-3]|[01]22",,,,"011",,,[3]],[,,,,
 ,,,,,[-1]],,,,"GE",,,,,,,,,,,,,,,,,,[,,"0(?:11|33)|11[1-3]|[01]22",,,,"011",,,[3]],,[,,"0(?:11|33)|11[1-3]|40404|[01]22",,,,"011"],[,,,,,,,,,[-1]],[,,"404\\d\\d",,,,"40400",,,[5]],,[,,"404\\d\\d",,,,"40400",,,[5]]],GF:[,[,,"1\\d",,,,,,,[2]],,,[,,"1[578]",,,,"15"],[,,,,,,,,,[-1]],,,,"GF",,,,,,,,,,,,,,,,,,[,,"1[578]",,,,"15"],,[,,"1[578]",,,,"15"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,[,,,,,,,,,[-1]]],GG:[,[,,"[19]\\d{2,5}",,,,,,,[3,4,5,6]],,,[,,"112|999",,,,"112",,,[3]],[,,,,,,,,,[-1]],,,,"GG",,,,,,,,,
 ,,,,,,,,,[,,"112|999",,,,"112",,,[3]],,[,,"1(?:0[01]|1[12]|23|41|55|9[05])|999|1(?:1[68]\\d\\d|47|800)\\d",,,,"100"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,[,,,,,,,,,[-1]]],GH:[,[,,"[14589]\\d{2,4}",,,,,,,[3,4,5]],,,[,,"19[1-3]|999",,,,"191",,,[3]],[,,,,,,,,,[-1]],,,,"GH",,,,,,,,,,,,,,,,,,[,,"19[1-3]|999",,,,"191",,,[3]],,[,,"19[1-3]|40404|(?:54|83)00|999",,,,"191"],[,,,,,,,,,[-1]],[,,"404\\d\\d|(?:54|83)0\\d",,,,"5400",,,[4,5]],,[,,"404\\d\\d|(?:54|83)0\\d",,,,"5400",,,[4,5]]],GI:[,[,,"[158]\\d{2,5}",
--- a/javascript/i18n/phonenumbers/metadata.js
+++ b/javascript/i18n/phonenumbers/metadata.js
@ -3949,7 +3949,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"(?:4[245]|5[1-79]|6[01457-9])\\d{5,7}|(?:4[136]|5[08]|62)\\d{7}|(?:[24]0|66)\\d{6,7}",,,,"202012345",,,[7,8,9]
 ]
 ,[,,"(?:1(?:0[0-8]|1[0-5]|2[014]|30)|7\\d\\d)\\d{6}",,,,"712123456",,,[9]
 ,[,,"(?:1(?:0[0-8]|1[0-7]|2[014]|30)|7\\d\\d)\\d{6}",,,,"712123456",,,[9]
 ]
 ,[,,"800[02-8]\\d{5,6}",,,,"800223456",,,[9,10]
 ]
@ -7592,16 +7592,16 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"US":[,[,,"[2-9]\\d{9}|3\\d{6}",,,,,,,[10]
 ,[7]
 ]
 ,[,,"(?:5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",,,,"2015550123",,,,[7]
 ,[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:305[3-9]|472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",,,,"2015550123",,,,[7]
 ]
 ,[,,"(?:5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",,,,"2015550123",,,,[7]
 ,[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:305[3-9]|472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",,,,"2015550123",,,,[7]
 ]
 ,[,,"8(?:00|33|44|55|66|77|88)[2-9]\\d{6}",,,,"8002345678"]
 ,[,,"900[2-9]\\d{6}",,,,"9002345678"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,"52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\\d{6}",,,,"5002345678"]
 ,[,,,,,,,,,[-1]
 ,[,,"305209\\d{4}",,,,"3052090123",,,,[7]
 ]
 ,"US",1,"011","1",,,"1",,,1,[[,"(\\d{3})(\\d{4})","$1-$2",["310"]
 ,,,1]
--- a/javascript/i18n/phonenumbers/metadatalite.js
+++ b/javascript/i18n/phonenumbers/metadatalite.js
@ -3949,7 +3949,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,"(?:4[245]|5[1-79]|6[01457-9])\\d{5,7}|(?:4[136]|5[08]|62)\\d{7}|(?:[24]0|66)\\d{6,7}",,,,,,,[7,8,9]
 ]
 ,[,,"(?:1(?:0[0-8]|1[0-5]|2[014]|30)|7\\d\\d)\\d{6}",,,,,,,[9]
 ,[,,"(?:1(?:0[0-8]|1[0-7]|2[014]|30)|7\\d\\d)\\d{6}",,,,,,,[9]
 ]
 ,[,,"800[02-8]\\d{5,6}",,,,,,,[9,10]
 ]
@ -7592,16 +7592,16 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"US":[,[,,"[2-9]\\d{9}|3\\d{6}",,,,,,,[10]
 ,[7]
 ]
 ,[,,"(?:5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",,,,,,,,[7]
 ,[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:305[3-9]|472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",,,,,,,,[7]
 ]
 ,[,,"(?:5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",,,,,,,,[7]
 ,[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:305[3-9]|472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-47-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}",,,,,,,,[7]
 ]
 ,[,,"8(?:00|33|44|55|66|77|88)[2-9]\\d{6}"]
 ,[,,"900[2-9]\\d{6}"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,"52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\\d{6}"]
 ,[,,,,,,,,,[-1]
 ,[,,"305209\\d{4}",,,,,,,,[7]
 ]
 ,"US",1,"011","1",,,"1",,,1,[[,"(\\d{3})(\\d{4})","$1-$2",["310"]
 ,,,1]
--- a/javascript/i18n/phonenumbers/shortnumbermetadata.js
+++ b/javascript/i18n/phonenumbers/shortnumbermetadata.js
@ -1120,13 +1120,13 @@ i18n.phonenumbers.shortnumbermetadata.countryToMetadata = {
 ]
 ,"FR":[,[,,"[1-8]\\d{1,5}",,,,,,,[2,3,4,5,6]
 ]
 ,,,[,,"1(?:0(?:07|[13]3)|1[02459]|[578]|9[167])|224|(?:3370|74)0|(?:116\\d|3[01])\\d\\d",,,,"15"]
 ,[,,"366\\d\\d|3[2-9]\\d\\d|(?:118|[4-8]\\d)\\d{3}",,,,"3200",,,[4,5,6]
 ,,,[,,"1(?:1[02459]|[578]|9[167])|224|(?:3370|74)0|(?:116\\d|3[01])\\d\\d",,,,"15"]
 ,[,,"(?:1(?:0|18\\d)|366|[4-8]\\d\\d)\\d\\d|3[2-9]\\d\\d",,,,"1000",,,[4,5,6]
 ]
 ,,,,"FR",,,,,,,,,,,,,,,,,,[,,"1(?:12|[578])",,,,"15",,,[2,3]
 ]
 ,,[,,"1(?:0\\d\\d|1(?:[02459]|6(?:000|111)|8\\d{3})|[578]|9[167])|2(?:0(?:00|2)0|24)|[3-8]\\d{4}|3\\d{3}|6(?:1[14]|34)|7(?:0[06]|22|40)",,,,"15"]
 ,[,,"10(?:[134]4|2[23]|5\\d|99)|202\\d|634|70[06]|(?:106|61)[14]",,,,"611",,,[3,4]
 ,[,,"202\\d|6(?:1[14]|34)|70[06]",,,,"611",,,[3,4]
 ]
 ,[,,"118777|224|6(?:1[14]|34)|7(?:0[06]|22|40)|20(?:0\\d|2)\\d",,,,"224",,,[3,4,5,6]
 ]
--- a/metadata/metadata.zip
+++ b/metadata/metadata.zip
--- a/release_notes.txt
+++ b/release_notes.txt
@ -1,3 +1,10 @@
 Jun 13, 2024: v8.13.39
 Metadata changes:
 - Updated phone metadata for region code(s): KE, US
 - Updated short number metadata for region code(s): FR
 - Updated geocoding data for country calling code(s): 1305 (en)
 - Updated carrier data for country calling code(s): 61 (en)

 May 29, 2024: v8.13.38
 Metadata changes:
 - Updated phone metadata for region code(s): AO, GB, GY, HK, MX
--- a/resources/PhoneNumberMetadata.xml
+++ b/resources/PhoneNumberMetadata.xml
@ -13484,6 +13484,7 @@
    <!-- http://www.itu.int/oth/T020200006A/en -->
    <!-- http://en.wikipedia.org/wiki/%2B972 -->
    <!-- http://he.wikipedia.org/wiki/%D7%A7%D7%99%D7%93%D7%95%D7%9E%D7%AA_%D7%98%D7%9C%D7%A4%D7%95%D7%9F_%D7%91%D7%99%D7%A9%D7%A8%D7%90%D7%9C -->
    <!-- https://data.gov.il/dataset/israel-numbering-plan/resource/74b44725-d8cc-4ae9-ba08-2c40a61ab68e?filters= -->
    <territory id="IL" countryCode="972" internationalPrefix="0(?:0|1[2-9])" nationalPrefix="0"
               mobileNumberPortableRegion="true">
      <availableFormats>
@ -16892,7 +16893,7 @@
          (?:
            1(?:
              0[0-8]|
              1[0-5]|
              1[0-7]|
              2[014]|
              30
            )|
@ -28938,6 +28939,10 @@
        <exampleNumber>2015550123</exampleNumber>
        <nationalNumberPattern>
          (?:
            3052(?:
              0[0-8]|
              [1-9]\d
            )|
            5056(?:
              [0-35-9]\d|
              4[468]
@ -28945,6 +28950,7 @@
            7302[0-4]\d
          )\d{4}|
          (?:
            305[3-9]|
            472[24]|
            505[2-57-9]|
            7306|
@ -28963,7 +28969,7 @@
              8[13]
            )|
            3(?:
              0[1-57-9]|
              0[1-47-9]|
              1[02-9]|
              2[013569]|
              3[0-24679]|
@ -29044,6 +29050,10 @@
        <exampleNumber>2015550123</exampleNumber>
        <nationalNumberPattern>
          (?:
            3052(?:
              0[0-8]|
              [1-9]\d
            )|
            5056(?:
              [0-35-9]\d|
              4[468]
@ -29051,6 +29061,7 @@
            7302[0-4]\d
          )\d{4}|
          (?:
            305[3-9]|
            472[24]|
            505[2-57-9]|
            7306|
@ -29069,7 +29080,7 @@
              8[13]
            )|
            3(?:
              0[1-57-9]|
              0[1-47-9]|
              1[02-9]|
              2[013569]|
              3[0-24679]|
@ -29208,6 +29219,11 @@
          )[2-9]\d{6}
        </nationalNumberPattern>
      </personalNumber>
      <voip>
        <possibleLengths national="10" localOnly="7"/>
        <exampleNumber>3052090123</exampleNumber>
        <nationalNumberPattern>305209\d{4}</nationalNumberPattern>
      </voip>
    </territory>

    <!-- Uruguay (UY) -->
--- a/resources/ShortNumberMetadata.xml
+++ b/resources/ShortNumberMetadata.xml
@ -4964,10 +4964,6 @@
        <exampleNumber>15</exampleNumber>
        <nationalNumberPattern>
          1(?:
            0(?:
              07|
              [13]3
            )|
            1[02459]|
            [578]|
            9[167]
@ -4988,19 +4984,12 @@
        <possibleLengths national="3,4"/>
        <exampleNumber>611</exampleNumber>
        <nationalNumberPattern>
          10(?:
            [134]4|
            2[23]|
            5\d|
            99
          )|
          202\d|
          634|
          70[06]|
          (?:
            106|
            61
          )[14]
          6(?:
            1[14]|
            34
          )|
          70[06]
        </nationalNumberPattern>
      </standardRate>
      <!-- SMS Services [4-8]\d{4} vary in price from 0.05 euro to 4.50 euro per SMS, based on
@ -5009,14 +4998,17 @@
           provider http://www.telecom-infoconso.fr/les-numeros-08-et-les-numeros-courts/ -->
      <premiumRate>
        <possibleLengths national="[4-6]"/>
        <exampleNumber>3200</exampleNumber>
        <exampleNumber>1000</exampleNumber>
        <nationalNumberPattern>
          366\d\d|
          3[2-9]\d\d|
          (?:
            118|
            [4-8]\d
          )\d{3}
            1(?:
              0|
              18\d
            )|
            366|
            [4-8]\d\d
          )\d\d|
          3[2-9]\d\d
        </nationalNumberPattern>
      </premiumRate>
      <!-- http://www.appel118.fr/detail.php lists 118777 as only being accessible from SFR. 224
--- a/resources/carrier/en/61.txt
+++ b/resources/carrier/en/61.txt
@ -98,6 +98,7 @@
 61479|Optus
 614800|Pivotel Satellite
 614801|Telstra
 614802|Telstra
 614803|Telstra
 614804|Telstra
 614805|Telstra
--- a/resources/geocoding/en/1.txt
+++ b/resources/geocoding/en/1.txt
@ -4855,34 +4855,62 @@
 1304983|Morgantown, WV
 1304984|Charleston, WV
 1304986|Mannington, WV
 1305|Florida
 1305200|Florida
 1305201|Florida
 1305202|Florida
 1305203|Florida
 1305204|Florida
 1305205|Florida
 1305206|Florida
 1305207|Miami, FL
 1305208|Florida
 130521|Florida
 130522|Miami, FL
 1305224|Florida
 1305230|Florida
 1305231|Hialeah, FL
 1305232|Miami, FL
 1305233|Miami, FL
 1305234|Miami, FL
 1305235|Miami, FL
 1305236|Florida
 1305237|Florida
 1305238|Miami, FL
 1305239|Florida
 1305240|Florida
 1305241|Florida
 1305242|Homestead, FL
 1305243|Miami, FL
 1305244|Florida
 1305245|Homestead, FL
 1305246|Homestead, FL
 1305247|Homestead, FL
 1305248|Homestead, FL
 1305249|Miami, FL
 130525|Miami, FL
 1305250|Florida
 1305257|Homestead, FL
 1305258|Homestead, FL
 130526|Miami, FL
 1305268|Florida
 130527|Miami, FL
 1305272|Florida
 1305276|Florida
 1305277|Florida
 130528|Florida
 1305285|Miami, FL
 1305289|Marathon, FL
 1305290|Florida
 1305291|Florida
 1305292|Key West, FL
 1305293|Key West, FL
 1305294|Key West, FL
 1305295|Key West, FL
 1305296|Key West, FL
 1305297|Florida
 1305298|Florida
 1305299|Florida
 13053|Florida
 1305324|Miami, FL
 1305325|Miami, FL
 1305326|Miami, FL
@ -4900,6 +4928,7 @@
 130538|Miami, FL
 1305392|Miami, FL
 1305397|Miami Beach, FL
 13054|Florida
 1305400|Miami, FL
 1305406|Doral, FL
 1305408|Miami, FL
@ -4914,6 +4943,7 @@
 1305460|Coral Gables, FL
 1305480|Miami, FL
 1305485|Miami, FL
 13055|Florida
 1305512|Hialeah, FL
 1305513|Doral, FL
 1305525|Miami, FL
@ -4940,6 +4970,7 @@
 1305595|Miami, FL
 1305596|Miami, FL
 1305598|Miami, FL
 13056|Florida
 1305603|Miami, FL
 1305604|Miami Beach, FL
 130563|Miami, FL
@ -4966,12 +4997,14 @@
 1305695|Miami Beach, FL
 1305696|Miami, FL
 1305698|Hialeah, FL
 13057|Florida
 1305718|Doral, FL
 1305743|Marathon, FL
 1305745|Summerland Key, FL
 130575|Miami, FL
 1305770|Miami, FL
 1305789|Miami, FL
 13058|Florida
 1305809|Key West, FL
 1305817|Hialeah, FL
 1305818|Hialeah, FL
@ -4995,6 +5028,7 @@
 1305893|North Miami, FL
 1305895|North Miami, FL
 1305899|North Miami, FL
 13059|Florida
 1305913|Miami, FL
 1305953|Opa-locka, FL
 1305960|Miami, FL
--- a/resources/metadata/1/examples.csv
+++ b/resources/metadata/1/examples.csv
@ -116,6 +116,7 @@ US     ; FIXED_LINE_OR_MOBILE ; "2015550123"
 US     ; TOLL_FREE            ; "8002345678"
 US     ; PREMIUM_RATE         ; "9002345678"
 US     ; PERSONAL_NUMBER      ; "5002345678"
 US     ; VOIP                 ; "3052090123"
 VC     ; FIXED_LINE           ; "7842661234"
 VC     ; MOBILE               ; "7844301234"
 VC     ; TOLL_FREE            ; "8002345678"
--- a/resources/metadata/1/ranges.csv
+++ b/resources/metadata/1/ranges.csv
@ -5624,8 +5624,9 @@ Prefix             ; Length ; Type                 ; Tariff        ; Area Code L
 304983             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "Morgantown, WV"
 304984             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "Charleston, WV"
 304986             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "Mannington, WV"
 30520[0-689]       ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "Florida"
 30520[0-68]        ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "Florida"
 305207             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "Miami, FL"
 305209             ; 10     ; VOIP                 ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ;                                             ;            ; "Ticket # 04929953"
 30521              ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "Florida"
 30522[0-35-9]      ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "Miami, FL"
 305224             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "Florida"
--- a/resources/metadata/254/ranges.csv
+++ b/resources/metadata/254/ranges.csv
@ -1,7 +1,7 @@
 Prefix      ; Length ; Type       ; Tariff        ; Operator         ; Format        ; Regions ; Geocode:en                              ; Provenance
 10[0-278]   ; 9      ; MOBILE     ; STANDARD_RATE ; "airtel"         ; "mobile_3/6"  ; "KE"    ;                                         ; IR21
 10[3-6]     ; 9      ; MOBILE     ; STANDARD_RATE ; "airtel"         ; "mobile_3/6"  ; "KE"
 11[0-5]     ; 9      ; MOBILE     ; STANDARD_RATE ; "safaricom"      ; "mobile_3/6"  ; "KE"    ;                                         ; IR21
 11[0-7]     ; 9      ; MOBILE     ; STANDARD_RATE ; "safaricom"      ; "mobile_3/6"  ; "KE"    ;                                         ; IR21
 120         ; 9      ; MOBILE     ; STANDARD_RATE ; "telkom"         ; "mobile_3/6"  ; "KE"    ;                                         ; IR21
 121         ; 9      ; MOBILE     ; STANDARD_RATE ; "infura"         ; "mobile_3/6"  ; "KE"    ;                                         ; ITU
 124         ; 9      ; MOBILE     ; STANDARD_RATE ; "finserve"       ; "mobile_3/6"  ; "KE"    ;                                         ; ITU
--- a/resources/metadata/27/ranges.csv
+++ b/resources/metadata/27/ranges.csv
@ -3,9 +3,9 @@ Prefix        ; Length ; Type                 ; Tariff        ; Operator
 10[1-35689]   ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Johannesburg"                                                                                  ; GOVERNMENT
 104[0-46-8]   ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Johannesburg"                                                                                  ;            ; "Fillup To Support Master Range"
 1045          ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Johannesburg"                                                                                  ; GOVERNMENT
 1049[0179]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Johannesburg"                                                                                  ;            ; "Fillup To Support Master Range"
 1049[079]     ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Johannesburg"                                                                                  ;            ; "Fillup To Support Master Range"
 1049[1568]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Johannesburg"                                                                                  ; GOVERNMENT
 1049[2-4]     ; 9      ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom"       ; "all_types_2/3/4"  ; "ZA"    ; "Johannesburg"                                                                                  ; IR21       ; "IR21 dated 12/11/2018"
 1049[568]     ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Johannesburg"                                                                                  ; GOVERNMENT
 11            ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Johannesburg"
 12[0-3579]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Brits/Tshwane"                                                                                 ; GOVERNMENT
 124[0-578]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Brits/Tshwane"                                                                                 ;            ; "Fillup To Support Master Range"
@ -38,8 +38,8 @@ Prefix        ; Length ; Type                 ; Tariff        ; Operator
 15492[1-9]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Northern and Eastern Limpopo/Polokwane"                                                        ;            ; "Fillup To Support Master Range"
 15493         ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Northern and Eastern Limpopo/Polokwane"                                                        ; IR21
 15495[01]     ; 9      ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom"       ; "all_types_2/3/4"  ; "ZA"    ; "Northern and Eastern Limpopo/Polokwane"                                                        ; IR21       ; "IR21 dated 12/11/2018"
 15495[2-4]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Northern and Eastern Limpopo/Polokwane"                                                        ; GOVERNMENT
 15495[5-9]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Northern and Eastern Limpopo/Polokwane"                                                        ;            ; "Fillup To Support Master Range"
 15495[2-489]  ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Northern and Eastern Limpopo/Polokwane"                                                        ; GOVERNMENT
 15495[5-7]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Northern and Eastern Limpopo/Polokwane"                                                        ;            ; "Fillup To Support Master Range"
 16[0-3]       ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Vaal Triangle"                                                                                 ; GOVERNMENT
 164[0-578]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Vaal Triangle"                                                                                 ;            ; "Fillup To Support Master Range"
 1646          ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Vaal Triangle"                                                                                 ; GOVERNMENT
@ -48,8 +48,8 @@ Prefix        ; Length ; Type                 ; Tariff        ; Operator
 164921        ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Vaal Triangle"                                                                                 ; GOVERNMENT
 16492[2-9]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Vaal Triangle"                                                                                 ;            ; "Fillup To Support Master Range"
 16[5-9]       ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Vaal Triangle"                                                                                 ;            ; "Fillup To Support Master Range"
 17[026]       ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Ermelo/Secunda/Southern Mpumalanga"                                                            ; GOVERNMENT
 17[1357-9]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Ermelo/Secunda/Southern Mpumalanga"                                                            ;            ; "Fillup To Support Master Range"
 17[0268]      ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Ermelo/Secunda/Southern Mpumalanga"                                                            ; GOVERNMENT
 17[13579]     ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Ermelo/Secunda/Southern Mpumalanga"                                                            ;            ; "Fillup To Support Master Range"
 174[0-578]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Ermelo/Secunda/Southern Mpumalanga"                                                            ;            ; "Fillup To Support Master Range"
 1746          ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Ermelo/Secunda/Southern Mpumalanga"                                                            ; GOVERNMENT
 1749[013-9]   ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Ermelo/Secunda/Southern Mpumalanga"                                                            ;            ; "Fillup To Support Master Range"
@ -61,8 +61,8 @@ Prefix        ; Length ; Type                 ; Tariff        ; Operator
 1849[013-9]   ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Klerksdorp/Lichtenburg/Potchefstroom"                                                          ;            ; "Fillup To Support Master Range"
 184920        ; 9      ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom"       ; "all_types_2/3/4"  ; "ZA"    ; "Klerksdorp/Lichtenburg/Potchefstroom"
 18492[13]     ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Klerksdorp/Lichtenburg/Potchefstroom"                                                          ; IR21
 184922        ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Klerksdorp/Lichtenburg/Potchefstroom"                                                          ; GOVERNMENT
 18492[4-9]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Klerksdorp/Lichtenburg/Potchefstroom"                                                          ;            ; "Fillup To Support Master Range"
 18492[25-7]   ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Klerksdorp/Lichtenburg/Potchefstroom"                                                          ; GOVERNMENT
 18492[489]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Klerksdorp/Lichtenburg/Potchefstroom"                                                          ;            ; "Fillup To Support Master Range"
 18[689]       ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Klerksdorp/Lichtenburg/Potchefstroom"                                                          ;            ; "Fillup To Support Master Range"
 19[12]        ; 9      ; MOBILE               ; STANDARD_RATE ; "telkom_mobile" ; "all_types_2/3/4"  ; "ZA"    ;                                                                                                 ; IR21       ; "IR21 dated 1/9/2019"
 203300        ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"
@ -100,8 +100,9 @@ Prefix        ; Length ; Type                 ; Tariff        ; Operator
 31[12589]     ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Durban"                                                                                        ; GOVERNMENT
 314[01]       ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Durban"                                                                                        ; GOVERNMENT
 314[2-8]      ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Durban"                                                                                        ;            ; "Fillup To Support Master Range"
 3149[013-9]   ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Durban"                                                                                        ;            ; "Fillup To Support Master Range"
 3149[013-689] ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Durban"                                                                                        ;            ; "Fillup To Support Master Range"
 31492         ; 9      ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom"       ; "all_types_2/3/4"  ; "ZA"    ; "Durban"                                                                                        ; IR21       ; "IR21 dated 12/11/2018"
 31497         ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Durban"                                                                                        ; GOVERNMENT
 31[67]        ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Durban"                                                                                        ;            ; "Fillup To Support Master Range"
 32[0679]      ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Ballito/KwaZulu Natal coast/Stanger/Tongaat/Verulam"                                           ;            ; "Fillup To Support Master Range"
 32[1-358]     ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Ballito/KwaZulu Natal coast/Stanger/Tongaat/Verulam"                                           ; GOVERNMENT
@ -118,13 +119,13 @@ Prefix        ; Length ; Type                 ; Tariff        ; Operator
 334920        ; 9      ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom"       ; "all_types_2/3/4"  ; "ZA"    ; "KwaZulu Natal Midlands/Pietermaritzburg"
 33492[1-9]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "KwaZulu Natal Midlands/Pietermaritzburg"                                                       ;            ; "Fillup To Support Master Range"
 33[5689]      ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "KwaZulu Natal Midlands/Pietermaritzburg"                                                       ;            ; "Fillup To Support Master Range"
 34[05-8]      ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Newcastle/Northern KwaZulu Natal/Vryheid"                                                      ;            ; "Fillup To Support Master Range"
 34[1-39]      ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Newcastle/Northern KwaZulu Natal/Vryheid"                                                      ; GOVERNMENT
 34[0-39]      ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Newcastle/Northern KwaZulu Natal/Vryheid"                                                      ; GOVERNMENT
 344[0-578]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Newcastle/Northern KwaZulu Natal/Vryheid"                                                      ;            ; "Fillup To Support Master Range"
 3446          ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Newcastle/Northern KwaZulu Natal/Vryheid"                                                      ; GOVERNMENT
 3449[013-9]   ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Newcastle/Northern KwaZulu Natal/Vryheid"                                                      ;            ; "Fillup To Support Master Range"
 344920        ; 9      ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom"       ; "all_types_2/3/4"  ; "ZA"    ; "Newcastle/Northern KwaZulu Natal/Vryheid"
 34492[1-9]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Newcastle/Northern KwaZulu Natal/Vryheid"                                                      ;            ; "Fillup To Support Master Range"
 34[5-8]       ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Newcastle/Northern KwaZulu Natal/Vryheid"                                                      ;            ; "Fillup To Support Master Range"
 35[0-3]       ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Richards Bay/St. Lucia/Ulundi/Zululand"                                                        ; GOVERNMENT
 354[0-578]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Richards Bay/St. Lucia/Ulundi/Zululand"                                                        ;            ; "Fillup To Support Master Range"
 3546          ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Richards Bay/St. Lucia/Ulundi/Zululand"                                                        ; GOVERNMENT
@ -251,13 +252,13 @@ Prefix        ; Length ; Type                 ; Tariff        ; Operator
 564920        ; 9      ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom"       ; "all_types_2/3/4"  ; "ZA"    ; "Kroonstad/Parys/Northern Free State"
 56492[1-9]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Kroonstad/Parys/Northern Free State"                                                           ;            ; "Fillup To Support Master Range"
 56[569]       ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Kroonstad/Parys/Northern Free State"                                                           ;            ; "Fillup To Support Master Range"
 57[0569]      ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Northern Free State Goldfields/Welkom"                                                         ;            ; "Fillup To Support Master Range"
 57[1-378]     ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Northern Free State Goldfields/Welkom"                                                         ; GOVERNMENT
 57[0-378]     ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Northern Free State Goldfields/Welkom"                                                         ; GOVERNMENT
 574[0-578]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Northern Free State Goldfields/Welkom"                                                         ;            ; "Fillup To Support Master Range"
 5746          ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Northern Free State Goldfields/Welkom"                                                         ; GOVERNMENT
 5749[013-9]   ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Northern Free State Goldfields/Welkom"                                                         ;            ; "Fillup To Support Master Range"
 574920        ; 9      ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom"       ; "all_types_2/3/4"  ; "ZA"    ; "Northern Free State Goldfields/Welkom"
 57492[1-9]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Northern Free State Goldfields/Welkom"                                                         ;            ; "Fillup To Support Master Range"
 57[569]       ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Northern Free State Goldfields/Welkom"                                                         ;            ; "Fillup To Support Master Range"
 58[0-378]     ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Bethlehem/Eastern Free State"                                                                  ; GOVERNMENT
 584[0-578]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Bethlehem/Eastern Free State"                                                                  ;            ; "Fillup To Support Master Range"
 5846          ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Bethlehem/Eastern Free State"                                                                  ; GOVERNMENT
--- a/resources/metadata/33/shortcodes.csv
+++ b/resources/metadata/33/shortcodes.csv
@ -1,47 +1,34 @@
 Region ; Prefix         ; Length ; Type               ; Tariff        ; Sms  ; Carrier Specific ; Format          ; Comment
 FR     ; 100[0-689]     ; 4      ; COMMERCIAL         ;               ;      ;                  ; "shortcode_4"
 FR     ; 1007           ; 4      ; COMMERCIAL         ; TOLL_FREE     ;      ;                  ; "shortcode_4"
 FR     ; 10[13][0-25-9] ; 4      ; COMMERCIAL         ;               ;      ;                  ; "shortcode_4"
 FR     ; 10[13]3        ; 4      ; COMMERCIAL         ; TOLL_FREE     ;      ;                  ; "shortcode_4"
 FR     ; 10[134]4       ; 4      ; COMMERCIAL         ; STANDARD_RATE ;      ;                  ; "shortcode_4"
 FR     ; 102[014-9]     ; 4      ; COMMERCIAL         ;               ;      ;                  ; "shortcode_4"
 FR     ; 102[23]        ; 4      ; COMMERCIAL         ; STANDARD_RATE ;      ;                  ; "shortcode_4"
 FR     ; 104[0-35-9]    ; 4      ; COMMERCIAL         ;               ;      ;                  ; "shortcode_4"
 FR     ; 105            ; 4      ; COMMERCIAL         ; STANDARD_RATE ;      ;                  ; "shortcode_4"
 FR     ; 106[0235-9]    ; 4      ; COMMERCIAL         ;               ;      ;                  ; "shortcode_4"
 FR     ; 106[14]        ; 4      ; COMMERCIAL         ; STANDARD_RATE ;      ;                  ; "shortcode_4"
 FR     ; 10[78]         ; 4      ; COMMERCIAL         ;               ;      ;                  ; "shortcode_4"
 FR     ; 109[0-8]       ; 4      ; COMMERCIAL         ;               ;      ;                  ; "shortcode_4"
 FR     ; 1099           ; 4      ; COMMERCIAL         ; STANDARD_RATE ;      ;                  ; "shortcode_4"
 FR     ; 110            ; 3      ; COMMERCIAL         ; TOLL_FREE
 FR     ; 112            ; 3      ; EMERGENCY          ; TOLL_FREE
 FR     ; 114            ; 3      ; EXPANDED_EMERGENCY ; TOLL_FREE     ; true
 FR     ; 11[59]         ; 3      ; EXPANDED_EMERGENCY ; TOLL_FREE
 FR     ; 116000         ; 6      ; EXPANDED_EMERGENCY ; TOLL_FREE     ;      ;                  ; "shortcode_3/3"
 FR     ; 116111         ; 6      ; EXPANDED_EMERGENCY ; TOLL_FREE     ;      ;                  ; "shortcode_3/3"
 FR     ; 118[0-689]     ; 6      ; COMMERCIAL         ; PREMIUM_RATE  ;      ;                  ; "shortcode_3/3"
 FR     ; 1187[0-689]    ; 6      ; COMMERCIAL         ; PREMIUM_RATE  ;      ;                  ; "shortcode_3/3"
 FR     ; 11877[0-689]   ; 6      ; COMMERCIAL         ; PREMIUM_RATE  ;      ;                  ; "shortcode_3/3"
 FR     ; 118777         ; 6      ; COMMERCIAL         ; PREMIUM_RATE  ;      ; true             ; "shortcode_3/3" ; "http://www.appel118.fr/detail.php\nhttp://www.comparer118.com/renseignements-telephoniques/annuaire-118777/"
 FR     ; 1[578]         ; 2      ; EMERGENCY          ; TOLL_FREE
 FR     ; 19[167]        ; 3      ; EXPANDED_EMERGENCY ; TOLL_FREE
 FR     ; 20000          ; 5      ; COMMERCIAL         ;               ;      ; true
 FR     ; 2020           ; 4      ; COMMERCIAL         ; STANDARD_RATE ;      ; true
 FR     ; 224            ; 3      ; COMMERCIAL         ; TOLL_FREE     ;      ; true
 FR     ; 3[01]          ; 4      ; COMMERCIAL         ; TOLL_FREE
 FR     ; 3[0-2457-9]    ; 5      ; COMMERCIAL         ;               ; true
 FR     ; 3[2-9]         ; 4      ; COMMERCIAL         ; PREMIUM_RATE
 FR     ; 33[0-689]      ; 5      ; COMMERCIAL         ;               ; true
 FR     ; 33700          ; 5      ; COMMERCIAL         ; TOLL_FREE     ; true
 FR     ; 3370[1-9]      ; 5      ; COMMERCIAL         ;               ; true
 FR     ; 337[1-9]       ; 5      ; COMMERCIAL         ;               ; true
 FR     ; 36[0-57-9]     ; 5      ; COMMERCIAL         ;               ; true
 FR     ; 366[0-57-9]    ; 5      ; COMMERCIAL         ;               ; true
 FR     ; 3666[0-46-9]   ; 5      ; COMMERCIAL         ;               ; true
 FR     ; 36665          ; 5      ; COMMERCIAL         ; PREMIUM_RATE  ; true
 FR     ; [4-8]          ; 5      ; COMMERCIAL         ; PREMIUM_RATE  ; true
 FR     ; 61[14]         ; 3      ; COMMERCIAL         ; STANDARD_RATE ;      ; true
 FR     ; 634            ; 3      ; COMMERCIAL         ; STANDARD_RATE ;      ; true
 FR     ; 70[06]         ; 3      ; COMMERCIAL         ; STANDARD_RATE ;      ; true
 FR     ; 722            ; 3      ; COMMERCIAL         ;               ;      ; true
 FR     ; 740            ; 3      ; COMMERCIAL         ; TOLL_FREE     ;      ; true
 Region ; Prefix       ; Length ; Type               ; Tariff        ; Sms  ; Carrier Specific ; Format          ; Provenance ; Comment
 FR     ; 10           ; 4      ; COMMERCIAL         ; PREMIUM_RATE  ;      ;                  ; "shortcode_4"   ; GOVERNMENT
 FR     ; 110          ; 3      ; COMMERCIAL         ; TOLL_FREE
 FR     ; 112          ; 3      ; EMERGENCY          ; TOLL_FREE
 FR     ; 114          ; 3      ; EXPANDED_EMERGENCY ; TOLL_FREE     ; true
 FR     ; 11[59]       ; 3      ; EXPANDED_EMERGENCY ; TOLL_FREE
 FR     ; 116000       ; 6      ; EXPANDED_EMERGENCY ; TOLL_FREE     ;      ;                  ; "shortcode_3/3"
 FR     ; 116111       ; 6      ; EXPANDED_EMERGENCY ; TOLL_FREE     ;      ;                  ; "shortcode_3/3"
 FR     ; 118[0-689]   ; 6      ; COMMERCIAL         ; PREMIUM_RATE  ;      ;                  ; "shortcode_3/3"
 FR     ; 1187[0-689]  ; 6      ; COMMERCIAL         ; PREMIUM_RATE  ;      ;                  ; "shortcode_3/3"
 FR     ; 11877[0-689] ; 6      ; COMMERCIAL         ; PREMIUM_RATE  ;      ;                  ; "shortcode_3/3"
 FR     ; 118777       ; 6      ; COMMERCIAL         ; PREMIUM_RATE  ;      ; true             ; "shortcode_3/3" ;            ; "http://www.appel118.fr/detail.php\nhttp://www.comparer118.com/renseignements-telephoniques/annuaire-118777/"
 FR     ; 1[578]       ; 2      ; EMERGENCY          ; TOLL_FREE
 FR     ; 19[167]      ; 3      ; EXPANDED_EMERGENCY ; TOLL_FREE
 FR     ; 20000        ; 5      ; COMMERCIAL         ;               ;      ; true
 FR     ; 2020         ; 4      ; COMMERCIAL         ; STANDARD_RATE ;      ; true
 FR     ; 224          ; 3      ; COMMERCIAL         ; TOLL_FREE     ;      ; true
 FR     ; 3[01]        ; 4      ; COMMERCIAL         ; TOLL_FREE
 FR     ; 3[0-2457-9]  ; 5      ; COMMERCIAL         ;               ; true
 FR     ; 3[2-9]       ; 4      ; COMMERCIAL         ; PREMIUM_RATE
 FR     ; 33[0-689]    ; 5      ; COMMERCIAL         ;               ; true
 FR     ; 33700        ; 5      ; COMMERCIAL         ; TOLL_FREE     ; true
 FR     ; 3370[1-9]    ; 5      ; COMMERCIAL         ;               ; true
 FR     ; 337[1-9]     ; 5      ; COMMERCIAL         ;               ; true
 FR     ; 36[0-57-9]   ; 5      ; COMMERCIAL         ;               ; true
 FR     ; 366[0-57-9]  ; 5      ; COMMERCIAL         ;               ; true
 FR     ; 3666[0-46-9] ; 5      ; COMMERCIAL         ;               ; true
 FR     ; 36665        ; 5      ; COMMERCIAL         ; PREMIUM_RATE  ; true
 FR     ; [4-8]        ; 5      ; COMMERCIAL         ; PREMIUM_RATE  ; true
 FR     ; 61[14]       ; 3      ; COMMERCIAL         ; STANDARD_RATE ;      ; true
 FR     ; 634          ; 3      ; COMMERCIAL         ; STANDARD_RATE ;      ; true
 FR     ; 70[06]       ; 3      ; COMMERCIAL         ; STANDARD_RATE ;      ; true
 FR     ; 722          ; 3      ; COMMERCIAL         ;               ;      ; true
 FR     ; 740          ; 3      ; COMMERCIAL         ; TOLL_FREE     ;      ; true
--- a/resources/metadata/61/ranges.csv
+++ b/resources/metadata/61/ranges.csv
@ -21336,8 +21336,8 @@ Prefix               ; Length ; Type       ; Tariff        ; Area Code Length ;
 479[01]              ; 9      ; MOBILE     ; STANDARD_RATE ;                  ; false         ; "optus"                     ; "mobile_3/3/3"  ; "Australia/Sydney"                                    ; "AU,CC,CX" ;                                                                                                                                                                                                                                                                                                                                                                                                                                                              ; IR21
 480[08]              ; 9      ; MOBILE     ; STANDARD_RATE ;                  ; false         ; "pivotel_satellite"         ; "mobile_3/3/3"  ; "Australia/Sydney"                                    ; "AU,CC,CX" ;                                                                                                                                                                                                                                                                                                                                                                                                                                                              ; GOVERNMENT
 480[13]              ; 9      ; MOBILE     ; STANDARD_RATE ;                  ; false         ; "telstra"                   ; "mobile_3/3/3"  ; "Australia/Sydney"                                    ; "AU,CC,CX" ;                                                                                                                                                                                                                                                                                                                                                                                                                                                              ; GOVERNMENT
 480[29]              ; 9      ; MOBILE     ; STANDARD_RATE ;                  ; false         ;                             ; "mobile_3/3/3"  ; "Australia/Sydney"                                    ; "AU,CC,CX" ;                                                                                                                                                                                                                                                                                                                                                                                                                                                              ; GOVERNMENT
 480[4-7]             ; 9      ; MOBILE     ; STANDARD_RATE ;                  ; false         ; "telstra"                   ; "mobile_3/3/3"  ; "Australia/Sydney"                                    ; "AU,CC,CX" ;                                                                                                                                                                                                                                                                                                                                                                                                                                                              ; IR21
 480[24-7]            ; 9      ; MOBILE     ; STANDARD_RATE ;                  ; false         ; "telstra"                   ; "mobile_3/3/3"  ; "Australia/Sydney"                                    ; "AU,CC,CX" ;                                                                                                                                                                                                                                                                                                                                                                                                                                                              ; IR21
 4809                 ; 9      ; MOBILE     ; STANDARD_RATE ;                  ; false         ;                             ; "mobile_3/3/3"  ; "Australia/Sydney"                                    ; "AU,CC,CX" ;                                                                                                                                                                                                                                                                                                                                                                                                                                                              ; GOVERNMENT
 48[12]               ; 9      ; MOBILE     ; STANDARD_RATE ;                  ; false         ; "optus"                     ; "mobile_3/3/3"  ; "Australia/Sydney"                                    ; "AU,CC,CX" ;                                                                                                                                                                                                                                                                                                                                                                                                                                                              ; IR21
 483[0-38]            ; 9      ; MOBILE     ; STANDARD_RATE ;                  ; false         ; "telstra"                   ; "mobile_3/3/3"  ; "Australia/Sydney"                                    ; "AU,CC,CX" ;                                                                                                                                                                                                                                                                                                                                                                                                                                                              ; GOVERNMENT
 4839                 ; 9      ; MOBILE     ; STANDARD_RATE ;                  ; false         ; "optus"                     ; "mobile_3/3/3"  ; "Australia/Sydney"                                    ; "AU,CC,CX" ;                                                                                                                                                                                                                                                                                                                                                                                                                                                              ; GOVERNMENT
--- a/resources/metadata/972/comments.csv
+++ b/resources/metadata/972/comments.csv
@ -8,6 +8,7 @@ IL     ; XML                 ; "in Hebrew"
 IL     ; XML                 ; "http://www.itu.int/oth/T020200006A/en"
 IL     ; XML                 ; "http://en.wikipedia.org/wiki/%2B972"
 IL     ; XML                 ; "http://he.wikipedia.org/wiki/%D7%A7%D7%99%D7%93%D7%95%D7%9E%D7%AA_%D7%98%D7%9C%D7%A4%D7%95%D7%9F_%D7%91%D7%99%D7%A9%D7%A8%D7%90%D7%9C"
 IL     ; XML                 ; "https://data.gov.il/dataset/israel-numbering-plan/resource/74b44725-d8cc-4ae9-ba08-2c40a61ab68e?filters="
 IL     ; XML_FIXED_LINE      ; "ITU doc states that 153 + NDC (either mobile or fixed-line) + SN corresponds to fax\nmail. As we do not have separate a fax category, fixedLine is the closest match and\nconsistent with some other countries. For maintainability, only NDC lengths are\nmentioned: one digit for fixed-line and two for mobile as per ITU."
 IL     ; XML_MOBILE          ; "The ITU document has only some of these prefixes - wikipedia lists more. We are fairly\nsure wikipedia is accurate based on news coverage of the launch of these numbers. Also\nadded 5570, 5571, and 5594 prefixes based on confirmations from the carriers. 559[23]\nranges belong to Telzar carrier as per confirmation from them. Prefix 5527 is added\nbased on user report."
 IL     ; XML_PREMIUM_RATE    ; "Peculiarly, one source states that 1956 and 1957 are the new premium rate prefixes.\nHowever, no online numbers starting with these prefixes can be found, and this data\nis not found in any other source."
--- a/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar
+++ b/tools/java/cpp-build/target/cpp-build-1.0-SNAPSHOT-jar-with-dependencies.jar
--- a/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar
+++ b/tools/java/java-build/target/java-build-1.0-SNAPSHOT-jar-with-dependencies.jar