diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt
index f869b0e8..22a43f22 100644
--- a/METADATA-VERSION.txt
+++ b/METADATA-VERSION.txt
@@ -2,4 +2,4 @@
 # It can be a commit, branch or tag of the https://github.com/google/libphonenumber project
 #
 # For more information, look at the phing tasks in build.xml
-v8.13.24
+v8.13.25
diff --git a/src/carrier/data/en/212.php b/src/carrier/data/en/212.php
index e66dc87b..7f49a31d 100644
--- a/src/carrier/data/en/212.php
+++ b/src/carrier/data/en/212.php
@@ -85,6 +85,7 @@
   21270 => 'Inwi',
   21271 => 'Inwi',
   21272 => 'Inwi',
+  21275 => 'Maroc Telecom',
   21276 => 'Maroc Telecom',
   21277 => 'Méditel',
   21278 => 'Méditel',
diff --git a/src/carrier/data/en/229.php b/src/carrier/data/en/229.php
index 43b91c4c..680e60bf 100644
--- a/src/carrier/data/en/229.php
+++ b/src/carrier/data/en/229.php
@@ -15,6 +15,7 @@
   22941 => 'Celtiis',
   22942 => 'MTN',
   22943 => 'Celtiis',
+  22944 => 'Celtiis',
   22945 => 'Celtiis',
   22946 => 'MTN',
   2295 => 'MTN',
diff --git a/src/carrier/data/en/592.php b/src/carrier/data/en/592.php
index e33020ca..04d3ae68 100644
--- a/src/carrier/data/en/592.php
+++ b/src/carrier/data/en/592.php
@@ -11,7 +11,7 @@
  */
 
 return array (
-  5925 => 'GTT',
+  592510 => 'Digicel Guyana',
   592600 => 'Digicel Guyana',
   592601 => 'Digicel Guyana',
   592602 => 'Digicel Guyana',
@@ -22,20 +22,33 @@
   59261 => 'GTT',
   59262 => 'GTT',
   592630 => 'Digicel Guyana',
-  592631 => 'GTT',
+  592631 => 'Green Gibraltar',
   592632 => 'Digicel Guyana',
+  592633 => 'Digicel Guyana',
+  592634 => 'GTT',
+  592635 => 'E-Networks',
   592636 => 'Digicel Guyana',
   592637 => 'Digicel Guyana',
   592638 => 'GTT',
   592639 => 'GTT',
   59264 => 'GTT',
   59265 => 'GTT',
+  592659 => 'Digicel Guyana',
   59266 => 'Digicel Guyana',
   59267 => 'Digicel Guyana',
   59268 => 'Digicel Guyana',
   59269 => 'Digicel Guyana',
-  59270 => 'GTT',
-  59271 => 'GTT',
+  592700 => 'Digicel Guyana',
+  592701 => 'Digicel Guyana',
+  592702 => 'Digicel Guyana',
+  592703 => 'Digicel Guyana',
+  592704 => 'Digicel Guyana',
+  592705 => 'GTT',
+  592706 => 'GTT',
+  592707 => 'GTT',
+  592708 => 'GTT',
+  592709 => 'GTT',
+  59271 => 'E-Networks',
   59272 => 'GTT',
   59274 => 'GTT',
 );
diff --git a/src/carrier/data/en/65.php b/src/carrier/data/en/65.php
index 15c6b109..db0b1881 100644
--- a/src/carrier/data/en/65.php
+++ b/src/carrier/data/en/65.php
@@ -39,7 +39,7 @@
   658052 => 'M1',
   658053 => 'Simba',
   658054 => 'SingTel',
-  658055 => 'Geenet',
+  658055 => 'M1',
   658056 => 'Simba',
   658057 => 'Simba',
   658058 => 'Simba',
@@ -49,7 +49,9 @@
   65807 => 'Simba',
   658070 => 'SingTel',
   658071 => 'SingTel',
-  65808 => 'Simba',
+  658080 => 'Simba',
+  658081 => 'Simba',
+  658083 => 'M1',
   6581 => 'StarHub',
   65810 => 'M1',
   65812 => 'SingTel',
diff --git a/src/carrier/data/en/683.php b/src/carrier/data/en/683.php
index ca1e6862..64444f7d 100644
--- a/src/carrier/data/en/683.php
+++ b/src/carrier/data/en/683.php
@@ -11,5 +11,7 @@
  */
 
 return array (
+  6835 => 'Telecom Niue',
+  6836 => 'Telecom Niue',
   6838 => 'Telecom Niue',
 );
diff --git a/src/carrier/data/en/84.php b/src/carrier/data/en/84.php
index 3a6094f0..64d55e22 100644
--- a/src/carrier/data/en/84.php
+++ b/src/carrier/data/en/84.php
@@ -12,6 +12,8 @@
 
 return array (
   843 => 'Viettel Mobile',
+  8430 => 'MobiFone',
+  8451 => 'MobiFone',
   8452 => 'Vietnamobile',
   8455 => 'Reddi',
   8456 => 'Vietnamobile',
diff --git a/src/carrier/data/en/852.php b/src/carrier/data/en/852.php
index 4660e0df..594ca14e 100644
--- a/src/carrier/data/en/852.php
+++ b/src/carrier/data/en/852.php
@@ -14,13 +14,16 @@
   852440 => 'China Mobile',
   852441 => 'HKT',
   852444 => 'HKT',
+  852445 => 'HKT',
   852460 => 'China Unicom',
   8524607 => 'Multibyte',
-  8524610 => 'Sun Mobile',
-  8524611 => 'Sun Mobile',
+  8524608 => 'HKT',
+  8524609 => 'HKT',
+  8524610 => 'HKT',
+  8524611 => 'HKT',
   8524612 => 'Sun Mobile',
   8524613 => 'HKT',
-  8524614 => 'Sun Mobile',
+  8524614 => 'HKT',
   8524615 => 'China Unicom',
   8524616 => 'China Unicom',
   8524620 => 'China Mobile',
@@ -34,13 +37,13 @@
   8524628 => 'SmarTone',
   8524629 => 'SmarTone',
   852463 => 'China Mobile',
-  8524640 => 'China Mobile',
+  8524640 => 'HKT',
   8524641 => 'SmarTone',
   8524642 => 'SmarTone',
   8524643 => 'SmarTone',
   8524644 => 'SmarTone',
   8524645 => 'SmarTone',
-  8524647 => 'Sun Mobile',
+  8524647 => 'HKT',
   8524648 => 'Multibyte',
   8524649 => 'CITIC',
   8524650 => 'China Unicom',
@@ -55,15 +58,14 @@
   8524659 => 'China Mobile',
   852466 => 'China Mobile',
   852467 => 'China Mobile',
-  8524678 => 'Sun Mobile',
+  8524678 => 'HKT',
   8524679 => 'HKT',
   852468 => 'China Mobile',
   852510 => 'China Mobile',
-  852511 => 'Sun Mobile',
+  852511 => 'HKT',
   852512 => 'China Mobile',
   852513 => 'China Mobile',
   852514 => 'HKT',
-  8525149 => 'Truphone',
   852516 => 'China Mobile',
   852517 => 'China Mobile',
   852518 => 'HKT',
@@ -84,9 +86,9 @@
   852524 => 'HKT',
   852526 => 'China Mobile',
   852527 => 'HKT',
-  8525280 => 'Truphone',
-  8525281 => 'Sun Mobile',
-  8525282 => 'Sun Mobile',
+  8525280 => 'HKT',
+  8525281 => 'HKT',
+  8525282 => 'HKT',
   8525283 => 'Multibyte',
   8525284 => 'SmarTone',
   8525285 => 'SmarTone',
@@ -104,7 +106,7 @@
   852537 => 'China Mobile',
   852538 => 'China Unicom',
   852539 => 'China Mobile',
-  852540 => 'Sun Mobile',
+  852540 => 'HKT',
   852541 => 'HKT',
   852542 => 'China Mobile',
   852543 => 'HKT',
@@ -114,18 +116,18 @@
   852548 => 'China Mobile',
   852549 => 'China Mobile',
   852550 => 'SmarTone',
-  852551 => 'China Mobile',
+  852551 => 'HKT',
   852552 => 'HKT',
   852553 => 'China Mobile',
-  8525540 => 'Sun Mobile',
-  8525541 => 'Sun Mobile',
-  8525542 => 'Sun Mobile',
-  8525543 => 'Sun Mobile',
-  8525544 => 'Sun Mobile',
-  8525545 => 'Sun Mobile',
-  8525546 => 'Sun Mobile',
-  8525547 => 'Sun Mobile',
-  8525548 => 'Sun Mobile',
+  8525540 => 'HKT',
+  8525541 => 'HKT',
+  8525542 => 'HKT',
+  8525543 => 'HKT',
+  8525544 => 'HKT',
+  8525545 => 'HKT',
+  8525546 => 'HKT',
+  8525547 => 'HKT',
+  8525548 => 'HKT',
   852556 => '3',
   852557 => 'China Mobile',
   852558 => 'HKT',
@@ -140,8 +142,8 @@
   852569 => '3',
   8525700 => 'Multibyte',
   8525701 => 'Multibyte',
-  8525702 => 'Sun Mobile',
-  8525703 => 'Sun Mobile',
+  8525702 => 'HKT',
+  8525703 => 'HKT',
   8525704 => 'Multibyte',
   8525705 => 'Multibyte',
   8525706 => 'Hong Kong Broadband Network',
@@ -162,7 +164,7 @@
   8525746 => 'Multibyte',
   8525747 => 'Multibyte',
   8525748 => 'Multibyte',
-  8525749 => 'China Mobile',
+  8525749 => 'HKT',
   852576 => 'China Mobile',
   8525768 => 'Lycamobile',
   8525769 => 'Lycamobile',
@@ -213,9 +215,9 @@
   852633 => '3',
   852634 => '3',
   852635 => 'China Mobile',
-  8526360 => 'Sun Mobile',
+  8526360 => 'HKT',
   8526361 => 'China Unicom',
-  8526362 => 'China Telecom Global Limited (CTG)',
+  8526362 => 'HKT',
   852637 => 'HKT',
   852638 => 'HKT',
   852639 => 'HKT',
@@ -230,7 +232,7 @@
   852648 => 'China Mobile',
   852649 => 'HKT',
   852650 => '3',
-  852651 => 'China-Hongkong Telecom',
+  852651 => 'HKT',
   852652 => 'China Unicom',
   852653 => 'HKT',
   852654 => 'HKT',
@@ -277,8 +279,8 @@
   852707 => 'SmarTone',
   852708 => 'HKT',
   852840 => 'China Mobile',
-  8528480 => 'Handy',
-  8528481 => 'Sun Mobile',
+  8528480 => 'HKT',
+  8528481 => 'HKT',
   8528482 => 'HKT',
   8528485 => 'SmarTone',
   8528486 => 'SmarTone',
@@ -315,7 +317,7 @@
   852928 => '3',
   852929 => 'China Unicom',
   8529290 => 'Multibyte',
-  8529291 => 'Sun Mobile',
+  8529291 => 'HKT',
   852930 => 'HKT',
   852931 => 'SmarTone',
   852932 => '3',
@@ -354,7 +356,7 @@
   852966 => 'SmarTone',
   852967 => '3',
   852968 => 'SmarTone',
-  852969 => 'China-Hongkong Telecom',
+  852969 => 'HKT',
   852970 => '3',
   852971 => 'China Mobile',
   852972 => 'SmarTone',
@@ -374,4 +376,5 @@
   852986 => 'SmarTone',
   852987 => 'HKT',
   852988 => 'HKT',
+  852989 => 'HKT',
 );
diff --git a/src/carrier/data/zh/852.php b/src/carrier/data/zh/852.php
index 9123f349..311f5d69 100644
--- a/src/carrier/data/zh/852.php
+++ b/src/carrier/data/zh/852.php
@@ -14,13 +14,16 @@
   852440 => '中国移动',
   852441 => '香港移动通讯',
   852444 => '香港移动通讯',
+  852445 => '香港移动通讯',
   852460 => '中国联通',
   8524607 => '',
-  8524610 => '新移动通讯',
-  8524611 => '新移动通讯',
+  8524608 => '香港移动通讯',
+  8524609 => '香港移动通讯',
+  8524610 => '香港移动通讯',
+  8524611 => '香港移动通讯',
   8524612 => '新移动通讯',
   8524613 => '香港移动通讯',
-  8524614 => '新移动通讯',
+  8524614 => '香港移动通讯',
   8524615 => '中国联通',
   8524616 => '中国联通',
   8524620 => '中国移动',
@@ -34,13 +37,13 @@
   8524628 => '数码通',
   8524629 => '数码通',
   852463 => '中国移动',
-  8524640 => '中国移动',
+  8524640 => '香港移动通讯',
   8524641 => '数码通',
   8524642 => '数码通',
   8524643 => '数码通',
   8524644 => '数码通',
   8524645 => '数码通',
-  8524647 => '新移动通讯',
+  8524647 => '香港移动通讯',
   8524649 => '中信国际电讯',
   8524650 => '中国联通',
   8524651 => '中国联通',
@@ -54,15 +57,14 @@
   8524659 => '中国移动',
   852466 => '中国移动',
   852467 => '中国移动',
-  8524678 => '新移动通讯',
+  8524678 => '香港移动通讯',
   8524679 => '香港移动通讯',
   852468 => '中国移动',
   852510 => '中国移动',
-  852511 => '新移动通讯',
+  852511 => '香港移动通讯',
   852512 => '中国移动',
   852513 => '中国移动',
   852514 => '香港移动通讯',
-  8525149 => '',
   852516 => '中国移动',
   852517 => '中国移动',
   852518 => '香港移动通讯',
@@ -80,8 +82,9 @@
   852524 => '香港移动通讯',
   852526 => '中国移动',
   852527 => '香港移动通讯',
-  8525281 => '新移动通讯',
-  8525282 => '新移动通讯',
+  8525280 => '香港移动通讯',
+  8525281 => '香港移动通讯',
+  8525282 => '香港移动通讯',
   8525284 => '数码通',
   8525285 => '数码通',
   8525286 => '数码通',
@@ -96,7 +99,7 @@
   852537 => '中国移动',
   852538 => '中国联通',
   852539 => '中国移动',
-  852540 => '新移动通讯',
+  852540 => '香港移动通讯',
   852541 => '香港移动通讯',
   852542 => '中国移动',
   852543 => '香港移动通讯',
@@ -105,18 +108,18 @@
   852548 => '中国移动',
   852549 => '中国移动',
   852550 => '数码通',
-  852551 => '中国移动',
+  852551 => '香港移动通讯',
   852552 => '香港移动通讯',
   852553 => '中国移动',
-  8525540 => '新移动通讯',
-  8525541 => '新移动通讯',
-  8525542 => '新移动通讯',
-  8525543 => '新移动通讯',
-  8525544 => '新移动通讯',
-  8525545 => '新移动通讯',
-  8525546 => '新移动通讯',
-  8525547 => '新移动通讯',
-  8525548 => '新移动通讯',
+  8525540 => '香港移动通讯',
+  8525541 => '香港移动通讯',
+  8525542 => '香港移动通讯',
+  8525543 => '香港移动通讯',
+  8525544 => '香港移动通讯',
+  8525545 => '香港移动通讯',
+  8525546 => '香港移动通讯',
+  8525547 => '香港移动通讯',
+  8525548 => '香港移动通讯',
   852557 => '中国移动',
   852558 => '香港移动通讯',
   852559 => '数码通',
@@ -125,8 +128,8 @@
   852562 => '中国移动',
   852564 => '中国移动',
   852568 => '香港移动通讯',
-  8525702 => '新移动通讯',
-  8525703 => '新移动通讯',
+  8525702 => '香港移动通讯',
+  8525703 => '香港移动通讯',
   8525706 => '香港寬頻企業方案有限公司',
   8525707 => '中国移动',
   8525708 => '中国移动',
@@ -141,7 +144,7 @@
   8525742 => '数码通',
   8525743 => '数码通',
   8525744 => '数码通',
-  8525749 => '中国移动',
+  8525749 => '香港移动通讯',
   852576 => '中国移动',
   8525768 => '',
   8525769 => '',
@@ -182,9 +185,9 @@
   852630 => '香港移动通讯',
   852632 => '数码通',
   852635 => '中国移动',
-  8526360 => '新移动通讯',
+  8526360 => '香港移动通讯',
   8526361 => '中国联通',
-  8526362 => '中國電信國際有限公司',
+  8526362 => '香港移动通讯',
   852637 => '香港移动通讯',
   852638 => '香港移动通讯',
   852639 => '香港移动通讯',
@@ -196,7 +199,7 @@
   852646 => '数码通',
   852648 => '中国移动',
   852649 => '香港移动通讯',
-  852651 => '中港通',
+  852651 => '香港移动通讯',
   852652 => '中国联通',
   852653 => '香港移动通讯',
   852654 => '香港移动通讯',
@@ -240,7 +243,8 @@
   852707 => '数码通',
   852708 => '香港移动通讯',
   852840 => '中国移动',
-  8528481 => '新移动通讯',
+  8528480 => '香港移动通讯',
+  8528481 => '香港移动通讯',
   8528482 => '香港移动通讯',
   8528485 => '数码通',
   8528486 => '数码通',
@@ -275,7 +279,7 @@
   852927 => '香港移动通讯',
   852929 => '中国联通',
   8529290 => '',
-  8529291 => '新移动通讯',
+  8529291 => '香港移动通讯',
   852930 => '香港移动通讯',
   852931 => '数码通',
   852933 => '香港移动通讯',
@@ -301,7 +305,7 @@
   852965 => '香港移动通讯',
   852966 => '数码通',
   852968 => '数码通',
-  852969 => '中港通',
+  852969 => '香港移动通讯',
   852971 => '中国移动',
   852972 => '数码通',
   852973 => '数码通',
@@ -315,4 +319,5 @@
   852986 => '数码通',
   852987 => '香港移动通讯',
   852988 => '香港移动通讯',
+  852989 => '香港移动通讯',
 );
diff --git a/src/data/PhoneNumberMetadata_883.php b/src/data/PhoneNumberMetadata_883.php
index 9950339c..0a923986 100644
--- a/src/data/PhoneNumberMetadata_883.php
+++ b/src/data/PhoneNumberMetadata_883.php
@@ -89,7 +89,7 @@
   ),
   'voip' => 
   array (
-    'NationalNumberPattern' => '(?:2(?:00\\d\\d|10)|(?:370[1-9]|51\\d0)\\d)\\d{7}|51(?:00\\d{5}|[24-9]0\\d{4,7})|(?:1[013-79]|2[24-689]|3[02-689]|4[0-4])0\\d{5,9}',
+    'NationalNumberPattern' => '(?:2(?:00\\d\\d|10)|(?:370[1-9]|51\\d0)\\d)\\d{7}|51(?:00\\d{5}|[24-9]0\\d{4,7})|(?:1[0-79]|2[24-689]|3[02-689]|4[0-4])0\\d{5,9}',
     'ExampleNumber' => '510012345',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_BH.php b/src/data/PhoneNumberMetadata_BH.php
index 8d61372f..9c8f3bb8 100644
--- a/src/data/PhoneNumberMetadata_BH.php
+++ b/src/data/PhoneNumberMetadata_BH.php
@@ -25,7 +25,7 @@
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '(?:1(?:3[1356]|6[0156]|7\\d)\\d|6(?:1[16]\\d|500|6(?:0\\d|3[12]|44|7[7-9]|88)|9[69][69])|7(?:[07]\\d\\d|1(?:11|78)))\\d{4}',
+    'NationalNumberPattern' => '(?:1(?:3[1356]|6[0156]|7\\d)\\d|6(?:1[16]\\d|500|6(?:0\\d|3[12]|44|55|7[7-9]|88)|9[69][69])|7(?:[07]\\d\\d|1(?:11|78)))\\d{4}',
     'ExampleNumber' => '17001234',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_BJ.php b/src/data/PhoneNumberMetadata_BJ.php
index 1fc2932b..d8cf1a6a 100644
--- a/src/data/PhoneNumberMetadata_BJ.php
+++ b/src/data/PhoneNumberMetadata_BJ.php
@@ -36,7 +36,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:4[0-356]|[56]\\d|9[013-9])\\d{6}',
+    'NationalNumberPattern' => '(?:4[0-6]|[56]\\d|9[013-9])\\d{6}',
     'ExampleNumber' => '90011234',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_EH.php b/src/data/PhoneNumberMetadata_EH.php
index ed5719c7..c33ee033 100644
--- a/src/data/PhoneNumberMetadata_EH.php
+++ b/src/data/PhoneNumberMetadata_EH.php
@@ -36,7 +36,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[017]\\d|2[0-2]|6[0-8]|8[0-3]))\\d{6}',
+    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-2]|5[01]|8[0-3]))\\d{6}',
     'ExampleNumber' => '650123456',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_GU.php b/src/data/PhoneNumberMetadata_GU.php
index f6bae4c5..0987df96 100644
--- a/src/data/PhoneNumberMetadata_GU.php
+++ b/src/data/PhoneNumberMetadata_GU.php
@@ -26,7 +26,7 @@
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '671(?:3(?:00|3[39]|4[349]|55|6[26])|4(?:00|56|7[1-9]|8[02-46-9])|5(?:55|6[2-5]|88)|6(?:3[2-578]|4[24-9]|5[34]|78|8[235-9])|7(?:[0479]7|2[0167]|3[45]|8[7-9])|8(?:[2-57-9]8|6[48])|9(?:2[29]|6[79]|7[1279]|8[7-9]|9[78]))\\d{4}',
+    'NationalNumberPattern' => '671(?:2\\d\\d|3(?:00|3[39]|4[349]|55|6[26])|4(?:00|56|7[1-9]|8[02-46-9])|5(?:55|6[2-5]|88)|6(?:3[2-578]|4[24-9]|5[34]|78|8[235-9])|7(?:[0479]7|2[0167]|3[45]|8[7-9])|8(?:[2-57-9]8|6[48])|9(?:2[29]|6[79]|7[1279]|8[7-9]|9[78]))\\d{4}',
     'ExampleNumber' => '6713001234',
     'PossibleLength' => 
     array (
@@ -38,7 +38,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '671(?:3(?:00|3[39]|4[349]|55|6[26])|4(?:00|56|7[1-9]|8[02-46-9])|5(?:55|6[2-5]|88)|6(?:3[2-578]|4[24-9]|5[34]|78|8[235-9])|7(?:[0479]7|2[0167]|3[45]|8[7-9])|8(?:[2-57-9]8|6[48])|9(?:2[29]|6[79]|7[1279]|8[7-9]|9[78]))\\d{4}',
+    'NationalNumberPattern' => '671(?:2\\d\\d|3(?:00|3[39]|4[349]|55|6[26])|4(?:00|56|7[1-9]|8[02-46-9])|5(?:55|6[2-5]|88)|6(?:3[2-578]|4[24-9]|5[34]|78|8[235-9])|7(?:[0479]7|2[0167]|3[45]|8[7-9])|8(?:[2-57-9]8|6[48])|9(?:2[29]|6[79]|7[1279]|8[7-9]|9[78]))\\d{4}',
     'ExampleNumber' => '6713001234',
     'PossibleLength' => 
     array (
@@ -145,7 +145,7 @@
   'countryCode' => 1,
   'internationalPrefix' => '011',
   'nationalPrefix' => '1',
-  'nationalPrefixForParsing' => '([3-9]\\d{6})$|1',
+  'nationalPrefixForParsing' => '([2-9]\\d{6})$|1',
   'nationalPrefixTransformRule' => '671$1',
   'sameMobileAndFixedLinePattern' => true,
   'numberFormat' => 
diff --git a/src/data/PhoneNumberMetadata_GY.php b/src/data/PhoneNumberMetadata_GY.php
index dff37a07..dcef2bac 100644
--- a/src/data/PhoneNumberMetadata_GY.php
+++ b/src/data/PhoneNumberMetadata_GY.php
@@ -14,7 +14,7 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '9008\\d{3}|(?:[2-467]\\d\\d|510|862)\\d{4}',
+    'NationalNumberPattern' => '(?:[2-8]\\d{3}|9008)\\d{3}',
     'PossibleLength' => 
     array (
       0 => 7,
@@ -25,7 +25,7 @@
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '(?:2(?:1[6-9]|2[0-35-9]|3[1-4]|5[3-9]|6\\d|7[0-24-79])|3(?:2[25-9]|3\\d)|4(?:4[0-24]|5[56])|77[1-57])\\d{4}',
+    'NationalNumberPattern' => '(?:2(?:1[6-9]|2[0-35-9]|3[1-4]|5[3-9]|6\\d|7[0-79])|3(?:2[25-9]|3\\d)|4(?:4[0-24]|5[56])|50[0-6]|77[1-57])\\d{4}',
     'ExampleNumber' => '2201234',
     'PossibleLength' => 
     array (
@@ -47,7 +47,7 @@
   ),
   'tollFree' => 
   array (
-    'NationalNumberPattern' => '(?:289|862)\\d{4}',
+    'NationalNumberPattern' => '(?:289|8(?:00|6[28]|88|99))\\d{4}',
     'ExampleNumber' => '2891234',
     'PossibleLength' => 
     array (
@@ -89,9 +89,10 @@
   ),
   'voip' => 
   array (
+    'NationalNumberPattern' => '515\\d{4}',
+    'ExampleNumber' => '5151234',
     'PossibleLength' => 
     array (
-      0 => -1,
     ),
     'PossibleLengthLocalOnly' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_HK.php b/src/data/PhoneNumberMetadata_HK.php
index 22f6e7bc..2c8834e8 100644
--- a/src/data/PhoneNumberMetadata_HK.php
+++ b/src/data/PhoneNumberMetadata_HK.php
@@ -42,7 +42,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:4(?:44[5-9]|6(?:0[0-7]|1[0-6]|4[0-57-9]|6[0-4]))|573[0-6]|6(?:26[013-8]|66[0-3])|70(?:7[1-5]|8[0-4])|848[0-25-9]|9(?:29[013-9]|59[0-4]))\\d{4}|(?:4(?:4[01]|6[23578])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|84[09]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}',
+    'NationalNumberPattern' => '(?:4(?:44[5-9]|6(?:1[0-6]|4[0-57-9]|6[0-4]))|573[0-6]|6(?:26[013-8]|66[0-3])|70(?:7[1-5]|8[0-4])|848[0-25-9]|9(?:29[013-9]|59[0-4]|899))\\d{4}|(?:4(?:4[015]|6[023578])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|84[09]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}',
     'ExampleNumber' => '51234567',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_MA.php b/src/data/PhoneNumberMetadata_MA.php
index d5a1de10..6523eab5 100644
--- a/src/data/PhoneNumberMetadata_MA.php
+++ b/src/data/PhoneNumberMetadata_MA.php
@@ -36,7 +36,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[017]\\d|2[0-2]|6[0-8]|8[0-3]))\\d{6}',
+    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-2]|5[01]|8[0-3]))\\d{6}',
     'ExampleNumber' => '650123456',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_NU.php b/src/data/PhoneNumberMetadata_NU.php
index f7e3daaa..4a02bfd5 100644
--- a/src/data/PhoneNumberMetadata_NU.php
+++ b/src/data/PhoneNumberMetadata_NU.php
@@ -14,7 +14,7 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '(?:[47]|888\\d)\\d{3}',
+    'NationalNumberPattern' => '(?:[4-7]|888\\d)\\d{3}',
     'PossibleLength' => 
     array (
       0 => 4,
@@ -38,11 +38,10 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '888[1-9]\\d{3}',
+    'NationalNumberPattern' => '(?:[56]|888[1-9])\\d{3}',
     'ExampleNumber' => '8884012',
     'PossibleLength' => 
     array (
-      0 => 7,
     ),
     'PossibleLengthLocalOnly' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_SG.php b/src/data/PhoneNumberMetadata_SG.php
index 445c7dc7..f0666a85 100644
--- a/src/data/PhoneNumberMetadata_SG.php
+++ b/src/data/PhoneNumberMetadata_SG.php
@@ -39,7 +39,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '8(?:08[01]|95[0-2])\\d{4}|(?:8(?:0[1-7]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}',
+    'NationalNumberPattern' => '8(?:08[013]|95[0-2])\\d{4}|(?:8(?:0[1-7]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}',
     'ExampleNumber' => '81234567',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_US.php b/src/data/PhoneNumberMetadata_US.php
index f4c711f7..14048c39 100644
--- a/src/data/PhoneNumberMetadata_US.php
+++ b/src/data/PhoneNumberMetadata_US.php
@@ -26,7 +26,7 @@
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '5056(?:[0-35-9]\\d|4[468])\\d{4}|(?:4722|505[2-57-9]|983[29])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-589]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[01356]|3[0-24679]|4[167]|5[0-2]|6[014]|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]|[34][016]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
+    'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|73020\\d)\\d{4}|(?:4722|505[2-57-9]|983[289])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[0149]|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]|[34][016]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
     'ExampleNumber' => '2015550123',
     'PossibleLength' => 
     array (
@@ -38,7 +38,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '5056(?:[0-35-9]\\d|4[468])\\d{4}|(?:4722|505[2-57-9]|983[29])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-589]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[01356]|3[0-24679]|4[167]|5[0-2]|6[014]|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]|[34][016]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
+    'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|73020\\d)\\d{4}|(?:4722|505[2-57-9]|983[289])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[0149]|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]|[34][016]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
     'ExampleNumber' => '2015550123',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_VN.php b/src/data/PhoneNumberMetadata_VN.php
index 1d568138..b651acae 100644
--- a/src/data/PhoneNumberMetadata_VN.php
+++ b/src/data/PhoneNumberMetadata_VN.php
@@ -40,7 +40,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:5(?:2[238]|59)|89[6-9]|99[013-9])\\d{6}|(?:3\\d|5[689]|7[06-9]|8[1-8]|9[0-8])\\d{7}',
+    'NationalNumberPattern' => '(?:5(?:2[238]|59)|89[6-9]|99[013-9])\\d{6}|(?:3\\d|5[1689]|7[06-9]|8[1-8]|9[0-8])\\d{7}',
     'ExampleNumber' => '912345678',
     'PossibleLength' => 
     array (
diff --git a/src/geocoding/data/en/12.php b/src/geocoding/data/en/12.php
index 8ac87fbd..ccfbbdc0 100644
--- a/src/geocoding/data/en/12.php
+++ b/src/geocoding/data/en/12.php
@@ -2117,6 +2117,7 @@
   122592 => 'Baton Rouge, LA',
   1226 => 'Ontario',
   1226663 => 'London, ON',
+  1227 => 'Maryland',
   1228 => 'Mississippi',
   1228206 => 'Gulfport, MS',
   1228207 => 'Biloxi, MS',
diff --git a/src/geocoding/data/en/13.php b/src/geocoding/data/en/13.php
index 9c17b43d..e918a20f 100644
--- a/src/geocoding/data/en/13.php
+++ b/src/geocoding/data/en/13.php
@@ -2876,6 +2876,7 @@
   1325947 => 'San Angelo, TX',
   1325949 => 'San Angelo, TX',
   1326 => 'Ohio',
+  1329 => 'New York',
   1330 => 'Ohio',
   1330220 => 'Brunswick, OH',
   1330225 => 'Brunswick, OH',
@@ -4018,6 +4019,7 @@
   1365 => 'Ontario',
   1367 => 'Quebec',
   1368 => 'Alberta',
+  1369 => 'California',
   1380 => 'Ohio',
   1382 => 'Ontario',
   1385 => 'Utah',
diff --git a/src/geocoding/data/en/17.php b/src/geocoding/data/en/17.php
index 9448c993..7dc36be4 100644
--- a/src/geocoding/data/en/17.php
+++ b/src/geocoding/data/en/17.php
@@ -2946,6 +2946,7 @@
   1727943 => 'Tarpon Springs, FL',
   1727944 => 'Tarpon Springs, FL',
   1727945 => 'Tarpon Springs, FL',
+  1730 => 'Illinois',
   1731 => 'Tennessee',
   1731235 => 'Greenfield, TN',
   1731253 => 'Tiptonville, TN',
diff --git a/src/timezone/data/map_data.php b/src/timezone/data/map_data.php
index 813c2a29..332b9e2b 100644
--- a/src/timezone/data/map_data.php
+++ b/src/timezone/data/map_data.php
@@ -457,6 +457,7 @@
   1224 => 'America/Chicago',
   1225 => 'America/Chicago',
   1226 => 'America/Toronto',
+  1227 => 'America/New_York',
   1228 => 'America/Chicago',
   1229 => 'America/New_York',
   1231 => 'America/New_York',
@@ -687,6 +688,7 @@
   1323 => 'America/Los_Angeles',
   1325 => 'America/Chicago',
   1326 => 'America/New_York',
+  1329 => 'America/New_York',
   1330 => 'America/New_York',
   1331 => 'America/Chicago',
   1332 => 'America/New_York',
@@ -710,6 +712,7 @@
   1365 => 'America/Toronto',
   1367 => 'America/Toronto',
   1368 => 'America/Edmonton',
+  1369 => 'America/Los_Angeles',
   1380 => 'America/New_York',
   1382 => 'America/Toronto',
   1385 => 'America/Denver',
@@ -1423,6 +1426,7 @@
   1725 => 'America/Los_Angeles',
   1726 => 'America/Chicago',
   1727 => 'America/New_York',
+  1730 => 'America/Chicago',
   1731 => 'America/Chicago',
   1732 => 'America/New_York',
   1734 => 'America/New_York',