diff --git a/composer.lock b/composer.lock
index 0a2f4fb26..7119b0295 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1001,16 +1001,16 @@
         },
         {
             "name": "giggsey/libphonenumber-for-php",
-            "version": "8.12.24",
+            "version": "8.12.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/giggsey/libphonenumber-for-php.git",
-                "reference": "bbefdd7ff0bae7bf5a62fc9e8c939fb40dd6d638"
+                "reference": "7d397cbd2e01e78cf79ff347e40a403dbc4c22fa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/bbefdd7ff0bae7bf5a62fc9e8c939fb40dd6d638",
-                "reference": "bbefdd7ff0bae7bf5a62fc9e8c939fb40dd6d638",
+                "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/7d397cbd2e01e78cf79ff347e40a403dbc4c22fa",
+                "reference": "7d397cbd2e01e78cf79ff347e40a403dbc4c22fa",
                 "shasum": ""
             },
             "require": {
@@ -1070,7 +1070,7 @@
                 "issues": "https://github.com/giggsey/libphonenumber-for-php/issues",
                 "source": "https://github.com/giggsey/libphonenumber-for-php"
             },
-            "time": "2021-05-26T10:08:00+00:00"
+            "time": "2021-06-14T11:44:26+00:00"
         },
         {
             "name": "giggsey/locale",
diff --git a/composer/autoload_files.php b/composer/autoload_files.php
index c06b55e26..4e2cfcf53 100644
--- a/composer/autoload_files.php
+++ b/composer/autoload_files.php
@@ -120,6 +120,6 @@
     '8a9dc1de0ca7e01f3e08231539562f61' => $vendorDir . '/aws/aws-sdk-php/src/functions.php',
     '538ca81a9a966a6716601ecf48f4eaef' => $vendorDir . '/opis/closure/functions.php',
     'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
-    '8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php',
     '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
+    '8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php',
 );
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
index 20858d743..fda5774f5 100644
--- a/composer/autoload_static.php
+++ b/composer/autoload_static.php
@@ -121,8 +121,8 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
         '8a9dc1de0ca7e01f3e08231539562f61' => __DIR__ . '/..' . '/aws/aws-sdk-php/src/functions.php',
         '538ca81a9a966a6716601ecf48f4eaef' => __DIR__ . '/..' . '/opis/closure/functions.php',
         'decc78cc4436b1292c6c0d151b19445c' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
-        '8825ede83f2f289127722d4e842cf7e8' => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme/bootstrap.php',
         '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
+        '8825ede83f2f289127722d4e842cf7e8' => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme/bootstrap.php',
     );
 
     public static $prefixLengthsPsr4 = array (
diff --git a/composer/installed.json b/composer/installed.json
index 2b9c54cc9..41287ef3c 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1037,17 +1037,17 @@
         },
         {
             "name": "giggsey/libphonenumber-for-php",
-            "version": "8.12.24",
-            "version_normalized": "8.12.24.0",
+            "version": "8.12.25",
+            "version_normalized": "8.12.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/giggsey/libphonenumber-for-php.git",
-                "reference": "bbefdd7ff0bae7bf5a62fc9e8c939fb40dd6d638"
+                "reference": "7d397cbd2e01e78cf79ff347e40a403dbc4c22fa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/bbefdd7ff0bae7bf5a62fc9e8c939fb40dd6d638",
-                "reference": "bbefdd7ff0bae7bf5a62fc9e8c939fb40dd6d638",
+                "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php/zipball/7d397cbd2e01e78cf79ff347e40a403dbc4c22fa",
+                "reference": "7d397cbd2e01e78cf79ff347e40a403dbc4c22fa",
                 "shasum": ""
             },
             "require": {
@@ -1064,7 +1064,7 @@
                 "symfony/console": "^2.8|^3.0|^v4.4|^v5.2",
                 "symfony/phpunit-bridge": "^4.2 || ^5"
             },
-            "time": "2021-05-26T10:08:00+00:00",
+            "time": "2021-06-14T11:44:26+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
diff --git a/composer/installed.php b/composer/installed.php
index ac3e15a32..4dc8116ec 100644
--- a/composer/installed.php
+++ b/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../',
         'aliases' => array(),
-        'reference' => 'c43adc622e03fe222662397916edb210f5ad18d3',
+        'reference' => 'f88f337fc7129e75a49ca4124c8432b546144f57',
         'name' => 'nextcloud/3rdparty',
         'dev' => true,
     ),
@@ -137,12 +137,12 @@
             'dev_requirement' => false,
         ),
         'giggsey/libphonenumber-for-php' => array(
-            'pretty_version' => '8.12.24',
-            'version' => '8.12.24.0',
+            'pretty_version' => '8.12.25',
+            'version' => '8.12.25.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../giggsey/libphonenumber-for-php',
             'aliases' => array(),
-            'reference' => 'bbefdd7ff0bae7bf5a62fc9e8c939fb40dd6d638',
+            'reference' => '7d397cbd2e01e78cf79ff347e40a403dbc4c22fa',
             'dev_requirement' => false,
         ),
         'giggsey/locale' => array(
@@ -286,7 +286,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../',
             'aliases' => array(),
-            'reference' => 'c43adc622e03fe222662397916edb210f5ad18d3',
+            'reference' => 'f88f337fc7129e75a49ca4124c8432b546144f57',
             'dev_requirement' => false,
         ),
         'nextcloud/lognormalizer' => array(
diff --git a/composer/package-versions-deprecated/src/PackageVersions/Versions.php b/composer/package-versions-deprecated/src/PackageVersions/Versions.php
index 125f950f0..c73a15398 100644
--- a/composer/package-versions-deprecated/src/PackageVersions/Versions.php
+++ b/composer/package-versions-deprecated/src/PackageVersions/Versions.php
@@ -47,7 +47,7 @@ final class Versions
   'doctrine/lexer' => '1.2.1@e864bbf5904cb8f5bb334f99209b48018522f042',
   'egulias/email-validator' => '2.1.25@0dbf5d78455d4d6a41d186da50adc1122ec066f4',
   'fgrosse/phpasn1' => 'v2.2.0@d1978f7abd580f3fc33561e7f71d4c12c7531fad',
-  'giggsey/libphonenumber-for-php' => '8.12.24@bbefdd7ff0bae7bf5a62fc9e8c939fb40dd6d638',
+  'giggsey/libphonenumber-for-php' => '8.12.25@7d397cbd2e01e78cf79ff347e40a403dbc4c22fa',
   'giggsey/locale' => '1.9@b07f1eace8072ccc61445ad8fbd493ff9d783043',
   'guzzlehttp/guzzle' => '7.3.0@7008573787b430c1c1f650e3722d9bba59967628',
   'guzzlehttp/promises' => '1.4.1@8e7d04f1f6450fef59366c399cfad4b9383aa30d',
@@ -120,7 +120,7 @@ final class Versions
   'web-auth/cose-lib' => 'v3.3.1@eea6fae63ff5c81bf98c115b1be5f38a69682c16',
   'web-auth/metadata-service' => 'v3.3.1@8488d3a832a38cc81c670fce05de1e515c6e64b1',
   'web-auth/webauthn-lib' => 'v3.3.1@e411527a41c1013512fccdfce61681eb36484c77',
-  'nextcloud/3rdparty' => 'dev-master@c43adc622e03fe222662397916edb210f5ad18d3',
+  'nextcloud/3rdparty' => 'dev-master@f88f337fc7129e75a49ca4124c8432b546144f57',
 );
 
     private function __construct()
diff --git a/giggsey/libphonenumber-for-php/src/carrier/data/en/1.php b/giggsey/libphonenumber-for-php/src/carrier/data/en/1.php
index e831b10a0..65c959bee 100644
--- a/giggsey/libphonenumber-for-php/src/carrier/data/en/1.php
+++ b/giggsey/libphonenumber-for-php/src/carrier/data/en/1.php
@@ -501,6 +501,7 @@
   1869764 => 'Digicel',
   1869765 => 'Digicel',
   1869766 => 'Digicel',
+  187620 => 'Cable & Wireless',
   1876210 => 'Cable & Wireless',
   187622 => 'Cable & Wireless',
   187623 => 'Cable & Wireless',
@@ -550,14 +551,10 @@
   187647 => 'Digicel',
   187648 => 'Digicel',
   187649 => 'Digicel',
+  187650 => 'Digicel',
   1876501 => 'Cable & Wireless',
-  1876503 => 'Digicel',
-  1876504 => 'Digicel',
-  1876505 => 'Digicel',
-  1876506 => 'Digicel',
-  1876507 => 'Digicel',
-  1876508 => 'Digicel',
-  1876509 => 'Digicel',
+  1876502 => 'C&W',
+  187651 => 'C&W',
   1876515 => 'Cable & Wireless',
   1876517 => 'Cable & Wireless',
   1876519 => 'Cable & Wireless',
@@ -573,15 +570,8 @@
   1876557 => 'Digicel',
   1876558 => 'Digicel',
   1876559 => 'Digicel',
-  1876560 => 'Digicel',
-  1876561 => 'Digicel',
-  1876562 => 'Digicel',
-  1876564 => 'Digicel',
-  1876565 => 'Digicel',
-  1876566 => 'Digicel',
-  1876567 => 'Digicel',
-  1876568 => 'Digicel',
-  1876569 => 'Digicel',
+  187656 => 'Digicel',
+  1876563 => 'C&W',
   187657 => 'Digicel',
   187658 => 'Digicel',
   187659 => 'Digicel',
diff --git a/giggsey/libphonenumber-for-php/src/carrier/data/en/233.php b/giggsey/libphonenumber-for-php/src/carrier/data/en/233.php
index 325c31c39..c2211ce4f 100644
--- a/giggsey/libphonenumber-for-php/src/carrier/data/en/233.php
+++ b/giggsey/libphonenumber-for-php/src/carrier/data/en/233.php
@@ -14,6 +14,7 @@
   23320 => 'Vodafone',
   23323 => 'Globacom (Zain)',
   23324 => 'MTN',
+  23325 => 'MTN',
   23326 => 'Airtel',
   23327 => 'tiGO',
   23328 => 'Expresso',
diff --git a/giggsey/libphonenumber-for-php/src/carrier/data/en/678.php b/giggsey/libphonenumber-for-php/src/carrier/data/en/678.php
index ab87da67b..38c637631 100644
--- a/giggsey/libphonenumber-for-php/src/carrier/data/en/678.php
+++ b/giggsey/libphonenumber-for-php/src/carrier/data/en/678.php
@@ -13,4 +13,5 @@
 return array (
   6785 => 'Digicel',
   6787 => 'Telecom Vanuatu Ltd',
+  6788 => 'Wan Tok',
 );
diff --git a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_BZ.php b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_BZ.php
index 412c94712..d6e6a41b7 100644
--- a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_BZ.php
+++ b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_BZ.php
@@ -26,7 +26,7 @@
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '(?:236|732)\\d{4}|[2-578][02]\\d{5}',
+    'NationalNumberPattern' => '(?:2(?:[02]\\d|36|[68]0)|[3-58](?:[02]\\d|[68]0)|7(?:[02]\\d|32|[68]0))\\d{4}',
     'ExampleNumber' => '2221234',
     'PossibleLength' => 
     array (
diff --git a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_GB.php b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_GB.php
index acd7326ed..d785ce698 100644
--- a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_GB.php
+++ b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_GB.php
@@ -31,7 +31,7 @@
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '(?:1(?:1(?:3(?:[0-58]\\d\\d|73[03])|4(?:[0-5]\\d\\d|69[7-9]|70[059])|(?:5[0-26-9]|6[0-4]|[78][0-49])\\d\\d)|(?:2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)\\d|1(?:[0-7]\\d|8[02]))|(?:3(?:0\\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\\d)\\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d{3})\\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\\d)|76\\d)|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[5-7]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}',
+    'NationalNumberPattern' => '(?:1(?:1(?:3(?:[0-58]\\d\\d|73[03])|4(?:[0-5]\\d\\d|69[7-9]|70[059])|(?:5[0-26-9]|6[0-4]|[78][0-49])\\d\\d)|2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)\\d\\d|1(?:[0-7]\\d\\d|8(?:[02]\\d|1[278])))|(?:3(?:0\\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\\d\\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d{3})\\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\\d)|76\\d)|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[5-7]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}',
     'ExampleNumber' => '1212345678',
     'PossibleLength' => 
     array (
diff --git a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_GH.php b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_GH.php
index cab9a9202..77ebfc0e8 100644
--- a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_GH.php
+++ b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_GH.php
@@ -40,7 +40,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:2[0346-8]\\d|5(?:[0457]\\d|6[01]|9[1-6]))\\d{6}',
+    'NationalNumberPattern' => '(?:2(?:[0346-8]\\d|5[67])|5(?:[0457]\\d|6[01]|9[1-9]))\\d{6}',
     'ExampleNumber' => '231234567',
     'PossibleLength' => 
     array (
diff --git a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_HN.php b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_HN.php
index a6e95e236..47bd4d253 100644
--- a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_HN.php
+++ b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_HN.php
@@ -26,7 +26,7 @@
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '2(?:2(?:0[0-39]|1[1-36]|[23]\\d|4[04-6]|5[57]|6[245]|7[0135689]|8[01346-9]|9[0-2])|4(?:0[78]|2[3-59]|3[13-689]|4[0-68]|5[1-35])|5(?:0[7-9]|16|4[03-5]|5\\d|6[014-6]|74|80)|6(?:[056]\\d|17|2[07]|3[04]|4[0-378]|[78][0-8]|9[01])|7(?:6[46-9]|7[02-9]|8[034]|91)|8(?:79|8[0-357-9]|9[1-57-9]))\\d{4}',
+    'NationalNumberPattern' => '2(?:2(?:0[0-39]|1[1-367]|[23]\\d|4[03-6]|5[57]|6[245]|7[0135689]|8[01346-9]|9[0-2])|4(?:0[78]|2[3-59]|3[13-9]|4[0-68]|5[1-35])|5(?:0[7-9]|16|4[03-5]|5\\d|6[014-6]|74|80)|6(?:[056]\\d|17|2[07]|3[04]|4[0-378]|[78][0-8]|9[01])|7(?:6[46-9]|7[02-9]|8[034]|91)|8(?:79|8[0-357-9]|9[1-57-9]))\\d{4}',
     'ExampleNumber' => '22123456',
     'PossibleLength' => 
     array (
diff --git a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_JM.php b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_JM.php
index d701f7fc8..0f3fb7cda 100644
--- a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_JM.php
+++ b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_JM.php
@@ -26,7 +26,7 @@
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '8766060\\d{3}|(?:658(?:2(?:[0-8]\\d|9[0-46-9])|[3-9]\\d\\d)|876(?:5(?:02|1[0-468]|2[35]|63)|6(?:0[1-3579]|1[0237-9]|[23]\\d|40|5[06]|6[2-589]|7[05]|8[04]|9[4-9])|7(?:0[2-689]|[1-6]\\d|8[056]|9[45])|9(?:0[1-8]|1[02378]|[2-8]\\d|9[2-468])))\\d{4}',
+    'NationalNumberPattern' => '8766060\\d{3}|(?:658(?:2(?:[0-8]\\d|9[0-46-9])|[3-9]\\d\\d)|876(?:52[35]|6(?:0[1-3579]|1[0237-9]|[23]\\d|40|5[06]|6[2-589]|7[05]|8[04]|9[4-9])|7(?:0[2-689]|[1-6]\\d|8[056]|9[45])|9(?:0[1-8]|1[02378]|[2-8]\\d|9[2-468])))\\d{4}',
     'ExampleNumber' => '8765230123',
     'PossibleLength' => 
     array (
@@ -38,7 +38,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:658295|876(?:2(?:[14-9]\\d|2[013-9]|3[7-9])|[348]\\d\\d|5(?:0[13-9]|1[579]|[2-57-9]\\d|6[0-24-9])|6(?:4[89]|6[67])|7(?:0[07]|7\\d|8[1-47-9]|9[0-36-9])|9(?:[01]9|9[0579])))\\d{4}',
+    'NationalNumberPattern' => '(?:658295|876(?:2(?:0[6-9]|[14-9]\\d|2[013-9]|3[7-9])|[348]\\d\\d|5(?:0[1-9]|[1-9]\\d)|6(?:4[89]|6[67])|7(?:0[07]|7\\d|8[1-47-9]|9[0-36-9])|9(?:[01]9|9[0579])))\\d{4}',
     'ExampleNumber' => '8762101234',
     'PossibleLength' => 
     array (
diff --git a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_LU.php b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_LU.php
index 92cd8f2e2..142bb5570 100644
--- a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_LU.php
+++ b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_LU.php
@@ -43,7 +43,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '6(?:[269][18]|5[158]|7[189]|81)\\d{6}',
+    'NationalNumberPattern' => '6(?:[269][18]|5[1568]|7[189]|81)\\d{6}',
     'ExampleNumber' => '628123456',
     'PossibleLength' => 
     array (
diff --git a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_TJ.php b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_TJ.php
index b15e27f96..842e0ed4b 100644
--- a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_TJ.php
+++ b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_TJ.php
@@ -14,7 +14,7 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '(?:[02]0|11|[3-57-9]\\d)\\d{7}',
+    'NationalNumberPattern' => '(?:00|11|[2-57-9]\\d)\\d{7}',
     'PossibleLength' => 
     array (
       0 => 9,
@@ -44,7 +44,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '41[18]\\d{6}|(?:[02-4]0|11|5[05]|7[07]|8[08]|9\\d)\\d{7}',
+    'NationalNumberPattern' => '41[18]\\d{6}|(?:[034]0|11|2[02]|5[05]|7[07]|8[08]|9\\d)\\d{7}',
     'ExampleNumber' => '917123456',
     'PossibleLength' => 
     array (
diff --git a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_US.php b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_US.php
index 9a1761256..27ed1cd5c 100644
--- a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_US.php
+++ b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_US.php
@@ -26,7 +26,7 @@
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '(?: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[12]|6[014]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[02357]|58|6[39]|7[0589]|8[04])|5(?:0[1-57-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-47]|7[0-5]|8[056])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[0179]|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[02-59]|8[156])|8(?:0[1-68]|1[02-8]|2[08]|3[0-289]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01579]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
+    'NationalNumberPattern' => '(?: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[12]|6[014]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[39]|7[0589]|8[04])|5(?:0[1-57-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-47]|7[0-5]|8[056])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[0179]|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[02-59]|8[156])|8(?:0[1-68]|1[02-8]|2[08]|3[0-289]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01579]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
     'ExampleNumber' => '2015550123',
     'PossibleLength' => 
     array (
@@ -38,7 +38,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?: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[12]|6[014]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[02357]|58|6[39]|7[0589]|8[04])|5(?:0[1-57-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-47]|7[0-5]|8[056])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[0179]|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[02-59]|8[156])|8(?:0[1-68]|1[02-8]|2[08]|3[0-289]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01579]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
+    'NationalNumberPattern' => '(?: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[12]|6[014]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[39]|7[0589]|8[04])|5(?:0[1-57-9]|1[0235-8]|20|3[0149]|4[01]|5[19]|6[1-47]|7[0-5]|8[056])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[0179]|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[02-59]|8[156])|8(?:0[1-68]|1[02-8]|2[08]|3[0-289]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01579]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
     'ExampleNumber' => '2015550123',
     'PossibleLength' => 
     array (
diff --git a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_VU.php b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_VU.php
index 76b3fdfb0..19f56995e 100644
--- a/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_VU.php
+++ b/giggsey/libphonenumber-for-php/src/data/PhoneNumberMetadata_VU.php
@@ -14,7 +14,7 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '[48]8\\d{3}|(?:[23]|[579]\\d\\d)\\d{4}',
+    'NationalNumberPattern' => '[57-9]\\d{6}|(?:[238]\\d|48)\\d{3}',
     'PossibleLength' => 
     array (
       0 => 5,
@@ -38,7 +38,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:5\\d|7[013-7])\\d{5}',
+    'NationalNumberPattern' => '(?:[58]\\d|7[013-7])\\d{5}',
     'ExampleNumber' => '5912345',
     'PossibleLength' => 
     array (
@@ -153,7 +153,7 @@
       'format' => '$1 $2',
       'leadingDigitsPatterns' => 
       array (
-        0 => '[579]',
+        0 => '[57-9]',
       ),
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/giggsey/libphonenumber-for-php/src/geocoding/data/en/14.php b/giggsey/libphonenumber-for-php/src/geocoding/data/en/14.php
index 236c760eb..ce079c409 100644
--- a/giggsey/libphonenumber-for-php/src/geocoding/data/en/14.php
+++ b/giggsey/libphonenumber-for-php/src/geocoding/data/en/14.php
@@ -3140,6 +3140,7 @@
   1443977 => 'Baltimore, MD',
   1445 => 'Philadelphia',
   1447 => 'Illinois',
+  1448 => 'Florida',
   1450 => 'Quebec',
   1450218 => 'Vaudreuil-Dorion, QC',
   1450224 => 'Prévost, QC',
diff --git a/giggsey/libphonenumber-for-php/src/geocoding/data/en/678.php b/giggsey/libphonenumber-for-php/src/geocoding/data/en/678.php
index 11a4dd2bd..cdc47c316 100644
--- a/giggsey/libphonenumber-for-php/src/geocoding/data/en/678.php
+++ b/giggsey/libphonenumber-for-php/src/geocoding/data/en/678.php
@@ -23,5 +23,5 @@
   67837 => 'Luganville',
   67838 => 'Penama/Torba',
   6784 => 'Malampa',
-  6788 => 'Tafea',
+  67888 => 'Tafea',
 );
diff --git a/giggsey/libphonenumber-for-php/src/timezone/data/map_data.php b/giggsey/libphonenumber-for-php/src/timezone/data/map_data.php
index 5770cadb7..5040a835b 100644
--- a/giggsey/libphonenumber-for-php/src/timezone/data/map_data.php
+++ b/giggsey/libphonenumber-for-php/src/timezone/data/map_data.php
@@ -915,6 +915,7 @@
   1443 => 'America/New_York',
   1445 => 'America/New_York',
   1447 => 'America/Chicago',
+  1448 => 'America/New_York',
   1450 => 'America/Toronto',
   1458 => 'America/Los_Angeles',
   1463 => 'America/New_York',