Metadata updates for release 9.0.2 (#3841)

9 months ago · cdc3e8383c
--- 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/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/27_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/389_en
--- a/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/674_en
+++ b/java/carrier/src/com/google/i18n/phonenumbers/carrier/data/674_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1821_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1821_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/27_en
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/27_en
--- a/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
--- a/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
+++ b/java/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NR
--- 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/PhoneNumberMetadataProto_UZ
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UZ
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZA
--- a/javascript/i18n/phonenumbers/demo-compiled.js
+++ b/javascript/i18n/phonenumbers/demo-compiled.js
@ -351,11 +351,11 @@ CG:[,[,,"222\\d{6}|(?:0\\d|80)\\d{7}",,,,,,,[9]],[,,"222[1-589]\\d{5}",,,,"22212
 "$1 $2 $3",["9"],"0$1"]],[,,"66\\d{7}",,,,"662345678",,,[9]],,,[,,"140(?:1[035]|2[0346]|3[03568]|4[0356]|5[0358]|8[458])|140(?:1[16-8]|2[259]|3[124]|4[17-9]|5[124679]|7)\\d",,,,,,,[5,6]],[,,"140(?:1[035]|2[0346]|3[03568]|4[0356]|5[0358]|8[458])|(?:140(?:1[16-8]|2[259]|3[124]|4[17-9]|5[124679]|7)|8[478]\\d{6})\\d",,,,"14020",,,[5,6,9]],,,[,,,,,,,,,[-1]]],NO:[,[,,"(?:0|[2-9]\\d{3})\\d{4}",,,,,,,[5,8]],[,,"(?:2[1-4]|3[1-3578]|5[1-35-7]|6[1-4679]|7[0-8])\\d{6}",,,,"21234567",,,[8]],[,,"(?:4[015-8]|9\\d)\\d{6}",
 ,,,"40612345",,,[8]],[,,"80[01]\\d{5}",,,,"80012345",,,[8]],[,,"82[09]\\d{5}",,,,"82012345",,,[8]],[,,"810(?:0[0-6]|[2-8]\\d)\\d{3}",,,,"81021234",,,[8]],[,,"880\\d{5}",,,,"88012345",,,[8]],[,,"85[0-5]\\d{5}",,,,"85012345",,,[8]],"NO",47,"00",,,,,,,,[[,"(\\d{3})(\\d{2})(\\d{3})","$1 $2 $3",["8"]],[,"(\\d{2})(\\d{2})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[2-79]"]]],,[,,,,,,,,,[-1]],1,"[02-689]|7[0-8]",[,,,,,,,,,[-1]],[,,"(?:0[235-9]|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}",,,,"02000"],,,[,,"81[23]\\d{5}",
 ,,,"81212345",,,[8]]],NP:[,[,,"(?:1\\d|9)\\d{9}|[1-9]\\d{7}",,,,,,,[8,10,11],[6,7]],[,,"(?:1[0-6]\\d|99[02-6])\\d{5}|(?:2[13-79]|3[135-8]|4[146-9]|5[135-7]|6[13-9]|7[15-9]|8[1-46-9]|9[1-7])[2-6]\\d{5}",,,,"14567890",,,[8],[6,7]],[,,"9(?:00|6[0-3]|7[024-6]|8[0-24-68])\\d{7}",,,,"9841234567",,,[10]],[,,"1(?:66001|800\\d\\d)\\d{5}",,,,"16600101234",,,[11]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"NP",977,"00","0",,,"0",,,,[[,"(\\d)(\\d{7})","$1-$2",["1[2-6]"],"0$1"],[,"(\\d{2})(\\d{6})",
 "$1-$2",["1[01]|[2-8]|9(?:[1-59]|[67][2-6])"],"0$1"],[,"(\\d{3})(\\d{7})","$1-$2",["9"]],[,"(\\d{4})(\\d{2})(\\d{5})","$1-$2-$3",["1"]]],[[,"(\\d)(\\d{7})","$1-$2",["1[2-6]"],"0$1"],[,"(\\d{2})(\\d{6})","$1-$2",["1[01]|[2-8]|9(?:[1-59]|[67][2-6])"],"0$1"],[,"(\\d{3})(\\d{7})","$1-$2",["9"]]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],NR:[,[,,"(?:444|(?:55|8\\d)\\d|666)\\d{4}",,,,,,,[7]],[,,"444\\d{4}",,,,"4441234"],[,,"(?:55[3-9]|666|8\\d\\d)\\d{4}",,,,"5551234"],[,,,,,,
 ,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"NR",674,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[4-68]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],NU:[,[,,"(?:[4-7]|888\\d)\\d{3}",,,,,,,[4,7]],[,,"[47]\\d{3}",,,,"7012",,,[4]],[,,"(?:[56]|888[1-9])\\d{3}",,,,"8884012"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"NU",683,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["8"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],
 [,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],NZ:[,[,,"[1289]\\d{9}|50\\d{5}(?:\\d{2,3})?|[27-9]\\d{7,8}|(?:[34]\\d|6[0-35-9])\\d{6}|8\\d{4,6}",,,,,,,[5,6,7,8,9,10]],[,,"240\\d{5}|(?:3[2-79]|[49][2-9]|6[235-9]|7[2-57-9])\\d{6}",,,,"32345678",,,[8],[7]],[,,"2(?:[0-27-9]\\d|6)\\d{6,7}|2(?:1\\d|75)\\d{5}",,,,"211234567",,,[8,9,10]],[,,"508\\d{6,7}|80\\d{6,8}",,,,"800123456",,,[8,9,10]],[,,"(?:1[13-57-9]\\d{5}|50(?:0[08]|30|66|77|88))\\d{3}|90\\d{6,8}",,,,"900123456",,,[7,8,9,10]],[,,,,,,,,,[-1]],[,,"70\\d{7}",
 ,,,"701234567",,,[9]],[,,,,,,,,,[-1]],"NZ",64,"0(?:0|161)","0",,,"0",,"00",,[[,"(\\d{2})(\\d{3,8})","$1 $2",["8[1-79]"],"0$1"],[,"(\\d{3})(\\d{2})(\\d{2,3})","$1 $2 $3",["50[036-8]|8|90","50(?:[0367]|88)|8|90"],"0$1"],[,"(\\d)(\\d{3})(\\d{4})","$1 $2 $3",["24|[346]|7[2-57-9]|9[2-9]"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["2(?:10|74)|[589]"],"0$1"],[,"(\\d{2})(\\d{3,4})(\\d{4})","$1 $2 $3",["1|2[028]"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{3,5})","$1 $2 $3",["2(?:[169]|7[0-35-9])|7"],"0$1"]],
 ,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,"8(?:1[16-9]|22|3\\d|4[045]|5[459]|6[235-9]|7[0-3579]|90)\\d{2,7}",,,,"83012378"],,,[,,,,,,,,,[-1]]],OM:[,[,,"(?:1505|[279]\\d{3}|500)\\d{4}|800\\d{5,6}",,,,,,,[7,8,9]],[,,"2[1-6]\\d{6}",,,,"23123456",,,[8]],[,,"(?:1505|90[1-9]\\d)\\d{4}|(?:7[126-9]|9[1-9])\\d{6}",,,,"92123456",,,[8]],[,,"8007\\d{4,5}|(?:500|800[05])\\d{4}",,,,"80071234"],[,,"900\\d{5}",,,,"90012345",,,[8]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"OM",968,"00",,,,,,,,[[,"(\\d{3})(\\d{4,6})",
 "$1-$2",["1[01]|[2-8]|9(?:[1-59]|[67][2-6])"],"0$1"],[,"(\\d{3})(\\d{7})","$1-$2",["9"]],[,"(\\d{4})(\\d{2})(\\d{5})","$1-$2-$3",["1"]]],[[,"(\\d)(\\d{7})","$1-$2",["1[2-6]"],"0$1"],[,"(\\d{2})(\\d{6})","$1-$2",["1[01]|[2-8]|9(?:[1-59]|[67][2-6])"],"0$1"],[,"(\\d{3})(\\d{7})","$1-$2",["9"]]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],NR:[,[,,"(?:222|444|(?:55|8\\d)\\d|666|777|999)\\d{4}",,,,,,,[7]],[,,"444\\d{4}",,,,"4441234"],[,,"(?:222|55[3-9]|666|777|8\\d\\d|999)\\d{4}",
 ,,,"5551234"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"NR",674,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[24-9]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],NU:[,[,,"(?:[4-7]|888\\d)\\d{3}",,,,,,,[4,7]],[,,"[47]\\d{3}",,,,"7012",,,[4]],[,,"(?:[56]|888[1-9])\\d{3}",,,,"8884012"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"NU",683,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["8"]]],,[,,,,,,,,,[-1]],
 ,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],NZ:[,[,,"[1289]\\d{9}|50\\d{5}(?:\\d{2,3})?|[27-9]\\d{7,8}|(?:[34]\\d|6[0-35-9])\\d{6}|8\\d{4,6}",,,,,,,[5,6,7,8,9,10]],[,,"240\\d{5}|(?:3[2-79]|[49][2-9]|6[235-9]|7[2-57-9])\\d{6}",,,,"32345678",,,[8],[7]],[,,"2(?:[0-27-9]\\d|6)\\d{6,7}|2(?:1\\d|75)\\d{5}",,,,"211234567",,,[8,9,10]],[,,"508\\d{6,7}|80\\d{6,8}",,,,"800123456",,,[8,9,10]],[,,"(?:1[13-57-9]\\d{5}|50(?:0[08]|30|66|77|88))\\d{3}|90\\d{6,8}",,,,"900123456",,,[7,8,9,10]],[,,,,,,,,,[-1]],
 [,,"70\\d{7}",,,,"701234567",,,[9]],[,,,,,,,,,[-1]],"NZ",64,"0(?:0|161)","0",,,"0",,"00",,[[,"(\\d{2})(\\d{3,8})","$1 $2",["8[1-79]"],"0$1"],[,"(\\d{3})(\\d{2})(\\d{2,3})","$1 $2 $3",["50[036-8]|8|90","50(?:[0367]|88)|8|90"],"0$1"],[,"(\\d)(\\d{3})(\\d{4})","$1 $2 $3",["24|[346]|7[2-57-9]|9[2-9]"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3,4})","$1 $2 $3",["2(?:10|74)|[589]"],"0$1"],[,"(\\d{2})(\\d{3,4})(\\d{4})","$1 $2 $3",["1|2[028]"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{3,5})","$1 $2 $3",["2(?:[169]|7[0-35-9])|7"],
 "0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,"8(?:1[16-9]|22|3\\d|4[045]|5[459]|6[235-9]|7[0-3579]|90)\\d{2,7}",,,,"83012378"],,,[,,,,,,,,,[-1]]],OM:[,[,,"(?:1505|[279]\\d{3}|500)\\d{4}|800\\d{5,6}",,,,,,,[7,8,9]],[,,"2[1-6]\\d{6}",,,,"23123456",,,[8]],[,,"(?:1505|90[1-9]\\d)\\d{4}|(?:7[126-9]|9[1-9])\\d{6}",,,,"92123456",,,[8]],[,,"8007\\d{4,5}|(?:500|800[05])\\d{4}",,,,"80071234"],[,,"900\\d{5}",,,,"90012345",,,[8]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"OM",968,"00",,,,,,,,[[,"(\\d{3})(\\d{4,6})",
 "$1 $2",["[58]"]],[,"(\\d{2})(\\d{6})","$1 $2",["2"]],[,"(\\d{4})(\\d{4})","$1 $2",["[179]"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],PA:[,[,,"(?:00800|8\\d{3})\\d{6}|[68]\\d{7}|[1-57-9]\\d{6}",,,,,,,[7,8,10,11]],[,,"(?:1(?:0\\d|1[479]|2[37]|3[0137]|4[17]|5[05]|6[058]|7[0167]|8[2358]|9[1389])|2(?:[0235-79]\\d|1[0-7]|4[013-9]|8[02-9])|3(?:[07-9]\\d|1[0-7]|2[0-5]|33|4[0-79]|5[0-35]|6[068])|4(?:00|3[0-579]|4\\d|7[0-57-9])|5(?:[01]\\d|2[0-7]|[56]0|79)|7(?:0[09]|2[0-26-8]|3[03]|4[04]|5[05-9]|6[0156]|7[0-24-9]|8[5-9]|90)|8(?:09|2[89]|3\\d|4[0-24-689]|5[014]|8[02])|9(?:0[5-9]|1[0135-8]|2[036-9]|3[35-79]|40|5[0457-9]|6[05-9]|7[04-9]|8[35-8]|9\\d))\\d{4}",
 ,,,"2001234",,,[7]],[,,"(?:1[16]1|21[89]|6\\d{3}|8(?:1[01]|7[23]))\\d{4}",,,,"61234567",,,[7,8]],[,,"800\\d{4,5}|(?:00800|800\\d)\\d{6}",,,,"8001234"],[,,"(?:8(?:22|55|60|7[78]|86)|9(?:00|81))\\d{4}",,,,"8601234",,,[7]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"PA",507,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1-$2",["[1-57-9]"]],[,"(\\d{4})(\\d{4})","$1-$2",["[68]"]],[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["8"]]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],PE:[,[,,"(?:[14-8]|9\\d)\\d{7}",
 ,,,,,,[8,9],[6,7]],[,,"(?:(?:(?:4[34]|5[14])[0-8]|687)\\d|7(?:173|(?:3[0-8]|55)\\d)|8(?:10[05689]|6(?:0[06-9]|1[6-9]|29)|7(?:0[0569]|[56]0)))\\d{4}|(?:1[0-8]|4[12]|5[236]|6[1-7]|7[246]|8[2-4])\\d{6}",,,,"11234567",,,[8],[6,7]],[,,"9\\d{8}",,,,"912345678",,,[9]],[,,"800\\d{5}",,,,"80012345",,,[8]],[,,"805\\d{5}",,,,"80512345",,,[8]],[,,"801\\d{5}",,,,"80112345",,,[8]],[,,"80[24]\\d{5}",,,,"80212345",,,[8]],[,,,,,,,,,[-1]],"PE",51,"00|19(?:1[124]|77|90)00","0"," Anexo ",,"0",,"00",,[[,"(\\d{3})(\\d{5})",
@ -439,12 +439,12 @@ PT:[,[,,"1693\\d{5}|(?:[26-9]\\d|30)\\d{7}",,,,,,,[9]],[,,"2(?:[12]\\d|3[1-689]|
 ,,,"311234567",,,[9],[5,6,7]],[,,"790\\d{6}|(?: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\\d{5}|7(?:[015-8]\\d|2[067]|36|4[0-8]|9[089])\\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]],[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[0-468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|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[0135-79]|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[0-247]|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[0-468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|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[0135-79]|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[0-247]|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}",
 ,,,,,,[10],[7]],[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[0-468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|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[0135-79]|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[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[0168]|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[0-468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|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[0135-79]|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[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[0168]|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|[89]7))|(?: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-9]\\d)\\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])|[69]\\d\\d|7(?:[23]\\d|7[69]))|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|8[78]|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])))|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}",
 ,,,,,,[-1]]],UZ:[,[,,"(?:20|33|[5-9]\\d)\\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])|[69]\\d\\d|7(?:[23]\\d|7[69]))|7(?:0(?:5[4-9]|6[0146]|7[124-6]|9[135-8])|[168]\\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|8[78]|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])))|7(?:[07]\\d{3}|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}",
@ -461,7 +461,7 @@ PT:[,[,,"1693\\d{5}|(?:[26-9]\\d|30)\\d{7}",,,,,,,[9]],[,,"2(?:[12]\\d|3[1-689]|
 [,,"2\\d{7,8}|3\\d{7,11}|(?:4\\d\\d|[89]00)\\d{5}",,,,,,,[8,9,10,11,12]],[,,"38\\d{6,10}|(?:2[89]|39)(?:0\\d{5,6}|[1-9]\\d{5})",,,,"28012345"],[,,"4[3-9]\\d{6}",,,,"43201234",,,[8]],[,,"800\\d{5}",,,,"80001234",,,[8]],[,,"900\\d{5}",,,,"90001234",,,[8]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"XK",383,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{5})","$1 $2",["[89]"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{3})","$1 $2 $3",["[2-4]"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["2|39"],"0$1"],[,"(\\d{2})(\\d{7,10})",
 "$1 $2",["3"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],YE:[,[,,"(?:1|7\\d)\\d{7}|[1-7]\\d{6}",,,,,,,[7,8,9],[6]],[,,"78[0-7]\\d{4}|17\\d{6}|(?:[12][2-68]|3[2358]|4[2-58]|5[2-6]|6[3-58]|7[24-6])\\d{5}",,,,"1234567",,,[7,8],[6]],[,,"7[01378]\\d{7}",,,,"712345678",,,[9]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],"YE",967,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["[1-6]|7(?:[24-6]|8[0-7])"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3})",
 "$1 $2 $3",["7"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],YT:[,[,,"7093\\d{5}|(?:80|9\\d)\\d{7}|(?:26|63)9\\d{6}",,,,,,,[9]],[,,"269(?:0[0-467]|15|5[0-4]|6\\d|[78]0)\\d{4}",,,,"269601234"],[,,"(?:639(?:0[0-79]|1[019]|[267]\\d|3[09]|40|5[05-9]|9[04-79])|7093[5-7])\\d{4}",,,,"639012345"],[,,"80\\d{7}",,,,"801234567"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"9(?:(?:39|47)8[01]|769\\d)\\d{4}",,,,"939801234"],"YT",262,"00","0",,,"0",,,,,,[,,,,,,,,,[-1]],
 ,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],ZA:[,[,,"[1-79]\\d{8}|8\\d{4,9}",,,,,,,[5,6,7,8,9,10]],[,,"50[0-2]\\d{6}|(?:2(?:0330|4302)|52087)0\\d{3}|(?:1[0-8]|2[1-378]|3[1-69]|4\\d|5[1346-8])\\d{7}",,,,"101234567",,,[9]],[,,"(?:1(?:3492[0-25]|4495[0235]|549(?:20|5[01]))|4[34]492[01])\\d{3}|8[1-4]\\d{3,7}|(?:2[27]|47|54)4950\\d{3}|(?:1(?:049[2-4]|9[12]\\d\\d)|(?:6\\d\\d|7(?:[0-46-9]\\d|5[0-4]))\\d\\d|8(?:5\\d{3}|7(?:08[67]|158|28[5-9]|310)))\\d{4}|(?:1[6-8]|28|3[2-69]|4[025689]|5[36-8])4920\\d{3}|(?:12|[2-5]1)492\\d{4}",
 ,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],ZA:[,[,,"[1-79]\\d{8}|8\\d{4,9}",,,,,,,[5,6,7,8,9,10]],[,,"(?:2(?:0330|4302)|52087)0\\d{3}|(?:1[0-8]|2[1-378]|3[1-69]|4\\d|5[1346-8])\\d{7}",,,,"101234567",,,[9]],[,,"(?:1(?:3492[0-25]|4495[0235]|549(?:20|5[01]))|4[34]492[01])\\d{3}|8[1-4]\\d{3,7}|(?:2[27]|47|54)4950\\d{3}|(?:1(?:049[2-4]|9[12]\\d\\d)|(?:50[0-2]|6\\d\\d|7(?:[0-46-9]\\d|5[0-4]))\\d\\d|8(?:5\\d{3}|7(?:08[67]|158|28[5-9]|310)))\\d{4}|(?:1[6-8]|28|3[2-69]|4[025689]|5[36-8])4920\\d{3}|(?:12|[2-5]1)492\\d{4}",
 ,,,"711234567",,,[5,6,7,8,9]],[,,"80\\d{7}",,,,"801234567",,,[9]],[,,"(?:86[2-9]|9[0-2]\\d)\\d{6}",,,,"862345678",,,[9]],[,,"860\\d{6}",,,,"860123456",,,[9]],[,,,,,,,,,[-1]],[,,"87(?:08[0-589]|15[0-79]|28[0-4]|31[1-9])\\d{4}|87(?:[02][0-79]|1[0-46-9]|3[02-9]|[4-9]\\d)\\d{5}",,,,"871234567",,,[9]],"ZA",27,"00","0",,,"0",,,,[[,"(\\d{2})(\\d{3,4})","$1 $2",["8[1-4]"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{2,3})","$1 $2 $3",["8[1-4]"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["860"],"0$1"],[,"(\\d{2})(\\d{3})(\\d{4})",
 "$1 $2 $3",["[1-9]"],"0$1"],[,"(\\d{3})(\\d{3})(\\d{4})","$1 $2 $3",["8"],"0$1"]],,[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,"861\\d{6,7}",,,,"861123456",,,[9,10]],,,[,,,,,,,,,[-1]]],ZM:[,[,,"800\\d{6}|(?:21|[579]\\d|63)\\d{7}",,,,,,,[9],[6]],[,,"21[1-8]\\d{6}",,,,"211234567",,,,[6]],[,,"(?:[59][5-8]|7[5-9])\\d{7}",,,,"955123456"],[,,"800\\d{6}",,,,"800123456"],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],[,,"63\\d{7}",,,,"630123456"],"ZM",260,"00","0",,,"0",,,,[[,"(\\d{3})(\\d{3})","$1 $2",["[1-9]"]],
 [,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[28]"],"0$1"],[,"(\\d{2})(\\d{7})","$1 $2",["[579]"],"0$1"]],[[,"(\\d{3})(\\d{3})(\\d{3})","$1 $2 $3",["[28]"],"0$1"],[,"(\\d{2})(\\d{7})","$1 $2",["[579]"],"0$1"]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]],[,,,,,,,,,[-1]],,,[,,,,,,,,,[-1]]],ZW:[,[,,"2(?:[0-57-9]\\d{6,8}|6[0-24-9]\\d{6,7})|[38]\\d{9}|[35-8]\\d{8}|[3-6]\\d{7}|[1-689]\\d{6}|[1-3569]\\d{5}|[1356]\\d{4}",,,,,,,[5,6,7,8,9,10],[3,4]],[,,"(?:1(?:(?:3\\d|9)\\d|[4-8])|2(?:(?:(?:0(?:2[014]|5)|(?:2[0157]|31|84|9)\\d\\d|[56](?:[14]\\d\\d|20)|7(?:[089]|2[03]|[35]\\d\\d))\\d|4(?:2\\d\\d|8))\\d|1(?:2|[39]\\d{4}))|3(?:(?:123|(?:29\\d|92)\\d)\\d\\d|7(?:[19]|[56]\\d))|5(?:0|1[2-478]|26|[37]2|4(?:2\\d{3}|83)|5(?:25\\d\\d|[78])|[689]\\d)|6(?:(?:[16-8]21|28|52[013])\\d\\d|[39])|8(?:[1349]28|523)\\d\\d)\\d{3}|(?:4\\d\\d|9[2-9])\\d{4,5}|(?:(?:2(?:(?:(?:0|8[146])\\d|7[1-7])\\d|2(?:[278]\\d|92)|58(?:2\\d|3))|3(?:[26]|9\\d{3})|5(?:4\\d|5)\\d\\d)\\d|6(?:(?:(?:[0-246]|[78]\\d)\\d|37)\\d|5[2-8]))\\d\\d|(?:2(?:[569]\\d|8[2-57-9])|3(?:[013-59]\\d|8[37])|6[89]8)\\d{3}",
--- a/javascript/i18n/phonenumbers/metadata.js
+++ b/javascript/i18n/phonenumbers/metadata.js
@ -5623,10 +5623,10 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,,,,,,,,[-1]
 ]
 ]
 ,"NR":[,[,,"(?:444|(?:55|8\\d)\\d|666)\\d{4}",,,,,,,[7]
 ,"NR":[,[,,"(?:222|444|(?:55|8\\d)\\d|666|777|999)\\d{4}",,,,,,,[7]
 ]
 ,[,,"444\\d{4}",,,,"4441234"]
 ,[,,"(?:55[3-9]|666|8\\d\\d)\\d{4}",,,,"5551234"]
 ,[,,"(?:222|55[3-9]|666|777|8\\d\\d|999)\\d{4}",,,,"5551234"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
@ -5637,7 +5637,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
 ,"NR",674,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[4-68]"]
 ,"NR",674,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[24-9]"]
 ]
 ]
 ,,[,,,,,,,,,[-1]
@ -7600,9 +7600,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"US":[,[,,"[2-9]\\d{9}|3\\d{6}",,,,,,,[10]
 ,[7]
 ]
 ,[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[0-468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|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[0135-79]|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[0-247]|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[0-468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|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[0135-79]|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[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[0168]|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[0-468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|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[0135-79]|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[0-247]|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[0-468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|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[0135-79]|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[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[0168]|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"]
@ -7672,8 +7672,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"UZ":[,[,,"(?:20|33|[5-9]\\d)\\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])|[69]\\d\\d|7(?:[23]\\d|7[69]))|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|8[78]|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])))|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"]
 ,[,,"(?: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])|[69]\\d\\d|7(?:[23]\\d|7[69]))|7(?:0(?:5[4-9]|6[0146]|7[124-6]|9[135-8])|[168]\\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|8[78]|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])))|7(?:[07]\\d{3}|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]
@ -8048,9 +8048,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"ZA":[,[,,"[1-79]\\d{8}|8\\d{4,9}",,,,,,,[5,6,7,8,9,10]
 ]
 ,[,,"50[0-2]\\d{6}|(?:2(?:0330|4302)|52087)0\\d{3}|(?:1[0-8]|2[1-378]|3[1-69]|4\\d|5[1346-8])\\d{7}",,,,"101234567",,,[9]
 ,[,,"(?:2(?:0330|4302)|52087)0\\d{3}|(?:1[0-8]|2[1-378]|3[1-69]|4\\d|5[1346-8])\\d{7}",,,,"101234567",,,[9]
 ]
 ,[,,"(?:1(?:3492[0-25]|4495[0235]|549(?:20|5[01]))|4[34]492[01])\\d{3}|8[1-4]\\d{3,7}|(?:2[27]|47|54)4950\\d{3}|(?:1(?:049[2-4]|9[12]\\d\\d)|(?:6\\d\\d|7(?:[0-46-9]\\d|5[0-4]))\\d\\d|8(?:5\\d{3}|7(?:08[67]|158|28[5-9]|310)))\\d{4}|(?:1[6-8]|28|3[2-69]|4[025689]|5[36-8])4920\\d{3}|(?:12|[2-5]1)492\\d{4}",,,,"711234567",,,[5,6,7,8,9]
 ,[,,"(?:1(?:3492[0-25]|4495[0235]|549(?:20|5[01]))|4[34]492[01])\\d{3}|8[1-4]\\d{3,7}|(?:2[27]|47|54)4950\\d{3}|(?:1(?:049[2-4]|9[12]\\d\\d)|(?:50[0-2]|6\\d\\d|7(?:[0-46-9]\\d|5[0-4]))\\d\\d|8(?:5\\d{3}|7(?:08[67]|158|28[5-9]|310)))\\d{4}|(?:1[6-8]|28|3[2-69]|4[025689]|5[36-8])4920\\d{3}|(?:12|[2-5]1)492\\d{4}",,,,"711234567",,,[5,6,7,8,9]
 ]
 ,[,,"80\\d{7}",,,,"801234567",,,[9]
 ]
--- a/javascript/i18n/phonenumbers/metadatalite.js
+++ b/javascript/i18n/phonenumbers/metadatalite.js
@ -5623,10 +5623,10 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,,[,,,,,,,,,[-1]
 ]
 ]
 ,"NR":[,[,,"(?:444|(?:55|8\\d)\\d|666)\\d{4}",,,,,,,[7]
 ,"NR":[,[,,"(?:222|444|(?:55|8\\d)\\d|666|777|999)\\d{4}",,,,,,,[7]
 ]
 ,[,,"444\\d{4}"]
 ,[,,"(?:55[3-9]|666|8\\d\\d)\\d{4}"]
 ,[,,"(?:222|55[3-9]|666|777|8\\d\\d|999)\\d{4}"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
@ -5637,7 +5637,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,[,,,,,,,,,[-1]
 ]
 ,"NR",674,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[4-68]"]
 ,"NR",674,"00",,,,,,,,[[,"(\\d{3})(\\d{4})","$1 $2",["[24-9]"]
 ]
 ]
 ,,[,,,,,,,,,[-1]
@ -7600,9 +7600,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"US":[,[,,"[2-9]\\d{9}|3\\d{6}",,,,,,,[10]
 ,[7]
 ]
 ,[,,"(?:3052(?:0[0-8]|[1-9]\\d)|5056(?:[0-35-9]\\d|4[0-468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|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[0135-79]|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[0-247]|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[0-468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|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[0135-79]|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[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[0168]|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[0-468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|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[0135-79]|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[0-247]|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[0-468]))\\d{4}|(?:2742|305[3-9]|472[247-9]|505[2-57-9]|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[0135-79]|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[0-247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[0168]|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}"]
@ -7672,8 +7672,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"UZ":[,[,,"(?:20|33|[5-9]\\d)\\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])|[69]\\d\\d|7(?:[23]\\d|7[69]))|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}"]
 ,[,,"(?:(?:[25]0|33|8[78]|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])))|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}"]
 ,[,,"(?: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])|[69]\\d\\d|7(?:[23]\\d|7[69]))|7(?:0(?:5[4-9]|6[0146]|7[124-6]|9[135-8])|[168]\\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}"]
 ,[,,"(?:(?:[25]0|33|8[78]|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])))|7(?:[07]\\d{3}|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}"]
 ,[,,,,,,,,,[-1]
 ]
 ,[,,,,,,,,,[-1]
@ -8048,9 +8048,9 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"ZA":[,[,,"[1-79]\\d{8}|8\\d{4,9}",,,,,,,[5,6,7,8,9,10]
 ]
 ,[,,"50[0-2]\\d{6}|(?:2(?:0330|4302)|52087)0\\d{3}|(?:1[0-8]|2[1-378]|3[1-69]|4\\d|5[1346-8])\\d{7}",,,,,,,[9]
 ,[,,"(?:2(?:0330|4302)|52087)0\\d{3}|(?:1[0-8]|2[1-378]|3[1-69]|4\\d|5[1346-8])\\d{7}",,,,,,,[9]
 ]
 ,[,,"(?:1(?:3492[0-25]|4495[0235]|549(?:20|5[01]))|4[34]492[01])\\d{3}|8[1-4]\\d{3,7}|(?:2[27]|47|54)4950\\d{3}|(?:1(?:049[2-4]|9[12]\\d\\d)|(?:6\\d\\d|7(?:[0-46-9]\\d|5[0-4]))\\d\\d|8(?:5\\d{3}|7(?:08[67]|158|28[5-9]|310)))\\d{4}|(?:1[6-8]|28|3[2-69]|4[025689]|5[36-8])4920\\d{3}|(?:12|[2-5]1)492\\d{4}",,,,,,,[5,6,7,8,9]
 ,[,,"(?:1(?:3492[0-25]|4495[0235]|549(?:20|5[01]))|4[34]492[01])\\d{3}|8[1-4]\\d{3,7}|(?:2[27]|47|54)4950\\d{3}|(?:1(?:049[2-4]|9[12]\\d\\d)|(?:50[0-2]|6\\d\\d|7(?:[0-46-9]\\d|5[0-4]))\\d\\d|8(?:5\\d{3}|7(?:08[67]|158|28[5-9]|310)))\\d{4}|(?:1[6-8]|28|3[2-69]|4[025689]|5[36-8])4920\\d{3}|(?:12|[2-5]1)492\\d{4}",,,,,,,[5,6,7,8,9]
 ]
 ,[,,"80\\d{7}",,,,,,,[9]
 ]
--- a/metadata/metadata.zip
+++ b/metadata/metadata.zip
--- a/release_notes.txt
+++ b/release_notes.txt
@ -1,3 +1,12 @@
 Mar 27, 2025: v9.0.2
 Metadata changes:
 - Updated phone metadata for region code(s): NR, US, UZ, ZA
 - New geocoding data for country calling code(s): 1821 (en)
 - Updated geocoding data for country calling code(s): 27 (en)
 - Updated carrier data for country calling code(s):
   27 (en), 389 (en), 674 (en)
 - Updated / refreshed time zone meta data.

 Mar 13, 2025: v9.0.1
 Metadata changes:
 - Updated phone metadata for region code(s): AR, MM, SG, US, ZM
--- a/resources/PhoneNumberMetadata.xml
+++ b/resources/PhoneNumberMetadata.xml
@ -11149,7 +11149,7 @@
        </nationalNumberPattern>
      </generalDesc>
      <!-- Gabon has undergone renumbering in November 2019 where the prefix 01 is changed to 011;
           and intial "0" is no more needed when dialled internationally. Thus they become 7 digit
           and initial "0" is no more needed when dialled internationally. Thus they become 7 digit
           to 8 digit excluding 0. -->
      <!-- About numbers in older version, which may soon get invalid:
           A 7-digit fixed-line plan was scheduled to be implemented on June 17, 2012 to unify fixed
@ -11163,7 +11163,7 @@
        <nationalNumberPattern>[01]1\d{6}</nationalNumberPattern>
      </fixedLine>
      <!-- Gabon has undergone renumbering in November 2019 where the prefixes 0[256] are changed
           to 6[256] respectively and similarly 0[47] changed to 7[47]. The intial "0" is no more
           to 6[256] respectively and similarly 0[47] changed to 7[47]. The initial "0" is no more
           needed when dialled internationally. Thus they become 7 digit to 8 digit excluding 0. -->
      <!-- About old numbers, which may soon get invalid: Mobile numbers can be 7 or 8 digits
           (with or without a leading zero). -->
@ -16909,8 +16909,8 @@
    <!-- https://www.itu.int/oth/T020200006D/en -->
    <!-- http://www.numberingplans.com/?page=dialling&sub=areacodes&ac=JP -->
    <!-- nationalPrefixTransformRule is used here for purpose of capturing 0005999999 kind of
         short codes without dropping intial '0' as national prefix. As we are using this field, the
         library is unable to capture domestic carrier codes used, example input:
         short codes without dropping initial '0' as national prefix. As we are using this field,
         the library is unable to capture domestic carrier codes used, example input:
         003768-0XX-YYYY-ZZZZ. Due to historic reasons, the parts that we captured in
         nationalPrefixTransform rule can either be used to transform or to capture in fields like
         preferred_domestic_carrier_code; schema is designed this way. -->
@ -23551,19 +23551,22 @@
    <territory id="NR" countryCode="674" internationalPrefix="00">
      <availableFormats>
        <numberFormat pattern="(\d{3})(\d{4})">
          <leadingDigits>[4-68]</leadingDigits>
          <leadingDigits>[24-9]</leadingDigits>
          <format>$1 $2</format>
        </numberFormat>
      </availableFormats>
      <generalDesc>
        <nationalNumberPattern>
          (?:
            222|
            444|
            (?:
              55|
              8\d
            )\d|
            666
            666|
            777|
            999
          )\d{4}
        </nationalNumberPattern>
      </generalDesc>
@ -23577,9 +23580,12 @@
        <exampleNumber>5551234</exampleNumber>
        <nationalNumberPattern>
          (?:
            222|
            55[3-9]|
            666|
            8\d\d
            777|
            8\d\d|
            999
          )\d{4}
        </nationalNumberPattern>
      </mobile>
@ -29865,7 +29871,7 @@
            8(?:
              0[1-68]|
              1[02-8]|
              2[068]|
              2[0168]|
              3[0-2589]|
              4[03578]|
              5[046-9]|
@ -29975,7 +29981,7 @@
            8(?:
              0[1-68]|
              1[02-8]|
              2[068]|
              2[0168]|
              3[0-2589]|
              4[03578]|
              5[046-9]|
@ -30221,10 +30227,7 @@
                7[124-6]|
                9[135-8]
              )|
              (?:
                1[12]|
                [68]\d
              )\d|
              [168]\d\d|
              2(?:
                22|
                3[13-57-9]|
@ -30363,16 +30366,6 @@
            )|
            7(?:
              [07]\d{3}|
              1(?:
                13[01]|
                6(?:
                  0[47]|
                  1[67]|
                  66
                )|
                71[3-69]|
                98\d
              )|
              2(?:
                2(?:
                  2[79]|
@ -31689,7 +31682,6 @@
        <possibleLengths national="9"/>
        <exampleNumber>101234567</exampleNumber>
        <nationalNumberPattern>
          50[0-2]\d{6}|
          (?:
            2(?:
              0330|
@ -31741,6 +31733,7 @@
              9[12]\d\d
            )|
            (?:
              50[0-2]|
              6\d\d|
              7(?:
                [0-46-9]\d|
--- a/resources/carrier/en/27.txt
+++ b/resources/carrier/en/27.txt
@ -1,23 +1,3 @@
 # Copyright (C) 2013 The Libphonenumber Authors

 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at

 # http://www.apache.org/licenses/LICENSE-2.0

 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 # The carrier prefixes were added according to the Wikipedia page
 # http://en.wikipedia.org/wiki/Telephone_numbers_in_South_Africa
 # and the open-source bugs
 # https://github.com/google/libphonenumber/issues/489
 # https://github.com/google/libphonenumber/issues/1242

 2710492|Vodacom
 2710493|Vodacom
 2710494|Vodacom
@ -60,6 +40,7 @@
 27474950|Vodacom
 27484920|Vodacom
 27494920|Vodacom
 2750|Rain
 2751492|Vodacom
 27544950|Vodacom
 27564920|Vodacom
--- a/resources/carrier/en/389.txt
+++ b/resources/carrier/en/389.txt
@ -22,8 +22,14 @@
 38970|T-Mobile
 38971|T-Mobile
 38972|T-Mobile
 38973|A1
 389731|A1
 389732|A1
 389733|A1
 389734|A1
 389735|A1
 389736|T-Mobile
 389737|MTEL
 389738|MTEL
 389742|T-Mobile
 3897421|Mobik
 389746|T-Mobile
--- a/resources/carrier/en/674.txt
+++ b/resources/carrier/en/674.txt
@ -16,6 +16,7 @@
 # Federated States of Micronesia Telecommunications Corporation brand name is
 # FSM Telecom.

 6742|NEOTEL
 674553|Digicel
 674554|Digicel
 674556|Digicel
@ -23,4 +24,6 @@
 674558|Digicel
 674559|Digicel
 6746|Digicel
 6748|FSM Telecom
 6747|NEOTEL
 6748|NEOTEL
 6749|NEOTEL
--- a/resources/geocoding/en/1.txt
+++ b/resources/geocoding/en/1.txt
@ -26080,6 +26080,7 @@
 1819985|Thurso, QC
 1819986|Gatineau, QC
 1820|California
 1821|South Carolina
 1825|Alberta
 1826|Virginia
 1828|North Carolina
--- a/resources/geocoding/en/27.txt
+++ b/resources/geocoding/en/27.txt
@ -50,7 +50,6 @@
 2747|Butterworth/Eastern part of Eastern Cape/Mthatha
 2748|Cradock/Northern part of Eastern Cape/Steynsburg
 2749|Graaff-Reinet/Western part of Eastern Cape
 2750|Aliwal North/Bloemfontein/Far eastern part of Eastern Cape/Southern and Central Free State
 2751|Aliwal North/Bloemfontein/Far eastern part of Eastern Cape/Southern and Central Free State
 2753|Eastern part of Northern Cape/Far western part of North West/Kimberley/Kuruman
 2754|Upington/Gordonia
--- a/resources/metadata/1/ranges.csv
+++ b/resources/metadata/1/ranges.csv
@ -29628,6 +29628,7 @@ Prefix             ; Length ; Type                 ; Tariff        ; Area Code L
 819985             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Toronto"                            ; "CA"                                                                         ; "Thurso, QC"
 819986             ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Toronto"                            ; "CA"                                                                         ; "Gatineau, QC"
 8[24]0[2-9]        ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Los_Angeles"                        ; "US"                                                                         ; "California"
 821[2-9]           ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "South Carolina"                            ; GOVERNMENT
 825[2-9]           ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/Edmonton"                           ; "CA"                                                                         ; "Alberta"
 826[2-9]           ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "Virginia"
 82820              ; 10     ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; 3                ;                                    ; "fmt_3/3/4" ; "America/New_York"                           ; "US"                                                                         ; "North Carolina"
--- a/resources/metadata/241/comments.csv
+++ b/resources/metadata/241/comments.csv
@ -4,8 +4,8 @@ GA     ; SC             ; "www.arcep.ga"
 GA     ; XML            ; "Note: We cannot set nationalPrefix=""0"" while fixed line numbers can start with a zero\nas this breaks parsing (it treats all leading zeros as national prefixes."
 GA     ; XML            ; "http://www.itu.int/oth/T020200004E/en"
 GA     ; XML            ; "http://www.arcep.ga"
 GA     ; XML_FIXED_LINE ; "Gabon has undergone renumbering in November 2019 where the prefix 01 is changed to 011;\nand intial ""0"" is no more needed when dialled internationally. Thus they become 7 digit\nto 8 digit excluding 0."
 GA     ; XML_FIXED_LINE ; "Gabon has undergone renumbering in November 2019 where the prefix 01 is changed to 011;\nand initial ""0"" is no more needed when dialled internationally. Thus they become 7 digit\nto 8 digit excluding 0."
 GA     ; XML_FIXED_LINE ; "About numbers in older version, which may soon get invalid:\nA 7-digit fixed-line plan was scheduled to be implemented on June 17, 2012 to unify fixed\nline and mobile numbering. However, this has only partially happened; mobile numbers can\nnow be dialed without a leading zero, but fixed line numbers still require it. Their own\nwebsite still lists fixed line numbers as ""+241 01 44 68 11"" and upon ringing they will\nnot connect from outside the country without the 0. This was last tested March 2014."
 GA     ; XML_MOBILE     ; "Gabon has undergone renumbering in November 2019 where the prefixes 0[256] are changed\nto 6[256] respectively and similarly 0[47] changed to 7[47]. The intial ""0"" is no more\nneeded when dialled internationally. Thus they become 7 digit to 8 digit excluding 0."
 GA     ; XML_MOBILE     ; "Gabon has undergone renumbering in November 2019 where the prefixes 0[256] are changed\nto 6[256] respectively and similarly 0[47] changed to 7[47]. The initial ""0"" is no more\nneeded when dialled internationally. Thus they become 7 digit to 8 digit excluding 0."
 GA     ; XML_MOBILE     ; "About old numbers, which may soon get invalid: Mobile numbers can be 7 or 8 digits\n(with or without a leading zero)."
 GA     ; XML_MOBILE     ; "Prefix 7658 is added based on user report."
--- a/resources/metadata/27/operators.csv
+++ b/resources/metadata/27/operators.csv
@ -1,6 +1,7 @@
 Id            ; Name:en
 cell_c        ; "Cell C"
 mtn           ; "MTN"
 rain          ; "Rain"
 telafrica     ; "TelAfrica (Wirles Connect)"
 telkom_mobile ; "Telkom Mobile"
 vodacom       ; "Vodacom"
--- a/resources/metadata/27/ranges.csv
+++ b/resources/metadata/27/ranges.csv
@ -224,7 +224,7 @@ Prefix        ; Length ; Type                 ; Tariff        ; Operator
 494920        ; 9      ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "vodacom"       ; "all_types_2/3/4"  ; "ZA"    ; "Graaff-Reinet/Western part of Eastern Cape"
 49492[1-9]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Graaff-Reinet/Western part of Eastern Cape"                                                    ;            ; "Fillup To Support Master Range"
 49[568]       ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Graaff-Reinet/Western part of Eastern Cape"                                                    ;            ; "Fillup To Support Master Range"
 50[0-2]       ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Aliwal North/Bloemfontein/Far eastern part of Eastern Cape/Southern and Central Free State"    ; GOVERNMENT
 50[0-2]       ; 9      ; MOBILE               ; STANDARD_RATE ; "rain"          ; "all_types_2/3/4"  ; "ZA"    ;                                                                                                 ; IR21
 51[0-3589]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Aliwal North/Bloemfontein/Far eastern part of Eastern Cape/Southern and Central Free State"    ; GOVERNMENT
 514[0-578]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Aliwal North/Bloemfontein/Far eastern part of Eastern Cape/Southern and Central Free State"    ;            ; "Fillup To Support Master Range"
 5146          ; 9      ; FIXED_LINE           ; STANDARD_RATE ;                 ; "all_types_2/3/4"  ; "ZA"    ; "Aliwal North/Bloemfontein/Far eastern part of Eastern Cape/Southern and Central Free State"    ; GOVERNMENT
@ -308,7 +308,7 @@ Prefix        ; Length ; Type                 ; Tariff        ; Operator
 81[1-57]      ; 9      ; MOBILE               ; STANDARD_RATE ; "telkom_mobile" ; "all_types_2/3/4"  ; "ZA"    ;                                                                                                 ; IR21       ; "IR21 dated 1/9/2019 (all 81x are 9 digits)"
 816           ; 5,6    ; MOBILE               ; STANDARD_RATE ; "wbs_mobile"    ; "mobile_2/3-4"     ; "ZA"
 816           ; 7,8    ; MOBILE               ; STANDARD_RATE ; "wbs_mobile"    ; "mobile_2/3/2-3"   ; "ZA"
 816           ; 9      ; MOBILE               ; STANDARD_RATE ; "wbs_mobile"    ; "all_types_2/3/4"  ; "ZA"    ;                                                                                                 ; IR21       ; "IR21 dated 10/30/2017 (all 816 are 9 digits)"
 816           ; 9      ; MOBILE               ; STANDARD_RATE ; "wbs_mobile"    ; "all_types_2/3/4"  ; "ZA"    ;                                                                                                 ; IR21
 818           ; 5,6    ; MOBILE               ; STANDARD_RATE ; "vodacom"       ; "mobile_2/3-4"     ; "ZA"
 818           ; 7,8    ; MOBILE               ; STANDARD_RATE ; "vodacom"       ; "mobile_2/3/2-3"   ; "ZA"
 818           ; 9      ; MOBILE               ; STANDARD_RATE ; "vodacom"       ; "all_types_2/3/4"  ; "ZA"    ;                                                                                                 ; IR21       ; "IR21 dated 12/11/2018 (all 818 are 9 digits)"
--- a/resources/metadata/33/ranges.csv
+++ b/resources/metadata/33/ranges.csv
@ -421,9 +421,8 @@ Prefix         ; Length ; Type       ; Tariff        ; Operator
 801[4-6]       ; 9      ; FIXED_LINE ; TOLL_FREE     ;                                ; "varcost_3/2/2/2" ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 8017[0-6]      ; 9      ; FIXED_LINE ; TOLL_FREE     ;                                ; "varcost_3/2/2/2" ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 8017[7-9]      ; 9      ; FIXED_LINE ; TOLL_FREE     ;                                ; "varcost_3/2/2/2" ; "FR"    ; GOVERNMENT
 8018[0-589]    ; 9      ; FIXED_LINE ; TOLL_FREE     ;                                ; "varcost_3/2/2/2" ; "FR"    ; GOVERNMENT
 8018[0-57-9]   ; 9      ; FIXED_LINE ; TOLL_FREE     ;                                ; "varcost_3/2/2/2" ; "FR"    ; GOVERNMENT
 80186          ; 9      ; FIXED_LINE ; TOLL_FREE     ;                                ; "varcost_3/2/2/2" ; "FR"
 80187          ; 9      ; FIXED_LINE ; TOLL_FREE     ;                                ; "varcost_3/2/2/2" ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 80190          ; 9      ; FIXED_LINE ; TOLL_FREE     ;                                ; "varcost_3/2/2/2" ; "FR"    ; GOVERNMENT
 8019[1-9]      ; 9      ; FIXED_LINE ; TOLL_FREE     ;                                ; "varcost_3/2/2/2" ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 80[24]         ; 9      ; FIXED_LINE ; TOLL_FREE     ;                                ; "varcost_3/2/2/2" ; "FR"    ;            ; "FILLUP TO SUPPORT MASTER RANGE"
--- a/resources/metadata/353/ranges.csv
+++ b/resources/metadata/353/ranges.csv
@ -459,8 +459,8 @@ Prefix          ; Length ; Type            ; Tariff        ; Area Code Length ;
 412[2-9]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Drogheda"                                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 414[02-9]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Drogheda"                                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 4141[0-35-9]    ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Drogheda"                                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 41414[03-9]     ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Drogheda"                                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 41414[12]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Drogheda"                                        ; GOVERNMENT
 41414[04-9]     ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Drogheda"                                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 41414[1-3]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Drogheda"                                        ; GOVERNMENT
 416[0-79]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Ardee"                                           ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 4168[024-689]   ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Ardee"                                           ; GOVERNMENT
 41681           ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Ardee"                                           ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@ -551,8 +551,8 @@ Prefix          ; Length ; Type            ; Tariff        ; Area Code Length ;
 432             ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Longford"                                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 433[0-2]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Longford"                                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 4333[07]        ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Longford"                                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 43331[01]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Longford"                                        ; GOVERNMENT
 43331[2-9]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Longford"                                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 43331[0-2]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Longford"                                        ; GOVERNMENT
 43331[3-9]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Longford"                                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 4333[245]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Longford"                                        ; GOVERNMENT
 43333[0-24-9]   ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Longford"                                        ; GOVERNMENT
 433333          ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Longford"                                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@ -856,10 +856,8 @@ Prefix          ; Length ; Type            ; Tariff        ; Area Code Length ;
 50455           ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 3                ; false         ;                     ; "fixed_3/5"         ;                                                    ; "IE"    ; "Thurles"                                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 50460[0-8]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 3                ; false         ;                     ; "fixed_3/5"         ;                                                    ; "IE"    ; "Thurles"                                         ; GOVERNMENT
 504609          ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 3                ; false         ;                     ; "fixed_3/5"         ;                                                    ; "IE"    ; "Thurles"                                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 5046[1248]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 3                ; false         ;                     ; "fixed_3/5"         ;                                                    ; "IE"    ; "Thurles"                                         ; GOVERNMENT
 5046[12478]     ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 3                ; false         ;                     ; "fixed_3/5"         ;                                                    ; "IE"    ; "Thurles"                                         ; GOVERNMENT
 5046[3569]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 3                ; false         ;                     ; "fixed_3/5"         ;                                                    ; "IE"    ; "Thurles"                                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 50467[0-79]     ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 3                ; false         ;                     ; "fixed_3/5"         ;                                                    ; "IE"    ; "Thurles"                                         ; GOVERNMENT
 504678          ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 3                ; false         ;                     ; "fixed_3/5"         ;                                                    ; "IE"    ; "Thurles"                                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 5047[0-35-9]    ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 3                ; false         ;                     ; "fixed_3/5"         ;                                                    ; "IE"    ; "Thurles"                                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 50474[0-7]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 3                ; false         ;                     ; "fixed_3/5"         ;                                                    ; "IE"    ; "Thurles"                                         ; GOVERNMENT
 50474[89]       ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 3                ; false         ;                     ; "fixed_3/5"         ;                                                    ; "IE"    ; "Thurles"                                         ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@ -905,10 +903,10 @@ Prefix          ; Length ; Type            ; Tariff        ; Area Code Length ;
 5151[04]        ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Waterford"                                       ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 5151[1-35-9]    ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Waterford"                                       ; GOVERNMENT
 515[2-4]        ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Waterford"                                       ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 5155[01347]     ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Waterford"                                       ; GOVERNMENT
 5155[013478]    ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Waterford"                                       ; GOVERNMENT
 51552[0-3]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Waterford"                                       ; GOVERNMENT
 51552[4-9]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Waterford"                                       ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 5155[5689]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Waterford"                                       ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 5155[569]       ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Waterford"                                       ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 516[0148]       ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carrick-on-Suir"                                 ; GOVERNMENT
 5162[0-46]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carrick-on-Suir"                                 ; GOVERNMENT
 51625[0-69]     ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Carrick-on-Suir"                                 ; GOVERNMENT
@ -1244,8 +1242,8 @@ Prefix          ; Length ; Type            ; Tariff        ; Area Code Length ;
 615[079]        ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Limerick"                                        ; GOVERNMENT
 61510           ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Limerick"                                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 6151[1-9]       ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Limerick"                                        ; GOVERNMENT
 6152[08]        ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Limerick"                                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 6152[1-79]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Limerick"                                        ; GOVERNMENT
 6152[0-79]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Limerick"                                        ; GOVERNMENT
 61528           ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Limerick"                                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 6153[02-9]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Limerick"                                        ; GOVERNMENT
 61531           ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Limerick"                                        ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 615[48][0-8]    ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Limerick"                                        ; GOVERNMENT
@ -1544,8 +1542,8 @@ Prefix          ; Length ; Type            ; Tariff        ; Area Code Length ;
 719329[0-79]    ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Sligo"                                           ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 7193298         ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Sligo"                                           ; GOVERNMENT
 71933[0-245]    ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Sligo"                                           ; GOVERNMENT
 71933[36]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Sligo/Manorhamilton/Carrick-on-Shannon"          ; GOVERNMENT
 71933[7-9]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Sligo/Manorhamilton/Carrick-on-Shannon"          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 71933[367]      ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Sligo/Manorhamilton/Carrick-on-Shannon"          ; GOVERNMENT
 71933[89]       ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Sligo/Manorhamilton/Carrick-on-Shannon"          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 719340          ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Sligo/Manorhamilton/Carrick-on-Shannon"          ; GOVERNMENT
 71934[1-35-9]   ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Sligo/Manorhamilton/Carrick-on-Shannon"          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 719344          ; 9      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Sligo"                                           ; GOVERNMENT
@ -1762,8 +1760,8 @@ Prefix          ; Length ; Type            ; Tariff        ; Area Code Length ;
 8186[0-27-9]    ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 81863[0-8]      ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 818639          ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ; GOVERNMENT
 81864[0-57-9]   ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 818646          ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ; GOVERNMENT
 81864[0-2457-9] ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 81864[36]       ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ; GOVERNMENT
 818650          ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ; GOVERNMENT
 81865[1-9]      ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 81866[0-35689]  ; 9      ; UAN             ; STANDARD_RATE ;                  ; false         ;                     ; "uan_3/3/3"         ;                                                    ; "IE"    ;                                                   ;            ; "FILLUP TO SUPPORT MASTER RANGE"
@ -1965,8 +1963,8 @@ Prefix          ; Length ; Type            ; Tariff        ; Area Code Length ;
 91342[0-6]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Galway"                                          ; GOVERNMENT
 91342[7-9]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Galway"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 91349           ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Galway"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 9135[0568]      ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Galway"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 9135[1-479]     ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Galway"                                          ; GOVERNMENT
 9135[0-479]     ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Galway"                                          ; GOVERNMENT
 9135[568]       ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Galway"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 91370           ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Galway"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 9137[1-9]       ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Galway"                                          ; GOVERNMENT
 9139[01]        ; 8      ; FIXED_LINE      ; STANDARD_RATE ; 2                ; false         ;                     ; "fixed_2/3/3-4"     ;                                                    ; "IE"    ; "Galway"                                          ;            ; "FILLUP TO SUPPORT MASTER RANGE"
--- a/resources/metadata/389/operators.csv
+++ b/resources/metadata/389/operators.csv
@ -2,5 +2,6 @@ Id          ; Name:en
 a1          ; "A1"
 lyca_mobile ; "Lyca Mobile"
 mobik       ; "Mobik"
 mtel        ; "MTEL"
 t_mobile    ; "T-Mobile"
 telekabel   ; "Telekabel"
--- a/resources/metadata/389/ranges.csv
+++ b/resources/metadata/389/ranges.csv
@ -144,11 +144,13 @@ Prefix       ; Length ; Type       ; Tariff        ; Area Code Length ; Operator
 5            ; 8      ; FIXED_LINE ; PREMIUM_RATE  ;                  ;               ; "var_cost_3/1/2/2" ; "MK"    ;                                       ; GOVERNMENT
 7[0-2]       ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "t_mobile"    ; "fmt1_2/3/3"       ; "MK"    ;                                       ; ITU
 731          ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "a1"          ; "fmt1_2/3/3"       ; "MK"
 73[2378]     ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "a1"          ; "fmt1_2/3/3"       ; "MK"    ;                                       ; IR21
 73[23]       ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "a1"          ; "fmt1_2/3/3"       ; "MK"    ;                                       ; IR21
 734[04]      ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "a1"          ; "fmt1_2/3/3"       ; "MK"    ;                                       ; IR21
 734[1-35-9]  ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "a1"          ; "fmt1_2/3/3"       ; "MK"    ;                                       ;            ; "FILLUP TO SUPPORT MASTER RANGE"
 73555        ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "a1"          ; "fmt1_2/3/3"       ; "MK"    ;                                       ; IR21
 736[01]      ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "t_mobile"    ; "fmt1_2/3/3"       ; "MK"    ;                                       ; GOVERNMENT
 737          ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "mtel"        ; "fmt1_2/3/3"       ; "MK"    ;                                       ; TELECOMS
 738          ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "mtel"        ; "fmt1_2/3/3"       ; "MK"    ;                                       ; IR21
 742[02-9]    ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "t_mobile"    ; "fmt1_2/3/3"       ; "MK"    ;                                       ; IR21
 7421         ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "mobik"       ; "fmt1_2/3/3"       ; "MK"    ;                                       ; ITU
 7460         ; 8      ; MOBILE     ; STANDARD_RATE ;                  ; "t_mobile"    ; "fmt1_2/3/3"       ; "MK"    ;                                       ; IR21
--- a/resources/metadata/674/operators.csv
+++ b/resources/metadata/674/operators.csv
@ -1,3 +1,3 @@
 Id      ; Name:en
 digicel ; "Digicel"
 fsmtc   ; "FSM Telecom"
 neotel  ; "NEOTEL"
--- a/resources/metadata/674/ranges.csv
+++ b/resources/metadata/674/ranges.csv
@ -1,6 +1,9 @@
 Prefix    ; Length ; Type       ; Tariff        ; Operator  ; Format     ; Regions ; Provenance
 222       ; 7      ; MOBILE     ; STANDARD_RATE ; "neotel"  ; "fmt1_3/4" ; "NR"    ; IR21
 444       ; 7      ; FIXED_LINE ; STANDARD_RATE ;           ; "fmt1_3/4" ; "NR"    ; ITU
 55[346-9] ; 7      ; MOBILE     ; STANDARD_RATE ; "digicel" ; "fmt1_3/4" ; "NR"    ; IR21
 555       ; 7      ; MOBILE     ; STANDARD_RATE ;           ; "fmt1_3/4" ; "NR"    ; ITU
 666       ; 7      ; MOBILE     ; STANDARD_RATE ; "digicel" ; "fmt1_3/4" ; "NR"    ; IR21
 8         ; 7      ; MOBILE     ; STANDARD_RATE ; "fsmtc"   ; "fmt1_3/4" ; "NR"    ; IR21
 777       ; 7      ; MOBILE     ; STANDARD_RATE ; "neotel"  ; "fmt1_3/4" ; "NR"    ; IR21
 8         ; 7      ; MOBILE     ; STANDARD_RATE ; "neotel"  ; "fmt1_3/4" ; "NR"    ; IR21
 999       ; 7      ; MOBILE     ; STANDARD_RATE ; "neotel"  ; "fmt1_3/4" ; "NR"    ; IR21
--- a/resources/metadata/81/comments.csv
+++ b/resources/metadata/81/comments.csv
@ -5,7 +5,7 @@ JP     ; SC_SMS_SERVICES               ; "As per confirmations from the carrier
 JP     ; XML                           ; "http://www.soumu.go.jp/main_sosiki/joho_tsusin/top/tel_number/number_shitei.html"
 JP     ; XML                           ; "https://www.itu.int/oth/T020200006D/en"
 JP     ; XML                           ; "http://www.numberingplans.com/?page=dialling&sub=areacodes&ac=JP"
 JP     ; XML                           ; "nationalPrefixTransformRule is used here for purpose of capturing 0005999999 kind of\nshort codes without dropping intial '0' as national prefix. As we are using this field, the\nlibrary is unable to capture domestic carrier codes used, example input:\n003768-0XX-YYYY-ZZZZ. Due to historic reasons, the parts that we captured in\nnationalPrefixTransform rule can either be used to transform or to capture in fields like\npreferred_domestic_carrier_code; schema is designed this way."
 JP     ; XML                           ; "nationalPrefixTransformRule is used here for purpose of capturing 0005999999 kind of\nshort codes without dropping initial '0' as national prefix. As we are using this field,\nthe library is unable to capture domestic carrier codes used, example input:\n003768-0XX-YYYY-ZZZZ. Due to historic reasons, the parts that we captured in\nnationalPrefixTransform rule can either be used to transform or to capture in fields like\npreferred_domestic_carrier_code; schema is designed this way."
 JP     ; XML_NO_INTERNATIONAL_DIALLING ; "Toll-free numbers with a leading ""00"" cannot be dialled internationally."
 JP     ; XML_TOLL_FREE                 ; "http://www.kddi.com/english/business/free_call_dx/number.html and\nhttp://tm.softbank.jp/english/business/phone_service/freecall_sp/index.html\nhttp://eonet.jp/home/denwa/service/access.html\nhttp://ci.fusioncom.co.jp/feature/\nhttp://www.auhikari.jp/service/tel/connection/index.html"
 JP     ; XML_TOLL_FREE                 ; "Note that in fact, the number length for 0037 and 0066 numbers should extend to 21\ndigits, confirmed with Yahoo JP. However, this extends well beyond the maximum number\nlength allowed by ITU and hence our library, so we only allow numbers up to 17 digits\nfor now (including both leading 00s)."
--- a/resources/metadata/998/ranges.csv
+++ b/resources/metadata/998/ranges.csv
@ -104,15 +104,7 @@ Prefix         ; Length ; Type                 ; Tariff        ; Operator    ; F
 707[124-6]     ; 9      ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "mobiuz"    ; "fmt_2/3/2/2" ; "UZ"
 709[0249]      ; 9      ; MOBILE               ; STANDARD_RATE ; "mobiuz"    ; "fmt_2/3/2/2" ; "UZ"
 709[135-8]     ; 9      ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "mobiuz"    ; "fmt_2/3/2/2" ; "UZ"
 711[0-24-9]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;             ; "fmt_2/3/2/2" ; "UZ"
 7113[01]       ; 9      ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ;             ; "fmt_2/3/2/2" ; "UZ"
 7113[2-9]      ; 9      ; FIXED_LINE           ; STANDARD_RATE ;             ; "fmt_2/3/2/2" ; "UZ"
 712            ; 9      ; FIXED_LINE           ; STANDARD_RATE ;             ; "fmt_2/3/2/2" ; "UZ"
 7160[47]       ; 9      ; MOBILE               ; STANDARD_RATE ;             ; "fmt_2/3/2/2" ; "UZ"
 7161[67]       ; 9      ; MOBILE               ; STANDARD_RATE ;             ; "fmt_2/3/2/2" ; "UZ"
 71666          ; 9      ; MOBILE               ; STANDARD_RATE ;             ; "fmt_2/3/2/2" ; "UZ"
 7171[3-69]     ; 9      ; MOBILE               ; STANDARD_RATE ;             ; "fmt_2/3/2/2" ; "UZ"
 7198           ; 9      ; MOBILE               ; STANDARD_RATE ;             ; "fmt_2/3/2/2" ; "UZ"
 7[16]          ; 9      ; FIXED_LINE           ; STANDARD_RATE ;             ; "fmt_2/3/2/2" ; "UZ"    ; ITU
 7222[0-68]     ; 9      ; FIXED_LINE           ; STANDARD_RATE ;             ; "fmt_2/3/2/2" ; "UZ"
 7222[79]       ; 9      ; FIXED_LINE_OR_MOBILE ; STANDARD_RATE ; "mobiuz"    ; "fmt_2/3/2/2" ; "UZ"
 72295          ; 9      ; MOBILE               ; STANDARD_RATE ; "mobiuz"    ; "fmt_2/3/2/2" ; "UZ"
@ -200,7 +192,6 @@ Prefix         ; Length ; Type                 ; Tariff        ; Operator    ; F
 757[5-7]       ; 9      ; MOBILE               ; STANDARD_RATE ; "mobiuz"    ; "fmt_2/3/2/2" ; "UZ"
 7578[78]       ; 9      ; MOBILE               ; STANDARD_RATE ; "mobiuz"    ; "fmt_2/3/2/2" ; "UZ"
 7579[079]      ; 9      ; MOBILE               ; STANDARD_RATE ; "mobiuz"    ; "fmt_2/3/2/2" ; "UZ"
 76             ; 9      ; FIXED_LINE           ; STANDARD_RATE ;             ; "fmt_2/3/2/2" ; "UZ"    ; ITU
 77             ; 9      ; MOBILE               ; STANDARD_RATE ; "uzmobile"  ; "fmt_2/3/2/2" ; "UZ"    ; IR21
 78             ; 9      ; FIXED_LINE           ; STANDARD_RATE ;             ; "fmt_2/3/2/2" ; "UZ"    ;            ; "Confirmed the block 78 as FIXED per the IR21 Ucell Contact details"
 7922[03-79]    ; 9      ; FIXED_LINE           ; STANDARD_RATE ;             ; "fmt_2/3/2/2" ; "UZ"
--- a/resources/timezones/map_data.txt
+++ b/resources/timezones/map_data.txt
@ -1639,6 +1639,7 @@
 1818|America/Los_Angeles
 1819|America/Toronto
 1820|America/Los_Angeles
 1821|America/New_York
 1825|America/Edmonton
 1826|America/New_York
 1828|America/New_York
--- 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