diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
index 7c8cf06b7..5ad849eb9 100644
--- a/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
+++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java
@@ -31,10 +31,10 @@ public class CountryCodeToRegionCodeMap {
   // countries sharing a calling code, such as the NANPA countries, the one
   // indicated with "isMainCountryForCode" in the metadata should be first.
   static Map<Integer, List<String>> getCountryCodeToRegionCodeMap() {
-    // The capacity is set to 282 as there are 212 different country codes,
+    // The capacity is set to 284 as there are 213 different country codes,
     // and this offers a load factor of roughly 0.75.
     Map<Integer, List<String>> countryCodeToRegionCodeMap =
-        new HashMap<Integer, List<String>>(282);
+        new HashMap<Integer, List<String>>(284);
 
     ArrayList<String> listWithRegionCode;
 
@@ -811,6 +811,10 @@ public class CountryCodeToRegionCodeMap {
     listWithRegionCode.add("001");
     countryCodeToRegionCodeMap.put(870, listWithRegionCode);
 
+    listWithRegionCode = new ArrayList<String>(1);
+    listWithRegionCode.add("001");
+    countryCodeToRegionCodeMap.put(878, listWithRegionCode);
+
     listWithRegionCode = new ArrayList<String>(1);
     listWithRegionCode.add("BD");
     countryCodeToRegionCodeMap.put(880, listWithRegionCode);
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_878 b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_878
new file mode 100644
index 000000000..205a57952
Binary files /dev/null and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_878 differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH
index 9cc62646a..ebf37a24d 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BH differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR
index de374d101..1d7752e89 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE
index 5b8327611..192c17518 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EE differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO
index b6a16d978..de03296d3 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW
index cf386eeab..1f9be5889 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA
index bb616c299..5ee5bdc9f 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA
index 5648f1c53..4c54b7a62 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_QA differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI
index 6b2549658..fd2af8a38 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SI differ
diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH
index 545ddc013..881a9a5ed 100644
Binary files a/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH and b/java/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TH differ
diff --git a/java/release_notes.txt b/java/release_notes.txt
index 8a61a9dd0..2e9d0997d 100644
--- a/java/release_notes.txt
+++ b/java/release_notes.txt
@@ -1,3 +1,8 @@
+May 16th, 2012: libphonenumber-4.8.2
+* Metadata update only:
+ - BH, CR, EE, JO, KW, LA, QA, SI, TH
+ - Non-geographical entity with calling code 878 (VISIONng)
+
 May 8th, 2012: libphonenumber-4.8.1
 * Metadata update only:
  - CA, CI, EG, HK, IN, IR, LB, MA, ME, MM
diff --git a/javascript/i18n/phonenumbers/metadata.js b/javascript/i18n/phonenumbers/metadata.js
index 84a3a92c6..feaa37b60 100644
--- a/javascript/i18n/phonenumbers/metadata.js
+++ b/javascript/i18n/phonenumbers/metadata.js
@@ -215,6 +215,7 @@ i18n.phonenumbers.metadata.countryCodeToRegionCodeMap = {
 ,855:["KH"]
 ,856:["LA"]
 ,870:["001"]
+,878:["001"]
 ,880:["BD"]
 ,883:["001"]
 ,886:["TW"]
@@ -718,7 +719,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"BH":[,[,,"[136-9]\\d{7}","\\d{8}"]
 ,[,,"(?:1(?:3[3-6]|6[0156]|7\\d)\\d|6(?:1[16]\\d|6(?:0\\d|3[12]|44)|9(?:69|9[6-9]))|77\\d{2})\\d{4}","\\d{8}",,,"17001234"]
-,[,,"(?:3(?:[23469]\\d|77|8[348])\\d|6(?:1[16]\\d|6(?:[06]\\d|3[03-9]|44)|9(?:69|9[6-9]))|77\\d{2})\\d{4}","\\d{8}",,,"36001234"]
+,[,,"(?:3(?:[23469]\\d|5[35]|77|8[348])\\d|6(?:1[16]\\d|6(?:[06]\\d|3[03-9]|44)|9(?:69|9[6-9]))|77\\d{2})\\d{4}","\\d{8}",,,"36001234"]
 ,[,,"80\\d{6}","\\d{8}",,,"80123456"]
 ,[,,"(?:87|9[014578])\\d{6}","\\d{8}",,,"90123456"]
 ,[,,"84\\d{6}","\\d{8}",,,"84123456"]
@@ -1228,7 +1229,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"90[059]\\d{7}","\\d{10}",,,"9001234567"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,[,,"210[0-6]\\d{4}|40(?:[04]0\\d{4}|10[0-3]\\d{3}|2(?:00\\d|900)\\d{2}|3[01]\\d{4}|5\\d{5}|70[01]\\d{3})|5100\\d{4}","\\d{8}",,,"40001234"]
+,[,,"210[0-6]\\d{4}|4(?:0(?:[04]0\\d{4}|10[0-3]\\d{3}|2(?:00\\d|900)\\d{2}|3[01]\\d{4}|5\\d{5}|70[01]\\d{3})|1[01]\\d{5})|5100\\d{4}","\\d{8}",,,"40001234"]
 ,"CR",506,"00",,,,"(19(?:0[0-2468]|19|66|77))",,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[24-7]|8[3-9]"]
 ,"","$CC $1",0]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["[89]0"]
@@ -1488,7 +1489,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,[,,"1(?:0[12]|12)|911","\\d{3}",,,"911"]
 ,[,,"NA","NA"]
 ]
-,"EE":[,[,,"[3-9]\\d{6,7}|800\\d{6,7}","\\d{7,10}"]
+,"EE":[,[,,"1\\d{3,4}|[3-9]\\d{6,7}|800\\d{6,7}","\\d{4,10}"]
 ,[,,"(?:3[23589]|4(?:0\\d|[3-8])|6\\d|7[1-9]|88)\\d{5}","\\d{7,8}",,,"3212345"]
 ,[,,"(?:5\\d|8[1-5])\\d{6}|5(?:[02]\\d{2}|1(?:[0-8]\\d|95)|5[0-478]\\d|64[0-4]|65[1-589])\\d{3}","\\d{7,8}",,,"51234567"]
 ,[,,"800(?:0\\d{3}|1\\d|[2-9])\\d{3}","\\d{7,10}",,,"80012345"]
@@ -1506,8 +1507,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"","",0]
 ]
 ,,[,,"NA","NA"]
-,,,[,,"800[2-9]\\d{3}","\\d{7}",,,"8002123"]
-,[,,"NA","NA"]
+,,,[,,"1\\d{3,4}|800[2-9]\\d{3}","\\d{4,7}",,,"8002123"]
+,[,,"1(?:2[01245]|3[0-6]|4[1-489]|5[0-59]|6[1-46-9]|7[0-27-9]|8[189]|9[012])\\d{1,2}","\\d{4,5}",,,"12123"]
 ,,[,,"11[02]","\\d{3}",,,"112"]
 ,[,,"NA","NA"]
 ]
@@ -2400,7 +2401,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"JO":[,[,,"[235-9]\\d{7,8}","\\d{7,9}"]
 ,[,,"(?:2(?:6(?:2[0-35-9]|3[0-57-8]|4[24-7]|5[0-24-8]|[6-9][02])|7(?:0[1-79]|10|2[014-7]|3[0-689]|4[019]|5[0-3578]))|32(?:0[1-69]|1[1-35-7]|2[024-7]|3\\d|[457][02]|60)|53(?:[013][02]|2[0-59]|49|5[0-35-9]|6[15]|7[45]|8[1-6]|9[0-36-9])|6(?:2[50]0|300|4(?:0[0125]|1[2-7]|2[0569]|[38][07-9]|4[025689]|6[0-589]|7\\d|9[0-2])|5(?:[01][056]|2[034]|3[0-57-9]|4[17-8]|5[0-69]|6[0-35-9]|7[1-379]|8[0-68]|9[02-39])|)|87(?:[02]0|7[08]|9[09]))\\d{4}","\\d{7,8}",,,"62001234"]
-,[,,"7(?:45|5\\d|7[2-79]|8[5-8]|9[035-9])\\d{6}","\\d{9}",,,"790123456"]
+,[,,"7(?:5\\d|7[2-79]|8[5-8]|9[035-9])\\d{6}","\\d{9}",,,"790123456"]
 ,[,,"80\\d{6}","\\d{8}",,,"80012345"]
 ,[,,"900\\d{5}","\\d{8}",,,"90012345"]
 ,[,,"85\\d{6}","\\d{8}",,,"85012345"]
@@ -2625,7 +2626,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"KW":[,[,,"[12569]\\d{6,7}|65816\\d{6}","\\d{7,8}|\\d{11}"]
 ,[,,"(?:18\\d|2(?:[23]\\d{2}|4[1-35-9]\\d|5(?:0[034]|[2-46]\\d|5[1-3]|7[1-7])))\\d{4}","\\d{7,8}",,,"22345678"]
-,[,,"(?:5(?:0[0-2568]|5\\d)|6(?:0[034679]|5(?:[015-79]|8(?:[02-9]|1[0-57-9]))|6\\d|7[067]|9[69])|9(?:0[09]|4[049]|66|[79]\\d))\\d{5}","\\d{8}",,,"50012345"]
+,[,,"(?:5(?:0[0-2568]|5\\d)|6(?:0[034679]|5(?:[015-79]|8(?:[02-9]|1[0-57-9]))|6\\d|7[067]|9[69])|9(?:0[09]|4[049]|6[69]|[79]\\d))\\d{5}","\\d{8}",,,"50012345"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -2674,7 +2675,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"LA":[,[,,"[2-8]\\d{7,9}","\\d{6,10}"]
 ,[,,"(?:2[13]|[35-7][14]|41|8[1468])\\d{6}","\\d{6,8}",,,"21212862"]
-,[,,"20(?:2[23]|5[4-68]|7[78]|9[7-9])\\d{6}","\\d{10}",,,"2023123456"]
+,[,,"20(?:2[238]|5[4-68]|7[78]|9[7-9])\\d{6}","\\d{10}",,,"2023123456"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -3876,7 +3877,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"QA":[,[,,"[2-8]\\d{6,7}","\\d{7,8}"]
-,[,,"44\\d{6}","\\d{7,8}",,,"44123456"]
+,[,,"4[04]\\d{6}","\\d{7,8}",,,"44123456"]
 ,[,,"[3567]\\d{7}","\\d{7,8}",,,"33123456"]
 ,[,,"800\\d{4}","\\d{7,8}",,,"8001234"]
 ,[,,"NA","NA"]
@@ -4159,14 +4160,14 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"SI":[,[,,"[1-7]\\d{6,7}|[89]\\d{4,7}","\\d{5,8}"]
-,[,,"(?:1\\d|2[2-8]|3[4-8]|4[24-8]|[57][3-8])\\d{6}","\\d{7,8}",,,"11234567"]
+,[,,"(?:1\\d|[25][2-8]|3[4-8]|4[24-8]|7[3-8])\\d{6}","\\d{7,8}",,,"11234567"]
 ,[,,"(?:[37][01]|4[019]|51|6[48])\\d{6}","\\d{8}",,,"31234567"]
 ,[,,"80\\d{4,6}","\\d{6,8}",,,"80123456"]
 ,[,,"90\\d{4,6}|89[1-3]\\d{2,5}","\\d{5,8}",,,"90123456"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"(?:59|8[1-3])\\d{6}","\\d{8}",,,"59012345"]
-,"SI",386,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[12]|3[4-8]|4[24-8]|5[3-8]|7[3-8]"]
+,"SI",386,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[12]|3[4-8]|4[24-8]|5[2-8]|7[3-8]"]
 ,"(0$1)","",0]
 ,[,"([3-7]\\d)(\\d{3})(\\d{3})","$1 $2 $3",["[37][01]|4[019]|51|6"]
 ,"0$1","",0]
@@ -4479,9 +4480,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"60\\d{7}","\\d{9}",,,"601234567"]
 ,"TH",66,"00","0",,,"0",,,,[[,"(2)(\\d{3})(\\d{4})","$1 $2 $3",["2"]
 ,"0$1","",0]
-,[,"([3-7]\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["[3-7]"]
-,"0$1","",0]
-,[,"([89])(\\d{4})(\\d{4})","$1 $2 $3",["[89]"]
+,[,"([3-9]\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["[3-9]"]
 ,"0$1","",0]
 ,[,"(1[89]00)(\\d{3})(\\d{3})","$1 $2 $3",["1"]
 ,"$1","",0]
@@ -5107,6 +5106,22 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ]
+,"878":[,[,,"1\\d{11}","\\d{12}",,,"101234567890"]
+,[,,"NA","NA",,,"101234567890"]
+,[,,"NA","NA",,,"101234567890"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"10\\d{10}","\\d{12}",,,"101234567890"]
+,"001",878,"",,,,,,,1,[[,"(\\d{2})(\\d{5})(\\d{5})","$1 $2 $3",,"","",0]
+]
+,,[,,"NA","NA"]
+,,,[,,"NA","NA"]
+,[,,"NA","NA"]
+,,[,,"NA","NA"]
+,[,,"NA","NA"]
+]
 ,"883":[,[,,"51\\d{7}(?:\\d{3})?","\\d{9}(?:\\d{3})?",,,"510012345"]
 ,[,,"NA","NA",,,"510012345"]
 ,[,,"NA","NA",,,"510012345"]
diff --git a/javascript/i18n/phonenumbers/metadatalite.js b/javascript/i18n/phonenumbers/metadatalite.js
index fd45f0a1a..5ce881459 100644
--- a/javascript/i18n/phonenumbers/metadatalite.js
+++ b/javascript/i18n/phonenumbers/metadatalite.js
@@ -215,6 +215,7 @@ i18n.phonenumbers.metadata.countryCodeToRegionCodeMap = {
 ,855:["KH"]
 ,856:["LA"]
 ,870:["001"]
+,878:["001"]
 ,880:["BD"]
 ,883:["001"]
 ,886:["TW"]
@@ -718,7 +719,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"BH":[,[,,"[136-9]\\d{7}","\\d{8}"]
 ,[,,"(?:1(?:3[3-6]|6[0156]|7\\d)\\d|6(?:1[16]\\d|6(?:0\\d|3[12]|44)|9(?:69|9[6-9]))|77\\d{2})\\d{4}","\\d{8}"]
-,[,,"(?:3(?:[23469]\\d|77|8[348])\\d|6(?:1[16]\\d|6(?:[06]\\d|3[03-9]|44)|9(?:69|9[6-9]))|77\\d{2})\\d{4}","\\d{8}"]
+,[,,"(?:3(?:[23469]\\d|5[35]|77|8[348])\\d|6(?:1[16]\\d|6(?:[06]\\d|3[03-9]|44)|9(?:69|9[6-9]))|77\\d{2})\\d{4}","\\d{8}"]
 ,[,,"80\\d{6}","\\d{8}"]
 ,[,,"(?:87|9[014578])\\d{6}","\\d{8}"]
 ,[,,"84\\d{6}","\\d{8}"]
@@ -1228,7 +1229,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"90[059]\\d{7}","\\d{10}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
-,[,,"210[0-6]\\d{4}|40(?:[04]0\\d{4}|10[0-3]\\d{3}|2(?:00\\d|900)\\d{2}|3[01]\\d{4}|5\\d{5}|70[01]\\d{3})|5100\\d{4}","\\d{8}"]
+,[,,"210[0-6]\\d{4}|4(?:0(?:[04]0\\d{4}|10[0-3]\\d{3}|2(?:00\\d|900)\\d{2}|3[01]\\d{4}|5\\d{5}|70[01]\\d{3})|1[01]\\d{5})|5100\\d{4}","\\d{8}"]
 ,"CR",506,"00",,,,"(19(?:0[0-2468]|19|66|77))",,,,[[,"(\\d{4})(\\d{4})","$1 $2",["[24-7]|8[3-9]"]
 ,"","$CC $1",0]
 ,[,"(\\d{3})(\\d{3})(\\d{4})","$1-$2-$3",["[89]0"]
@@ -1488,7 +1489,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,[,,"1(?:0[12]|12)|911","\\d{3}"]
 ,[,,"NA","NA"]
 ]
-,"EE":[,[,,"[3-9]\\d{6,7}|800\\d{6,7}","\\d{7,10}"]
+,"EE":[,[,,"1\\d{3,4}|[3-9]\\d{6,7}|800\\d{6,7}","\\d{4,10}"]
 ,[,,"(?:3[23589]|4(?:0\\d|[3-8])|6\\d|7[1-9]|88)\\d{5}","\\d{7,8}"]
 ,[,,"(?:5\\d|8[1-5])\\d{6}|5(?:[02]\\d{2}|1(?:[0-8]\\d|95)|5[0-478]\\d|64[0-4]|65[1-589])\\d{3}","\\d{7,8}"]
 ,[,,"800(?:0\\d{3}|1\\d|[2-9])\\d{3}","\\d{7,10}"]
@@ -1506,8 +1507,8 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,"","",0]
 ]
 ,,[,,"NA","NA"]
-,,,[,,"800[2-9]\\d{3}","\\d{7}"]
-,[,,"NA","NA"]
+,,,[,,"1\\d{3,4}|800[2-9]\\d{3}","\\d{4,7}"]
+,[,,"1(?:2[01245]|3[0-6]|4[1-489]|5[0-59]|6[1-46-9]|7[0-27-9]|8[189]|9[012])\\d{1,2}","\\d{4,5}"]
 ,,[,,"11[02]","\\d{3}"]
 ,[,,"NA","NA"]
 ]
@@ -2400,7 +2401,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"JO":[,[,,"[235-9]\\d{7,8}","\\d{7,9}"]
 ,[,,"(?:2(?:6(?:2[0-35-9]|3[0-57-8]|4[24-7]|5[0-24-8]|[6-9][02])|7(?:0[1-79]|10|2[014-7]|3[0-689]|4[019]|5[0-3578]))|32(?:0[1-69]|1[1-35-7]|2[024-7]|3\\d|[457][02]|60)|53(?:[013][02]|2[0-59]|49|5[0-35-9]|6[15]|7[45]|8[1-6]|9[0-36-9])|6(?:2[50]0|300|4(?:0[0125]|1[2-7]|2[0569]|[38][07-9]|4[025689]|6[0-589]|7\\d|9[0-2])|5(?:[01][056]|2[034]|3[0-57-9]|4[17-8]|5[0-69]|6[0-35-9]|7[1-379]|8[0-68]|9[02-39])|)|87(?:[02]0|7[08]|9[09]))\\d{4}","\\d{7,8}"]
-,[,,"7(?:45|5\\d|7[2-79]|8[5-8]|9[035-9])\\d{6}","\\d{9}"]
+,[,,"7(?:5\\d|7[2-79]|8[5-8]|9[035-9])\\d{6}","\\d{9}"]
 ,[,,"80\\d{6}","\\d{8}"]
 ,[,,"900\\d{5}","\\d{8}"]
 ,[,,"85\\d{6}","\\d{8}"]
@@ -2625,7 +2626,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"KW":[,[,,"[12569]\\d{6,7}|65816\\d{6}","\\d{7,8}|\\d{11}"]
 ,[,,"(?:18\\d|2(?:[23]\\d{2}|4[1-35-9]\\d|5(?:0[034]|[2-46]\\d|5[1-3]|7[1-7])))\\d{4}","\\d{7,8}"]
-,[,,"(?:5(?:0[0-2568]|5\\d)|6(?:0[034679]|5(?:[015-79]|8(?:[02-9]|1[0-57-9]))|6\\d|7[067]|9[69])|9(?:0[09]|4[049]|66|[79]\\d))\\d{5}","\\d{8}"]
+,[,,"(?:5(?:0[0-2568]|5\\d)|6(?:0[034679]|5(?:[015-79]|8(?:[02-9]|1[0-57-9]))|6\\d|7[067]|9[69])|9(?:0[09]|4[049]|6[69]|[79]\\d))\\d{5}","\\d{8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -2674,7 +2675,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ]
 ,"LA":[,[,,"[2-8]\\d{7,9}","\\d{6,10}"]
 ,[,,"(?:2[13]|[35-7][14]|41|8[1468])\\d{6}","\\d{6,8}"]
-,[,,"20(?:2[23]|5[4-68]|7[78]|9[7-9])\\d{6}","\\d{10}"]
+,[,,"20(?:2[238]|5[4-68]|7[78]|9[7-9])\\d{6}","\\d{10}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
@@ -3876,7 +3877,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"QA":[,[,,"[2-8]\\d{6,7}","\\d{7,8}"]
-,[,,"44\\d{6}","\\d{7,8}"]
+,[,,"4[04]\\d{6}","\\d{7,8}"]
 ,[,,"[3567]\\d{7}","\\d{7,8}"]
 ,[,,"800\\d{4}","\\d{7,8}"]
 ,[,,"NA","NA"]
@@ -4159,14 +4160,14 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"NA","NA"]
 ]
 ,"SI":[,[,,"[1-7]\\d{6,7}|[89]\\d{4,7}","\\d{5,8}"]
-,[,,"(?:1\\d|2[2-8]|3[4-8]|4[24-8]|[57][3-8])\\d{6}","\\d{7,8}"]
+,[,,"(?:1\\d|[25][2-8]|3[4-8]|4[24-8]|7[3-8])\\d{6}","\\d{7,8}"]
 ,[,,"(?:[37][01]|4[019]|51|6[48])\\d{6}","\\d{8}"]
 ,[,,"80\\d{4,6}","\\d{6,8}"]
 ,[,,"90\\d{4,6}|89[1-3]\\d{2,5}","\\d{5,8}"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ,[,,"(?:59|8[1-3])\\d{6}","\\d{8}"]
-,"SI",386,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[12]|3[4-8]|4[24-8]|5[3-8]|7[3-8]"]
+,"SI",386,"00","0",,,"0",,,,[[,"(\\d)(\\d{3})(\\d{2})(\\d{2})","$1 $2 $3 $4",["[12]|3[4-8]|4[24-8]|5[2-8]|7[3-8]"]
 ,"(0$1)","",0]
 ,[,"([3-7]\\d)(\\d{3})(\\d{3})","$1 $2 $3",["[37][01]|4[019]|51|6"]
 ,"0$1","",0]
@@ -4479,9 +4480,7 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,[,,"60\\d{7}","\\d{9}"]
 ,"TH",66,"00","0",,,"0",,,,[[,"(2)(\\d{3})(\\d{4})","$1 $2 $3",["2"]
 ,"0$1","",0]
-,[,"([3-7]\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["[3-7]"]
-,"0$1","",0]
-,[,"([89])(\\d{4})(\\d{4})","$1 $2 $3",["[89]"]
+,[,"([3-9]\\d)(\\d{3})(\\d{3,4})","$1 $2 $3",["[3-9]"]
 ,"0$1","",0]
 ,[,"(1[89]00)(\\d{3})(\\d{3})","$1 $2 $3",["1"]
 ,"$1","",0]
@@ -5107,6 +5106,22 @@ i18n.phonenumbers.metadata.countryToMetadata = {
 ,,[,,"NA","NA"]
 ,[,,"NA","NA"]
 ]
+,"878":[,[,,"1\\d{11}","\\d{12}"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"NA","NA"]
+,[,,"10\\d{10}","\\d{12}"]
+,"001",878,"",,,,,,,1,[[,"(\\d{2})(\\d{5})(\\d{5})","$1 $2 $3",,"","",0]
+]
+,,[,,"NA","NA"]
+,,,[,,"NA","NA"]
+,[,,"NA","NA"]
+,,[,,"NA","NA"]
+,[,,"NA","NA"]
+]
 ,"883":[,[,,"51\\d{7}(?:\\d{3})?","\\d{9}(?:\\d{3})?"]
 ,[,,"NA","NA"]
 ,[,,"NA","NA"]
diff --git a/resources/PhoneNumberMetaData.xml b/resources/PhoneNumberMetaData.xml
index 845d06143..99817224b 100644
--- a/resources/PhoneNumberMetaData.xml
+++ b/resources/PhoneNumberMetaData.xml
@@ -2622,6 +2622,7 @@
           (?:
             3(?:
               [23469]\d|
+              5[35]|
               77|
               8[348]
             )\d|
@@ -4766,16 +4767,19 @@
         <!-- Including trunking service numbers starting with 5100. -->
         <nationalNumberPattern>
           210[0-6]\d{4}|
-          40(?:
-            [04]0\d{4}|
-            10[0-3]\d{3}|
-            2(?:
-              00\d|
-              900
-            )\d{2}|
-            3[01]\d{4}|
-            5\d{5}|
-            70[01]\d{3}
+          4(?:
+            0(?:
+              [04]0\d{4}|
+              10[0-3]\d{3}|
+              2(?:
+                00\d|
+                900
+              )\d{2}|
+              3[01]\d{4}|
+              5\d{5}|
+              70[01]\d{3}
+            )|
+            1[01]\d{5}
           )|
           5100\d{4}
         </nationalNumberPattern>
@@ -5533,6 +5537,12 @@
         <possibleNumberPattern>\d{8,14}</possibleNumberPattern>
         <exampleNumber>18500123456</exampleNumber>
       </uan>
+      <shortCode>
+        <!-- Public Service Number for German administration. -->
+        <nationalNumberPattern>115</nationalNumberPattern>
+        <possibleNumberPattern>\d{3}</possibleNumberPattern>
+        <exampleNumber>115</exampleNumber>
+      </shortCode>
       <emergency>
         <nationalNumberPattern>11[02]</nationalNumberPattern>
         <possibleNumberPattern>\d{3}</possibleNumberPattern>
@@ -6036,14 +6046,18 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
+          1\d{3,4}|
           [3-9]\d{6,7}|
           800\d{6,7}
         </nationalNumberPattern>
-        <possibleNumberPattern>\d{7,10}</possibleNumberPattern>
+        <possibleNumberPattern>\d{4,10}</possibleNumberPattern>
       </generalDesc>
       <noInternationalDialling>
-        <nationalNumberPattern>800[2-9]\d{3}</nationalNumberPattern>
-        <possibleNumberPattern>\d{7}</possibleNumberPattern>
+        <nationalNumberPattern>
+          1\d{3,4}|
+          800[2-9]\d{3}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{4,7}</possibleNumberPattern>
         <exampleNumber>8002123</exampleNumber>
       </noInternationalDialling>
       <fixedLine>
@@ -6106,6 +6120,24 @@
         <possibleNumberPattern>\d{8}</possibleNumberPattern>
         <exampleNumber>70012345</exampleNumber>
       </personalNumber>
+      <uan>
+        <!-- All 4-5 digit numbers listed in the plan as being a "short number for a service" are
+             included here. -->
+        <nationalNumberPattern>
+          1(?:
+            2[01245]|
+            3[0-6]|
+            4[1-489]|
+            5[0-59]|
+            6[1-46-9]|
+            7[0-27-9]|
+            8[189]|
+            9[012]
+          )\d{1,2}
+        </nationalNumberPattern>
+        <possibleNumberPattern>\d{4,5}</possibleNumberPattern>
+        <exampleNumber>12123</exampleNumber>
+      </uan>
       <shortCode>
         <nationalNumberPattern>
           1(?:
@@ -11740,7 +11772,6 @@
              However, a web search shows that such numbers seem to exist. -->
         <nationalNumberPattern>
           7(?:
-            45|
             5\d|
             7[2-79]|
             8[5-8]|
@@ -13573,6 +13604,7 @@
         <exampleNumber>22345678</exampleNumber>
       </fixedLine>
       <mobile>
+        <!-- Added 969 from an opensource report that this is now in use by Zain. -->
         <nationalNumberPattern>
           (?:
             5(?:
@@ -13595,7 +13627,7 @@
             9(?:
               0[09]|
               4[049]|
-              66|
+              6[69]|
               [79]\d
             )
           )\d{5}
@@ -13934,10 +13966,10 @@
         <exampleNumber>21212862</exampleNumber>
       </fixedLine>
       <mobile>
-        <!-- Adding 2078, 2058 and 2097 from numbers found online. -->
+        <!-- Adding 2028, 2058, 2078 and 2097 from numbers found online. -->
         <nationalNumberPattern>
           20(?:
-            2[23]|
+            2[238]|
             5[4-68]|
             7[78]|
             9[7-9]
@@ -19337,7 +19369,8 @@
         <possibleNumberPattern>\d{7,8}</possibleNumberPattern>
       </generalDesc>
       <fixedLine>
-        <nationalNumberPattern>44\d{6}</nationalNumberPattern>
+        <!-- The prefix 40 has now been allocated, based on numbers seen online. -->
+        <nationalNumberPattern>4[04]\d{6}</nationalNumberPattern>
         <exampleNumber>44123456</exampleNumber>
       </fixedLine>
       <mobile>
@@ -20453,7 +20486,7 @@
             [12]|
             3[4-8]|
             4[24-8]|
-            5[3-8]|
+            5[2-8]|
             7[3-8]
           </leadingDigits>
           <format>$1 $2 $3 $4</format>
@@ -20490,10 +20523,10 @@
         <nationalNumberPattern>
           (?:
             1\d|
-            2[2-8]|
+            [25][2-8]|
             3[4-8]|
             4[24-8]|
-            [57][3-8]
+            7[3-8]
           )\d{6}
         </nationalNumberPattern>
         <possibleNumberPattern>\d{7,8}</possibleNumberPattern>
@@ -21574,12 +21607,8 @@
           <leadingDigits>2</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <numberFormat pattern="([3-7]\d)(\d{3})(\d{3,4})">
-          <leadingDigits>[3-7]</leadingDigits>
-          <format>$1 $2 $3</format>
-        </numberFormat>
-        <numberFormat pattern="([89])(\d{4})(\d{4})">
-          <leadingDigits>[89]</leadingDigits>
+        <numberFormat pattern="([3-9]\d)(\d{3})(\d{3,4})">
+          <leadingDigits>[3-9]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat nationalPrefixFormattingRule="$FG"
@@ -24665,6 +24694,34 @@
       </mobile>
     </territory>
 
+    <!-- VISIONng -->
+    <!-- http://www.itu.int/oth/T02020000E5/en -->
+    <!-- Number length has been derived from examples found online. -->
+    <territory id="001" countryCode="878">
+      <availableFormats>
+        <!-- Formatting chosen based on online examples. -->
+        <numberFormat pattern="(\d{2})(\d{5})(\d{5})">
+          <format>$1 $2 $3</format>
+        </numberFormat>
+      </availableFormats>
+      <generalDesc>
+        <nationalNumberPattern>1\d{11}</nationalNumberPattern>
+        <possibleNumberPattern>\d{12}</possibleNumberPattern>
+        <exampleNumber>101234567890</exampleNumber>
+      </generalDesc>
+      <fixedLine>
+        <nationalNumberPattern>NA</nationalNumberPattern>
+        <possibleNumberPattern>NA</possibleNumberPattern>
+      </fixedLine>
+      <mobile>
+        <nationalNumberPattern>NA</nationalNumberPattern>
+        <possibleNumberPattern>NA</possibleNumberPattern>
+      </mobile>
+      <voip>
+        <nationalNumberPattern>10\d{10}</nationalNumberPattern>
+      </voip>
+    </territory>
+
     <!-- http://www.itu.int/oth/T02020000F3/en -->
     <!-- http://www.republicwireless.com/world-wi-fi-number -->
     <territory id="001" countryCode="883">