diff --git a/composer.lock b/composer.lock
index 960e2a11a..52f8a0580 100644
--- a/composer.lock
+++ b/composer.lock
@@ -966,16 +966,16 @@
         },
         {
             "name": "giggsey/libphonenumber-for-php-lite",
-            "version": "8.13.27",
+            "version": "8.13.35",
             "source": {
                 "type": "git",
                 "url": "https://github.com/giggsey/libphonenumber-for-php-lite.git",
-                "reference": "31ef173acc59e3b6850a85aebcc8bcac88b91f5b"
+                "reference": "2908ab704834762f2074a25e41d524bdec76829b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php-lite/zipball/31ef173acc59e3b6850a85aebcc8bcac88b91f5b",
-                "reference": "31ef173acc59e3b6850a85aebcc8bcac88b91f5b",
+                "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php-lite/zipball/2908ab704834762f2074a25e41d524bdec76829b",
+                "reference": "2908ab704834762f2074a25e41d524bdec76829b",
                 "shasum": ""
             },
             "require": {
@@ -1044,7 +1044,7 @@
                 "issues": "https://github.com/giggsey/libphonenumber-for-php-lite/issues",
                 "source": "https://github.com/giggsey/libphonenumber-for-php-lite"
             },
-            "time": "2023-12-19T08:18:51+00:00"
+            "time": "2024-04-19T12:41:17+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
diff --git a/composer/installed.json b/composer/installed.json
index c4468118b..2a6c28d33 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1002,17 +1002,17 @@
         },
         {
             "name": "giggsey/libphonenumber-for-php-lite",
-            "version": "8.13.27",
-            "version_normalized": "8.13.27.0",
+            "version": "8.13.35",
+            "version_normalized": "8.13.35.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/giggsey/libphonenumber-for-php-lite.git",
-                "reference": "31ef173acc59e3b6850a85aebcc8bcac88b91f5b"
+                "reference": "2908ab704834762f2074a25e41d524bdec76829b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php-lite/zipball/31ef173acc59e3b6850a85aebcc8bcac88b91f5b",
-                "reference": "31ef173acc59e3b6850a85aebcc8bcac88b91f5b",
+                "url": "https://api.github.com/repos/giggsey/libphonenumber-for-php-lite/zipball/2908ab704834762f2074a25e41d524bdec76829b",
+                "reference": "2908ab704834762f2074a25e41d524bdec76829b",
                 "shasum": ""
             },
             "require": {
@@ -1039,7 +1039,7 @@
             "suggest": {
                 "giggsey/libphonenumber-for-php": "Use libphonenumber-for-php for geocoding, carriers, timezones and matching"
             },
-            "time": "2023-12-19T08:18:51+00:00",
+            "time": "2024-04-19T12:41:17+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
diff --git a/composer/installed.php b/composer/installed.php
index 614032fc2..396ecaf21 100644
--- a/composer/installed.php
+++ b/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'nextcloud/3rdparty',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '8b0b1d39a99caaab7fefebfda92543b01ba6a8bb',
+        'reference' => 'e6472c57e8ce0baae2ffd975a2dbe39acf3c0a41',
         'type' => 'library',
         'install_path' => __DIR__ . '/../',
         'aliases' => array(),
@@ -137,9 +137,9 @@
             'dev_requirement' => false,
         ),
         'giggsey/libphonenumber-for-php-lite' => array(
-            'pretty_version' => '8.13.27',
-            'version' => '8.13.27.0',
-            'reference' => '31ef173acc59e3b6850a85aebcc8bcac88b91f5b',
+            'pretty_version' => '8.13.35',
+            'version' => '8.13.35.0',
+            'reference' => '2908ab704834762f2074a25e41d524bdec76829b',
             'type' => 'library',
             'install_path' => __DIR__ . '/../giggsey/libphonenumber-for-php-lite',
             'aliases' => array(),
@@ -292,7 +292,7 @@
         'nextcloud/3rdparty' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '8b0b1d39a99caaab7fefebfda92543b01ba6a8bb',
+            'reference' => 'e6472c57e8ce0baae2ffd975a2dbe39acf3c0a41',
             'type' => 'library',
             'install_path' => __DIR__ . '/../',
             'aliases' => array(),
diff --git a/giggsey/libphonenumber-for-php-lite/src/PhoneNumberUtil.php b/giggsey/libphonenumber-for-php-lite/src/PhoneNumberUtil.php
index 5a7180834..fb470638c 100644
--- a/giggsey/libphonenumber-for-php-lite/src/PhoneNumberUtil.php
+++ b/giggsey/libphonenumber-for-php-lite/src/PhoneNumberUtil.php
@@ -109,7 +109,7 @@ class PhoneNumberUtil
     //protected const UNWANTED_END_CHAR_PATTERN = '[[\\P{N}&&\\P{L}]&&[^#]]+$';
     protected const UNWANTED_END_CHAR_PATTERN = '[^' . self::DIGITS . self::VALID_ALPHA . '#]+$';
     protected const DIALLABLE_CHAR_MAPPINGS = self::ASCII_DIGIT_MAPPINGS
-    + [self::PLUS_SIGN => self::PLUS_SIGN]
+        + [self::PLUS_SIGN => self::PLUS_SIGN]
     + ['*' => '*', '#' => '#'];
 
 
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AU.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AU.php
index bef3768a3..6a0502ca1 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AU.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_AU.php
@@ -23,7 +23,7 @@
   ],
   'fixedLine' =>
    [
-    'NationalNumberPattern' => '(?:(?:2(?:[0-26-9]\\d|3[0-8]|4[02-9]|5[0135-9])|3(?:[0-3589]\\d|4[0-578]|6[1-9]|7[0-35-9])|7(?:[013-57-9]\\d|2[0-8]))\\d{3}|8(?:51(?:0(?:0[03-9]|[12479]\\d|3[2-9]|5[0-8]|6[1-9]|8[0-7])|1(?:[0235689]\\d|1[0-69]|4[0-589]|7[0-47-9])|2(?:0[0-79]|[18][13579]|2[14-9]|3[0-46-9]|[4-6]\\d|7[89]|9[0-4]))|(?:6[0-8]|[78]\\d)\\d{3}|9(?:[02-9]\\d{3}|1(?:(?:[0-58]\\d|6[0135-9])\\d|7(?:0[0-24-9]|[1-9]\\d)|9(?:[0-46-9]\\d|5[0-79])))))\\d{3}',
+    'NationalNumberPattern' => '(?:(?:(?:2(?:[0-26-9]\\d|3[0-8]|4[02-9]|5[0135-9])|7(?:[013-57-9]\\d|2[0-8]))\\d|3(?:(?:[0-3589]\\d|6[1-9]|7[0-35-9])\\d|4(?:[0-578]\\d|90)))\\d\\d|8(?:51(?:0(?:0[03-9]|[12479]\\d|3[2-9]|5[0-8]|6[1-9]|8[0-7])|1(?:[0235689]\\d|1[0-69]|4[0-589]|7[0-47-9])|2(?:0[0-79]|[18][13579]|2[14-9]|3[0-46-9]|[4-6]\\d|7[89]|9[0-4])|3\\d\\d)|(?:6[0-8]|[78]\\d)\\d{3}|9(?:[02-9]\\d{3}|1(?:(?:[0-58]\\d|6[0135-9])\\d|7(?:0[0-24-9]|[1-9]\\d)|9(?:[0-46-9]\\d|5[0-79])))))\\d{3}',
     'ExampleNumber' => '212345678',
     'PossibleLength' =>
      [
@@ -36,7 +36,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-26-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
+    'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-36-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
     'ExampleNumber' => '412345678',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BJ.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BJ.php
index 463e4fb00..67c583a5f 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BJ.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BJ.php
@@ -22,7 +22,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:4[0-6]|[56]\\d|9[013-9])\\d{6}',
+    'NationalNumberPattern' => '(?:4[0-7]|[56]\\d|9[013-9])\\d{6}',
     'ExampleNumber' => '90011234',
   ],
   'tollFree' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BL.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BL.php
index 1efc277c7..0e1b82314 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BL.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BL.php
@@ -22,7 +22,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '69(?:0\\d\\d|1(?:2[2-9]|3[0-5]))\\d{4}',
+    'NationalNumberPattern' => '69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))\\d{4}',
     'ExampleNumber' => '690001234',
   ],
   'tollFree' =>
@@ -53,7 +53,7 @@
   ],
   'voip' =>
    [
-    'NationalNumberPattern' => '9(?:(?:395|76[018])\\d|475[0-5])\\d{4}',
+    'NationalNumberPattern' => '9(?:(?:39[5-7]|76[018])\\d|475[0-5])\\d{4}',
     'ExampleNumber' => '976012345',
   ],
   'pager' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BM.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BM.php
index e387c561a..787a63dcc 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BM.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BM.php
@@ -30,7 +30,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '441(?:[2378]\\d|5[0-39]|92)\\d{5}',
+    'NationalNumberPattern' => '441(?:[2378]\\d|5[0-39]|9[02])\\d{5}',
     'ExampleNumber' => '4413701234',
     'PossibleLengthLocalOnly' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BS.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BS.php
index 36c6e84ab..8cbc54b7a 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BS.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_BS.php
@@ -30,7 +30,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '242(?:3(?:5[79]|7[56]|95)|4(?:[23][1-9]|4[1-35-9]|5[1-8]|6[2-8]|7\\d|81)|5(?:2[45]|3[35]|44|5[1-46-9]|65|77)|6[34]6|7(?:27|38)|8(?:0[1-9]|1[02-9]|2\\d|[89]9))\\d{4}',
+    'NationalNumberPattern' => '242(?:3(?:5[79]|7[56]|95)|4(?:[23][1-9]|4[1-35-9]|5[1-8]|6[2-8]|7\\d|81)|5(?:2[45]|3[35]|44|5[1-46-9]|65|77)|6[34]6|7(?:27|38)|8(?:0[1-9]|1[02-9]|2\\d|3[0-4]|[89]9))\\d{4}',
     'ExampleNumber' => '2423591234',
     'PossibleLengthLocalOnly' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CA.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CA.php
index d5e5bfbf7..475f13b5b 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CA.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CA.php
@@ -18,7 +18,7 @@
   ],
   'fixedLine' =>
    [
-    'NationalNumberPattern' => '(?:2(?:04|[23]6|[48]9|50|63)|3(?:06|43|54|6[578]|82)|4(?:03|1[68]|[26]8|3[178]|50|74)|5(?:06|1[49]|48|79|8[147])|6(?:04|[18]3|39|47|72)|7(?:0[59]|42|53|78|8[02])|8(?:[06]7|19|25|73)|90[25])[2-9]\\d{6}',
+    'NationalNumberPattern' => '(?:2(?:04|[23]6|[48]9|50|63)|3(?:06|43|54|6[578]|82)|4(?:03|1[68]|[26]8|3[178]|50|74)|5(?:06|1[49]|48|79|8[147])|6(?:04|[18]3|39|47|72)|7(?:0[59]|42|53|78|8[02])|8(?:[06]7|19|25|7[39])|90[25])[2-9]\\d{6}',
     'ExampleNumber' => '5062345678',
     'PossibleLength' =>
      [
@@ -31,7 +31,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:2(?:04|[23]6|[48]9|50|63)|3(?:06|43|54|6[578]|82)|4(?:03|1[68]|[26]8|3[178]|50|74)|5(?:06|1[49]|48|79|8[147])|6(?:04|[18]3|39|47|72)|7(?:0[59]|42|53|78|8[02])|8(?:[06]7|19|25|73)|90[25])[2-9]\\d{6}',
+    'NationalNumberPattern' => '(?:2(?:04|[23]6|[48]9|50|63)|3(?:06|43|54|6[578]|82)|4(?:03|1[68]|[26]8|3[178]|50|74)|5(?:06|1[49]|48|79|8[147])|6(?:04|[18]3|39|47|72)|7(?:0[59]|42|53|78|8[02])|8(?:[06]7|19|25|7[39])|90[25])[2-9]\\d{6}',
     'ExampleNumber' => '5062345678',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CC.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CC.php
index 1198db282..a8a877875 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CC.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CC.php
@@ -35,7 +35,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-26-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
+    'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-36-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
     'ExampleNumber' => '412345678',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CD.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CD.php
index d3b9df3bd..9d351eea4 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CD.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CD.php
@@ -23,7 +23,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '88\\d{5}|(?:8[0-59]|9[017-9])\\d{7}',
+    'NationalNumberPattern' => '88\\d{5}|(?:8[0-69]|9[017-9])\\d{7}',
     'ExampleNumber' => '991234567',
   ],
   'tollFree' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CN.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CN.php
index 297f130b1..296a010cb 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CN.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CN.php
@@ -149,13 +149,27 @@
       'format' => '$1',
       'leadingDigitsPatterns' =>
        [
-        0 => '10|96',
+        0 => '1(?:00|2[13])|95',
+        1 => '1(?:00|2(?:11|39))|95',
+        2 => '1(?:00|2(?:110|395))|95',
       ],
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
       'nationalPrefixOptionalWhenFormatting' => false,
     ],
     1 =>
+     [
+      'pattern' => '(\\d{5,6})',
+      'format' => '$1',
+      'leadingDigitsPatterns' =>
+       [
+        0 => '10|96',
+      ],
+      'nationalPrefixFormattingRule' => '',
+      'domesticCarrierCodeFormattingRule' => '',
+      'nationalPrefixOptionalWhenFormatting' => false,
+    ],
+    2 =>
      [
       'pattern' => '(\\d{2})(\\d{5,6})',
       'format' => '$1 $2',
@@ -169,7 +183,7 @@
       'domesticCarrierCodeFormattingRule' => '$CC $1',
       'nationalPrefixOptionalWhenFormatting' => false,
     ],
-    2 =>
+    3 =>
      [
       'pattern' => '(\\d{3})(\\d{4})',
       'format' => '$1 $2',
@@ -183,7 +197,7 @@
       'domesticCarrierCodeFormattingRule' => '',
       'nationalPrefixOptionalWhenFormatting' => false,
     ],
-    3 =>
+    4 =>
      [
       'pattern' => '(\\d{4})(\\d{4})',
       'format' => '$1 $2',
@@ -195,7 +209,7 @@
       'domesticCarrierCodeFormattingRule' => '',
       'nationalPrefixOptionalWhenFormatting' => false,
     ],
-    4 =>
+    5 =>
      [
       'pattern' => '(\\d{3})(\\d{5,6})',
       'format' => '$1 $2',
@@ -210,7 +224,7 @@
       'domesticCarrierCodeFormattingRule' => '$CC $1',
       'nationalPrefixOptionalWhenFormatting' => false,
     ],
-    5 =>
+    6 =>
      [
       'pattern' => '(\\d{4})(\\d{4})',
       'format' => '$1 $2',
@@ -225,7 +239,7 @@
       'domesticCarrierCodeFormattingRule' => '',
       'nationalPrefixOptionalWhenFormatting' => false,
     ],
-    6 =>
+    7 =>
      [
       'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
       'format' => '$1 $2 $3',
@@ -237,7 +251,7 @@
       'domesticCarrierCodeFormattingRule' => '',
       'nationalPrefixOptionalWhenFormatting' => false,
     ],
-    7 =>
+    8 =>
      [
       'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
       'format' => '$1 $2 $3',
@@ -251,7 +265,7 @@
       'domesticCarrierCodeFormattingRule' => '$CC $1',
       'nationalPrefixOptionalWhenFormatting' => true,
     ],
-    8 =>
+    9 =>
      [
       'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
       'format' => '$1 $2 $3',
@@ -263,7 +277,7 @@
       'domesticCarrierCodeFormattingRule' => '$CC $1',
       'nationalPrefixOptionalWhenFormatting' => true,
     ],
-    9 =>
+    10 =>
      [
       'pattern' => '(\\d{3})(\\d{7,8})',
       'format' => '$1 $2',
@@ -275,7 +289,7 @@
       'domesticCarrierCodeFormattingRule' => '',
       'nationalPrefixOptionalWhenFormatting' => false,
     ],
-    10 =>
+    11 =>
      [
       'pattern' => '(\\d{4})(\\d{3})(\\d{4})',
       'format' => '$1 $2 $3',
@@ -287,7 +301,7 @@
       'domesticCarrierCodeFormattingRule' => '$CC $1',
       'nationalPrefixOptionalWhenFormatting' => true,
     ],
-    11 =>
+    12 =>
      [
       'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
       'format' => '$1 $2 $3',
@@ -299,7 +313,7 @@
       'domesticCarrierCodeFormattingRule' => '$CC $1',
       'nationalPrefixOptionalWhenFormatting' => true,
     ],
-    12 =>
+    13 =>
      [
       'pattern' => '(\\d{3})(\\d{4})(\\d{4})',
       'format' => '$1 $2 $3',
@@ -311,7 +325,7 @@
       'domesticCarrierCodeFormattingRule' => '$CC $1',
       'nationalPrefixOptionalWhenFormatting' => false,
     ],
-    13 =>
+    14 =>
      [
       'pattern' => '(\\d{2})(\\d{3})(\\d{3})(\\d{4})',
       'format' => '$1 $2 $3 $4',
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CU.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CU.php
index 187a64e7c..de3019512 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CU.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CU.php
@@ -9,7 +9,7 @@
 return  [
   'generalDesc' =>
    [
-    'NationalNumberPattern' => '[27]\\d{6,7}|[34]\\d{5,7}|63\\d{6}|(?:5|8\\d\\d)\\d{7}',
+    'NationalNumberPattern' => '(?:[2-7]|8\\d\\d)\\d{7}|[2-47]\\d{6}|[34]\\d{5}',
     'PossibleLength' =>
      [
       0 => 6,
@@ -35,7 +35,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:5\\d|63)\\d{6}',
+    'NationalNumberPattern' => '(?:5\\d|6[2-4])\\d{6}',
     'ExampleNumber' => '51234567',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CX.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CX.php
index ddb8a48a3..288785808 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CX.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CX.php
@@ -35,7 +35,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-26-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
+    'NationalNumberPattern' => '4(?:(?:79|94)[01]|83[0-389])\\d{5}|4(?:[0-3]\\d|4[047-9]|5[0-25-9]|6[0-36-9]|7[02-8]|8[0-24-9]|9[0-37-9])\\d{6}',
     'ExampleNumber' => '412345678',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CZ.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CZ.php
index 6b7cadb3f..3993f594c 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CZ.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_CZ.php
@@ -29,7 +29,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:60[1-8]|7(?:0[2-5]|[2379]\\d))\\d{6}',
+    'NationalNumberPattern' => '(?:60[1-8]\\d|7(?:0(?:[2-5]\\d|60)|190|[2379]\\d\\d))\\d{5}',
     'ExampleNumber' => '601123456',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DK.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DK.php
index 38383fb80..7d45c93bf 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DK.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_DK.php
@@ -17,13 +17,13 @@
   ],
   'fixedLine' =>
    [
-    'NationalNumberPattern' => '(?:[2-7]\\d|8[126-9]|9[1-46-9])\\d{6}',
+    'NationalNumberPattern' => '(?:(?:2\\d|9[1-46-9])\\d|3(?:[0-37]\\d|4[013]|5[0-58]|6[01347-9]|8[0-8]|9[0-79])|4(?:[0-25]\\d|[34][02-9]|6[013-579]|7[013579]|8[0-47]|9[0-27])|5(?:[0-36]\\d|4[0146-9]|5[03-57-9]|7[0568]|8[0-358]|9[0-69])|6(?:[013578]\\d|2[0-68]|4[02-8]|6[01689]|9[015689])|7(?:[0-69]\\d|7[03-9]|8[0147])|8(?:[16-9]\\d|2[0-58]))\\d{5}',
     'ExampleNumber' => '32123456',
   ],
   'mobile' =>
    [
     'NationalNumberPattern' => '(?:[2-7]\\d|8[126-9]|9[1-46-9])\\d{6}',
-    'ExampleNumber' => '32123456',
+    'ExampleNumber' => '34412345',
   ],
   'tollFree' =>
    [
@@ -87,7 +87,7 @@
   'id' => 'DK',
   'countryCode' => 45,
   'internationalPrefix' => '00',
-  'sameMobileAndFixedLinePattern' => true,
+  'sameMobileAndFixedLinePattern' => false,
   'numberFormat' =>
    [
     0 =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_EH.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_EH.php
index 74a181f9a..f23bbec9a 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_EH.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_EH.php
@@ -22,7 +22,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-2]|5[01]|8[0-3]))\\d{6}',
+    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-4]|5[01]|8[0-3]))\\d{6}',
     'ExampleNumber' => '650123456',
   ],
   'tollFree' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_FR.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_FR.php
index 97f1c53ff..a0f76f5f1 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_FR.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_FR.php
@@ -17,7 +17,7 @@
   ],
   'fixedLine' =>
    [
-    'NationalNumberPattern' => '59[1-9]\\d{6}|(?:[1-3]\\d|4[1-9]|5[0-8])\\d{7}',
+    'NationalNumberPattern' => '(?:26[013-9]|59[1-35-9])\\d{6}|(?:[13]\\d|2[0-57-9]|4[1-9]|5[0-8])\\d{7}',
     'ExampleNumber' => '123456789',
   ],
   'mobile' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GB.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GB.php
index 0bd691172..2e2476f53 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GB.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GB.php
@@ -26,7 +26,7 @@
   ],
   'fixedLine' =>
    [
-    'NationalNumberPattern' => '(?:1(?:1(?:3(?:[0-58]\\d\\d|73[0235])|4(?:[0-5]\\d\\d|69[7-9]|70[0-79])|(?:(?:5[0-26-9]|[78][0-49])\\d|6(?:[0-4]\\d|50))\\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[0-2]))|(?: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[0235])|4(?:(?:[0-5]\\d|70)\\d|69[7-9])|(?:(?:5[0-26-9]|[78][0-49])\\d|6(?:[0-4]\\d|50))\\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[0-2]))|(?: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' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GD.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GD.php
index 54d6de08e..d52b5b748 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GD.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GD.php
@@ -21,7 +21,7 @@
   ],
   'fixedLine' =>
    [
-    'NationalNumberPattern' => '473(?:2(?:3[0-2]|69)|3(?:2[89]|86)|4(?:[06]8|3[5-9]|4[0-49]|5[5-79]|73|90)|63[68]|7(?:58|84)|800|938)\\d{4}',
+    'NationalNumberPattern' => '473(?:2(?:3[0-2]|69)|3(?:2[89]|86)|4(?:[06]8|3[5-9]|4[0-4]|5[579]|73|90)|63[68]|7(?:58|84)|800|938)\\d{4}',
     'ExampleNumber' => '4732691234',
     'PossibleLengthLocalOnly' =>
      [
@@ -30,7 +30,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '473(?:4(?:0[2-79]|1[04-9]|2[0-5]|58)|5(?:2[01]|3[3-8])|901)\\d{4}',
+    'NationalNumberPattern' => '473(?:4(?:0[2-79]|1[04-9]|2[0-5]|49|5[68])|5(?:2[01]|3[3-8])|901)\\d{4}',
     'ExampleNumber' => '4734031234',
     'PossibleLengthLocalOnly' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GE.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GE.php
index 51a8702dd..661916148 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GE.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GE.php
@@ -32,7 +32,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\\d|22252[0-4])\\d\\d|(?:5(?:00(?:0\\d|11|22|33|44|5[05]|77|88|9[09])|1(?:1(?:00|[124]\\d|3[01])|4\\d\\d)|(?:44|68)\\d\\d|5(?:[0157-9]\\d\\d|200)|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|58[89]|8(?:55|88))|9(?:090|[1-35-9]\\d\\d))|790\\d\\d)\\d{4}|5(?:0(?:0[17]0|505)|1(?:0[01]0|1(?:07|33|51))|2(?:0[02]0|2[25]2)|3(?:0[03]0|3[35]3)|(?:40[04]|900)0|5222)[0-4]\\d{3}',
+    'NationalNumberPattern' => '5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\\d|22252[0-4])\\d\\d|(?:5(?:0(?:0(?:0\\d|11|22|33|44|5[05]|77|88|9[09])|111)|1(?:1(?:[03][01]|[124]\\d)|4\\d\\d)|(?:44|6[89])\\d\\d|5(?:[0157-9]\\d\\d|200)|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|58[89]|8(?:55|88))|9(?:090|[1-35-9]\\d\\d))|790\\d\\d)\\d{4}|5(?:0(?:0[17]0|505)|1(?:0[01]0|1(?:07|33|51))|2(?:0[02]0|2[25]2)|3(?:0[03]0|3[35]3)|(?:40[04]|900)0|5222)[0-4]\\d{3}',
     'ExampleNumber' => '555123456',
   ],
   'tollFree' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GF.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GF.php
index 601c74146..87f22a9b5 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GF.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GF.php
@@ -17,7 +17,7 @@
   ],
   'fixedLine' =>
    [
-    'NationalNumberPattern' => '594(?:[02-49]\\d|1[0-4]|5[6-9]|6[0-3]|80)\\d{4}',
+    'NationalNumberPattern' => '594(?:[02-49]\\d|1[0-5]|5[6-9]|6[0-3]|80)\\d{4}',
     'ExampleNumber' => '594101234',
   ],
   'mobile' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GP.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GP.php
index 15f7a50c9..50137f4e1 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GP.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GP.php
@@ -22,7 +22,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '69(?:0\\d\\d|1(?:2[2-9]|3[0-5]))\\d{4}',
+    'NationalNumberPattern' => '69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))\\d{4}',
     'ExampleNumber' => '690001234',
   ],
   'tollFree' =>
@@ -53,7 +53,7 @@
   ],
   'voip' =>
    [
-    'NationalNumberPattern' => '9(?:(?:395|76[018])\\d|475[0-5])\\d{4}',
+    'NationalNumberPattern' => '9(?:(?:39[5-7]|76[018])\\d|475[0-5])\\d{4}',
     'ExampleNumber' => '976012345',
   ],
   'pager' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GY.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GY.php
index c07a55962..4d07dcdc7 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GY.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_GY.php
@@ -22,7 +22,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:510|6\\d\\d|7(?:0\\d|1[0-8]|25|49))\\d{4}',
+    'NationalNumberPattern' => '(?:510|6\\d\\d|7(?:[01]\\d|2[1256]|3[12]|49))\\d{4}',
     'ExampleNumber' => '6091234',
   ],
   'tollFree' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HK.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HK.php
index 3f6dec483..572288417 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HK.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HK.php
@@ -31,7 +31,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:4(?:44[5-9]|6(?:1[0-7]|4[0-57-9]|6[0-4]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-6]|8[0-4])|848[0-25-9]|9(?:29[013-9]|59[0-4]|899))\\d{4}|(?:4(?:4[0156]|6[02357-9])|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])|709|84[09]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}',
+    'NationalNumberPattern' => '(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|848[0-35-9]|9(?:29[013-9]|39[01]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-8]|6[02357-9])|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])|70[129]|84[0-29]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}',
     'ExampleNumber' => '51234567',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HR.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HR.php
index c9bd2226b..7b61e56f9 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HR.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_HR.php
@@ -35,7 +35,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '9(?:(?:0[1-9]|[12589]\\d)\\d\\d|7(?:[0679]\\d\\d|5(?:[01]\\d|44|77|9[5-7])))\\d{4}|98\\d{6}',
+    'NationalNumberPattern' => '9(?:(?:0[1-9]|[12589]\\d)\\d\\d|7(?:[0679]\\d\\d|5(?:[01]\\d|44|55|77|9[5-7])))\\d{4}|98\\d{6}',
     'ExampleNumber' => '921234567',
     'PossibleLength' =>
      [
@@ -169,7 +169,7 @@
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' =>
        [
-        0 => '[67]',
+        0 => '6|7[245]',
       ],
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
@@ -193,7 +193,7 @@
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' =>
        [
-        0 => '[2-5]',
+        0 => '[2-57]',
       ],
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IL.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IL.php
index c2a1f72fb..f9c6344b6 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IL.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IL.php
@@ -82,7 +82,7 @@
   ],
   'voip' =>
    [
-    'NationalNumberPattern' => '7(?:38(?:0\\d|5[09]|88)|8(?:33|55|77|81)\\d)\\d{4}|7(?:18|2[23]|3[237]|47|6[258]|7\\d|82|9[2-9])\\d{6}',
+    'NationalNumberPattern' => '7(?:38(?:0\\d|5[0-29]|88)|8(?:33|55|77|81)\\d)\\d{4}|7(?:18|2[23]|3[237]|47|6[258]|7\\d|82|9[2-9])\\d{6}',
     'ExampleNumber' => '771234567',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IR.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IR.php
index cf60c058d..b8ed112f2 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IR.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IR.php
@@ -25,7 +25,7 @@
   ],
   'fixedLine' =>
    [
-    'NationalNumberPattern' => '(?:1[137]|2[13-68]|3[1458]|4[145]|5[1468]|6[16]|7[1467]|8[13467])(?:[03-57]\\d{7}|[16]\\d{3}(?:\\d{4})?|[289]\\d{3}(?:\\d(?:\\d{3})?)?)|94(?:000[09]|2(?:121|[2689]0\\d)|30[0-2]\\d|4(?:111|40\\d))\\d{4}',
+    'NationalNumberPattern' => '(?:1[137]|2[13-68]|3[1458]|4[145]|5[1468]|6[16]|7[1467]|8[13467])(?:[03-57]\\d{7}|[16]\\d{3}(?:\\d{4})?|[289]\\d{3}(?:\\d(?:\\d{3})?)?)|94(?:000[09]|(?:12\\d|30[0-2])\\d|2(?:121|[2689]0\\d)|4(?:111|40\\d))\\d{4}',
     'ExampleNumber' => '2123456789',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IT.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IT.php
index 288c6101d..9c7336067 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IT.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_IT.php
@@ -9,7 +9,7 @@
 return  [
   'generalDesc' =>
    [
-    'NationalNumberPattern' => '0\\d{5,10}|1\\d{8,10}|3(?:[0-8]\\d{7,10}|9\\d{7,8})|(?:55|70)\\d{8}|8\\d{5}(?:\\d{2,4})?',
+    'NationalNumberPattern' => '0\\d{5,10}|1\\d{8,10}|3(?:[0-8]\\d{7,10}|9\\d{7,8})|(?:43|55|70)\\d{8}|8\\d{5}(?:\\d{2,4})?',
     'PossibleLength' =>
      [
       0 => 6,
@@ -37,7 +37,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '3[1-9]\\d{8}|3[2-9]\\d{7}',
+    'NationalNumberPattern' => '3[2-9]\\d{7,8}|(?:31|43)\\d{8}',
     'ExampleNumber' => '3123456789',
     'PossibleLength' =>
      [
@@ -226,7 +226,7 @@
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' =>
        [
-        0 => '1(?:44|[679])|[378]',
+        0 => '1(?:44|[679])|[378]|43',
       ],
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
@@ -350,7 +350,7 @@
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' =>
        [
-        0 => '1(?:44|[679])|[378]',
+        0 => '1(?:44|[679])|[378]|43',
       ],
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JE.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JE.php
index 828b452da..085996b1c 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JE.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_JE.php
@@ -30,7 +30,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '7(?:(?:(?:50|82)9|937)\\d|7(?:00[378]|97[7-9]))\\d{5}',
+    'NationalNumberPattern' => '7(?:(?:(?:50|82)9|937)\\d|7(?:00[378]|97\\d))\\d{5}',
     'ExampleNumber' => '7797712345',
   ],
   'tollFree' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KE.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KE.php
index 0620a21d6..1537060e6 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KE.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KE.php
@@ -31,7 +31,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:1(?:0[0-6]|1[0-5]|2[014]|30)|7\\d\\d)\\d{6}',
+    'NationalNumberPattern' => '(?:1(?:0[0-8]|1[0-5]|2[014]|30)|7\\d\\d)\\d{6}',
     'ExampleNumber' => '712123456',
     'PossibleLength' =>
      [
@@ -40,7 +40,7 @@
   ],
   'tollFree' =>
    [
-    'NationalNumberPattern' => '800[2-8]\\d{5,6}',
+    'NationalNumberPattern' => '800[02-8]\\d{5,6}',
     'ExampleNumber' => '800223456',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KR.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KR.php
index 81e5cdffa..1b4a5b299 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KR.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KR.php
@@ -118,7 +118,7 @@
   ],
   'uan' =>
    [
-    'NationalNumberPattern' => '1(?:5(?:22|33|44|66|77|88|99)|6(?:[07]0|44|6[168]|88)|8(?:00|33|55|77|99))\\d{4}',
+    'NationalNumberPattern' => '1(?:5(?:22|33|44|66|77|88|99)|6(?:[07]0|44|6[0168]|88)|8(?:00|33|55|77|99))\\d{4}',
     'ExampleNumber' => '15441234',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KW.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KW.php
index 19d316441..849f37ac4 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KW.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_KW.php
@@ -27,7 +27,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:41\\d\\d|5(?:(?:[05]\\d|1[0-7]|6[56])\\d|2(?:22|5[25])|7(?:55|77)|88[58])|6(?:(?:0[034679]|5[015-9]|6\\d)\\d|1(?:00|11|66)|222|3[36]3|444|7(?:0[013-9]|[67]\\d)|888|9(?:[069]\\d|3[039]))|9(?:(?:0[09]|[4679]\\d|8[057-9])\\d|1(?:1[01]|99)|2(?:00|2\\d)|3(?:00|3[03])|5(?:00|5\\d)))\\d{4}',
+    'NationalNumberPattern' => '(?:41\\d\\d|5(?:(?:[05]\\d|1[0-7]|6[56])\\d|2(?:22|5[25])|7(?:55|77)|88[58])|6(?:(?:0[034679]|5[015-9]|6\\d)\\d|1(?:00|11|6[16])|2[26]2|3[36]3|4[46]4|7(?:0[013-9]|[67]\\d)|8[68]8|9(?:[069]\\d|3[039]))|9(?:(?:[04679]\\d|8[057-9])\\d|1(?:1[01]|99)|2(?:00|2\\d)|3(?:00|3[03])|5(?:00|5\\d)))\\d{4}',
     'ExampleNumber' => '50012345',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LA.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LA.php
index e1d496eca..0d34f8322 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LA.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LA.php
@@ -36,11 +36,12 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:20(?:[2359]\\d|7[6-8]|88)|302\\d)\\d{6}',
+    'NationalNumberPattern' => '(?:20(?:[23579]\\d|88)|30(?:2\\d|4))\\d{6}',
     'ExampleNumber' => '2023123456',
     'PossibleLength' =>
      [
-      0 => 10,
+      0 => 9,
+      1 => 10,
     ],
   ],
   'tollFree' =>
@@ -87,7 +88,7 @@
   ],
   'uan' =>
    [
-    'NationalNumberPattern' => '30[013-9]\\d{6}',
+    'NationalNumberPattern' => '30[0135-9]\\d{6}',
     'ExampleNumber' => '301234567',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LI.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LI.php
index 0958059b3..4bf8d552e 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LI.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LI.php
@@ -27,7 +27,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:6(?:(?:4[5-9]|5[0-469])\\d|6(?:[0245]\\d|[17]0|3[7-9]))\\d|7(?:[37-9]\\d|42|56))\\d{4}',
+    'NationalNumberPattern' => '(?:6(?:(?:4[5-9]|5[0-469])\\d|6(?:[024-6]\\d|[17]0|3[7-9]))\\d|7(?:[37-9]\\d|42|56))\\d{4}',
     'ExampleNumber' => '660234567',
   ],
   'tollFree' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LR.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LR.php
index ffcc0dd26..db8b55433 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LR.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LR.php
@@ -9,7 +9,7 @@
 return  [
   'generalDesc' =>
    [
-    'NationalNumberPattern' => '(?:[25]\\d|33|77|88)\\d{7}|(?:2\\d|[4-6])\\d{6}',
+    'NationalNumberPattern' => '(?:[245]\\d|33|77|88)\\d{7}|(?:2\\d|[4-6])\\d{6}',
     'PossibleLength' =>
      [
       0 => 7,
@@ -28,7 +28,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:(?:(?:22|33)0|555|(?:77|88)\\d)\\d|4[67])\\d{5}|[56]\\d{6}',
+    'NationalNumberPattern' => '(?:(?:(?:22|33)0|555|(?:77|88)\\d)\\d|4(?:240|[67]))\\d{5}|[56]\\d{6}',
     'ExampleNumber' => '770123456',
     'PossibleLength' =>
      [
@@ -115,7 +115,7 @@
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' =>
        [
-        0 => '[4-6]',
+        0 => '4[67]|[56]',
       ],
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
@@ -139,7 +139,7 @@
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' =>
        [
-        0 => '[23578]',
+        0 => '[2-578]',
       ],
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LS.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LS.php
index 6b7892706..b74165eb1 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LS.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LS.php
@@ -27,7 +27,7 @@
   ],
   'tollFree' =>
    [
-    'NationalNumberPattern' => '800[256]\\d{4}',
+    'NationalNumberPattern' => '800[1256]\\d{4}',
     'ExampleNumber' => '80021234',
   ],
   'premiumRate' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LT.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LT.php
index 99777a461..764629151 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LT.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_LT.php
@@ -79,7 +79,7 @@
   'id' => 'LT',
   'countryCode' => 370,
   'internationalPrefix' => '00',
-  'nationalPrefix' => '8',
+  'nationalPrefix' => '0',
   'nationalPrefixForParsing' => '[08]',
   'sameMobileAndFixedLinePattern' => false,
   'numberFormat' =>
@@ -92,7 +92,7 @@
        [
         0 => '52[0-7]',
       ],
-      'nationalPrefixFormattingRule' => '(8-$1)',
+      'nationalPrefixFormattingRule' => '(0-$1)',
       'domesticCarrierCodeFormattingRule' => '',
       'nationalPrefixOptionalWhenFormatting' => true,
     ],
@@ -104,7 +104,7 @@
        [
         0 => '[7-9]',
       ],
-      'nationalPrefixFormattingRule' => '8 $1',
+      'nationalPrefixFormattingRule' => '0 $1',
       'domesticCarrierCodeFormattingRule' => '',
       'nationalPrefixOptionalWhenFormatting' => true,
     ],
@@ -116,7 +116,7 @@
        [
         0 => '37|4(?:[15]|6[1-8])',
       ],
-      'nationalPrefixFormattingRule' => '(8-$1)',
+      'nationalPrefixFormattingRule' => '(0-$1)',
       'domesticCarrierCodeFormattingRule' => '',
       'nationalPrefixOptionalWhenFormatting' => true,
     ],
@@ -128,7 +128,7 @@
        [
         0 => '[3-6]',
       ],
-      'nationalPrefixFormattingRule' => '(8-$1)',
+      'nationalPrefixFormattingRule' => '(0-$1)',
       'domesticCarrierCodeFormattingRule' => '',
       'nationalPrefixOptionalWhenFormatting' => true,
     ],
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MA.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MA.php
index 27bf9b2fb..7bedefaf3 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MA.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MA.php
@@ -22,7 +22,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-2]|5[01]|8[0-3]))\\d{6}',
+    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-4]|5[01]|8[0-3]))\\d{6}',
     'ExampleNumber' => '650123456',
   ],
   'tollFree' =>
@@ -108,8 +108,7 @@
       'format' => '$1-$2',
       'leadingDigitsPatterns' =>
        [
-        0 => '5(?:2[2-489]|3[5-9]|9)|8(?:0[89]|92)',
-        1 => '5(?:2(?:[2-49]|8[235-9])|3[5-9]|9)|8(?:0[89]|92)',
+        0 => '5(?:2[2-46-9]|3[3-9]|9)|8(?:0[89]|92)',
       ],
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MC.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MC.php
index be1bd7d70..c8eea2922 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MC.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MC.php
@@ -27,7 +27,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '4(?:[46]\\d|5[1-9])\\d{5}|(?:3|6\\d)\\d{7}',
+    'NationalNumberPattern' => '4(?:[469]\\d|5[1-9])\\d{5}|(?:3|6\\d)\\d{7}',
     'ExampleNumber' => '612345678',
   ],
   'tollFree' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MF.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MF.php
index b1a906c72..7c3470dc8 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MF.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MF.php
@@ -22,7 +22,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '69(?:0\\d\\d|1(?:2[2-9]|3[0-5]))\\d{4}',
+    'NationalNumberPattern' => '69(?:0\\d\\d|1(?:2[2-9]|3[0-5])|4(?:0[89]|1[2-6]|9\\d)|6(?:1[016-9]|5[0-4]|[67]\\d))\\d{4}',
     'ExampleNumber' => '690001234',
   ],
   'tollFree' =>
@@ -53,7 +53,7 @@
   ],
   'voip' =>
    [
-    'NationalNumberPattern' => '9(?:(?:395|76[018])\\d|475[0-5])\\d{4}',
+    'NationalNumberPattern' => '9(?:(?:39[5-7]|76[018])\\d|475[0-5])\\d{4}',
     'ExampleNumber' => '976012345',
   ],
   'pager' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MH.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MH.php
index b37a2aca4..a8e7f9992 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MH.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MH.php
@@ -17,12 +17,12 @@
   ],
   'fixedLine' =>
    [
-    'NationalNumberPattern' => '(?:247|45[78]|528|625)\\d{4}',
+    'NationalNumberPattern' => '(?:247|528|625)\\d{4}',
     'ExampleNumber' => '2471234',
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:(?:23|54)5|329|45[356])\\d{4}',
+    'NationalNumberPattern' => '(?:(?:23|54)5|329|45[35-8])\\d{4}',
     'ExampleNumber' => '2351234',
   ],
   'tollFree' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MQ.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MQ.php
index d1b951b4c..cff1f9b81 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MQ.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MQ.php
@@ -17,7 +17,7 @@
   ],
   'fixedLine' =>
    [
-    'NationalNumberPattern' => '596(?:[03-7]\\d|10|2[7-9]|8[0-39]|9[04-9])\\d{4}',
+    'NationalNumberPattern' => '596(?:[03-7]\\d|1[05]|2[7-9]|8[0-39]|9[04-9])\\d{4}',
     'ExampleNumber' => '596301234',
   ],
   'mobile' =>
@@ -53,7 +53,7 @@
   ],
   'voip' =>
    [
-    'NationalNumberPattern' => '9(?:397[0-2]|477[0-5]|76(?:6\\d|7[0-367]))\\d{4}',
+    'NationalNumberPattern' => '9(?:397[0-3]|477[0-5]|76(?:6\\d|7[0-367]))\\d{4}',
     'ExampleNumber' => '976612345',
   ],
   'pager' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MX.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MX.php
index 340fadfdb..fedef851c 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MX.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_MX.php
@@ -9,7 +9,7 @@
 return  [
   'generalDesc' =>
    [
-    'NationalNumberPattern' => '1(?:(?:[27]2|44|87|99)[1-9]|65[0-689])\\d{7}|(?:1(?:[01]\\d|2[13-9]|[35][1-9]|4[0-35-9]|6[0-46-9]|7[013-9]|8[1-69]|9[1-8])|[2-9]\\d)\\d{8}',
+    'NationalNumberPattern' => '1(?:(?:22|44|7[27]|87|9[69])[1-9]|65[0-689])\\d{7}|(?:1(?:[01]\\d|2[13-9]|[35][1-9]|4[0-35-9]|6[0-46-9]|7[013-689]|8[1-69]|9[1-578])|[2-9]\\d)\\d{8}',
     'PossibleLength' =>
      [
       0 => 10,
@@ -23,7 +23,7 @@
   ],
   'fixedLine' =>
    [
-    'NationalNumberPattern' => '657[12]\\d{6}|(?:2(?:0[01]|2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[13467][1-9]|2\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|6[1-9]|7[12]|8[1-8]|9\\d))\\d{7}',
+    'NationalNumberPattern' => '657[12]\\d{6}|(?:2(?:0[01]|2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}',
     'ExampleNumber' => '2001234567',
     'PossibleLength' =>
      [
@@ -37,7 +37,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '657[12]\\d{6}|(?:1(?:2(?:2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-7][1-9]|3[1-8]|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1-467][1-9]|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))|2(?:2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[13467][1-9]|2\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|6[1-9]|7[12]|8[1-8]|9\\d))\\d{7}',
+    'NationalNumberPattern' => '657[12]\\d{6}|(?:1(?:2(?:2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-7][1-9]|3[1-8]|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1-467][1-9]|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))|2(?:2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}',
     'ExampleNumber' => '12221234567',
     'PossibleLengthLocalOnly' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NG.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NG.php
index f0ecbbf7d..907bb99e0 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NG.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NG.php
@@ -9,7 +9,7 @@
 return  [
   'generalDesc' =>
    [
-    'NationalNumberPattern' => '(?:[124-7]|9\\d{3})\\d{6}|[1-9]\\d{7}|[78]\\d{9,13}',
+    'NationalNumberPattern' => '2[0-24-9]\\d{8}|[78]\\d{10,13}|[7-9]\\d{9}|[1-9]\\d{7}|[124-7]\\d{6}',
     'PossibleLength' =>
      [
       0 => 7,
@@ -28,12 +28,13 @@
   ],
   'fixedLine' =>
    [
-    'NationalNumberPattern' => '(?:(?:[1-356]\\d|4[02-8]|8[2-9])\\d|9(?:0[3-9]|[1-9]\\d))\\d{5}|7(?:0(?:[013-689]\\d|2[0-24-9])\\d{3,4}|[1-79]\\d{6})|(?:[12]\\d|4[147]|5[14579]|6[1578]|7[1-3578])\\d{5}',
+    'NationalNumberPattern' => '20(?:[1259]\\d|3[013-9]|4[1-8]|6[024-689]|7[1-79]|8[2-9])\\d{6}|(?:(?:[1-356]\\d|4[02-8]|8[2-9])\\d|9(?:0[3-9]|[1-9]\\d))\\d{5}|7(?:0(?:[013-689]\\d|2[0-24-9])\\d{3,4}|[1-79]\\d{6})|(?:[12]\\d|4[147]|5[14579]|6[1578]|7[1-3578])\\d{5}',
     'ExampleNumber' => '18040123',
     'PossibleLength' =>
      [
       0 => 7,
       1 => 8,
+      2 => 10,
     ],
     'PossibleLengthLocalOnly' =>
      [
@@ -43,7 +44,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:702[0-24-9]|819[01])\\d{6}|(?:70[13-689]|8(?:0[1-9]|1[0-8])|9(?:0[1-9]|1[1-356]))\\d{7}',
+    'NationalNumberPattern' => '(?:702[0-24-9]|819[01])\\d{6}|(?:7(?:0[13-9]|[12]\\d)|8(?:0[1-9]|1[0-8])|9(?:0[1-9]|1[1-6]))\\d{7}',
     'ExampleNumber' => '8021234567',
     'PossibleLength' =>
      [
@@ -163,7 +164,7 @@
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' =>
        [
-        0 => '[3-7]|8[2-9]',
+        0 => '[3-6]|7(?:0[0-689]|[1-79])|8[2-9]',
       ],
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
@@ -182,6 +183,30 @@
       'nationalPrefixOptionalWhenFormatting' => false,
     ],
     4 =>
+     [
+      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+      'format' => '$1 $2 $3',
+      'leadingDigitsPatterns' =>
+       [
+        0 => '20[129]',
+      ],
+      'nationalPrefixFormattingRule' => '0$1',
+      'domesticCarrierCodeFormattingRule' => '',
+      'nationalPrefixOptionalWhenFormatting' => false,
+    ],
+    5 =>
+     [
+      'pattern' => '(\\d{4})(\\d{2})(\\d{4})',
+      'format' => '$1 $2 $3',
+      'leadingDigitsPatterns' =>
+       [
+        0 => '2',
+      ],
+      'nationalPrefixFormattingRule' => '0$1',
+      'domesticCarrierCodeFormattingRule' => '',
+      'nationalPrefixOptionalWhenFormatting' => false,
+    ],
+    6 =>
      [
       'pattern' => '(\\d{3})(\\d{4})(\\d{4,5})',
       'format' => '$1 $2 $3',
@@ -193,7 +218,7 @@
       'domesticCarrierCodeFormattingRule' => '',
       'nationalPrefixOptionalWhenFormatting' => false,
     ],
-    5 =>
+    7 =>
      [
       'pattern' => '(\\d{3})(\\d{5})(\\d{5,6})',
       'format' => '$1 $2 $3',
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NP.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NP.php
index 9e33f0a7c..c74195a06 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NP.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_NP.php
@@ -38,7 +38,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '9(?:6[0-3]|7[024-6]|8[0-24-68])\\d{7}',
+    'NationalNumberPattern' => '9(?:00|6[0-3]|7[024-6]|8[0-24-68])\\d{7}',
     'ExampleNumber' => '9841234567',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_OM.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_OM.php
index 5b421a830..4ece1a58d 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_OM.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_OM.php
@@ -28,7 +28,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '1505\\d{4}|(?:7(?:[1289]\\d|6[89]|7[0-5])|9(?:0[1-9]|[1-9]\\d))\\d{5}',
+    'NationalNumberPattern' => '(?:1505|90[1-9]\\d)\\d{4}|(?:7[126-9]|9[1-9])\\d{6}',
     'ExampleNumber' => '92123456',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PG.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PG.php
index 4e17796f4..c4a535565 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PG.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PG.php
@@ -27,7 +27,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:7\\d|8[128])\\d{6}',
+    'NationalNumberPattern' => '(?:7\\d|8[1-38])\\d{6}',
     'ExampleNumber' => '70123456',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PL.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PL.php
index 79c2e1569..ef3e76a6d 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PL.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PL.php
@@ -31,7 +31,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '21(?:1(?:[145]\\d|3[1-5])|2\\d\\d)\\d{4}|(?:45|5[0137]|6[069]|7[2389]|88)\\d{7}',
+    'NationalNumberPattern' => '21(?:1[013-5]|2\\d)\\d{5}|(?:45|5[0137]|6[069]|7[2389]|88)\\d{7}',
     'ExampleNumber' => '512345678',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PT.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PT.php
index 7e4a6da94..937b9c45a 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PT.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_PT.php
@@ -22,7 +22,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '6(?:[06]92(?:30|9\\d)|[35]92(?:3[03]|9\\d))\\d{3}|(?:(?:16|6[0356])93|9(?:[1-36]\\d\\d|480))\\d{5}',
+    'NationalNumberPattern' => '6(?:[06]92(?:30|9\\d)|[35]92(?:[049]\\d|3[034]))\\d{3}|(?:(?:16|6[0356])93|9(?:[1-36]\\d\\d|480))\\d{5}',
     'ExampleNumber' => '912345678',
   ],
   'tollFree' =>
@@ -52,7 +52,7 @@
   ],
   'pager' =>
    [
-    'NationalNumberPattern' => '6222\\d{5}',
+    'NationalNumberPattern' => '6(?:222\\d|8988)\\d{4}',
     'ExampleNumber' => '622212345',
   ],
   'uan' =>
@@ -62,7 +62,7 @@
   ],
   'voicemail' =>
    [
-    'NationalNumberPattern' => '600\\d{6}|6[06]9233\\d{3}',
+    'NationalNumberPattern' => '600\\d{6}|6[06]92(?:0\\d|3[349]|49)\\d{3}',
     'ExampleNumber' => '600110000',
   ],
   'noInternationalDialling' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_RO.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_RO.php
index 337efedb2..4608ed2bf 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_RO.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_RO.php
@@ -23,7 +23,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '7020\\d{5}|(?:6(?:2\\d|40)|7(?:0[013-9]|1[0-3]|[2-7]\\d|8[03-8]|9[0-39]))\\d{6}',
+    'NationalNumberPattern' => '7020\\d{5}|(?:6(?:[04]0|2\\d)|7(?:0[013-9]|1[0-3]|[2-7]\\d|8[03-8]|9[0-39]))\\d{6}',
     'ExampleNumber' => '712034567',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SG.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SG.php
index b55d0eb99..75f6f820b 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SG.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SG.php
@@ -28,7 +28,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '8(?:08[013-9]|95[0-2])\\d{4}|(?:8(?:0[1-7]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}',
+    'NationalNumberPattern' => '8(?:09[0-24]|95[0-2])\\d{4}|(?:8(?:0[1-8]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}',
     'ExampleNumber' => '81234567',
     'PossibleLength' =>
      [
@@ -132,7 +132,7 @@
       'format' => '$1 $2',
       'leadingDigitsPatterns' =>
        [
-        0 => '[369]|8(?:0[1-8]|[1-9])',
+        0 => '[369]|8(?:0[1-9]|[1-9])',
       ],
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
@@ -183,7 +183,7 @@
       'format' => '$1 $2',
       'leadingDigitsPatterns' =>
        [
-        0 => '[369]|8(?:0[1-8]|[1-9])',
+        0 => '[369]|8(?:0[1-9]|[1-9])',
       ],
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SV.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SV.php
index 3ea1f7057..1274ec9df 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SV.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_SV.php
@@ -9,7 +9,7 @@
 return  [
   'generalDesc' =>
    [
-    'NationalNumberPattern' => '[267]\\d{7}|[89]00\\d{4}(?:\\d{4})?',
+    'NationalNumberPattern' => '[267]\\d{7}|(?:80\\d|900)\\d{4}(?:\\d{4})?',
     'PossibleLength' =>
      [
       0 => 7,
@@ -37,7 +37,7 @@
   ],
   'tollFree' =>
    [
-    'NationalNumberPattern' => '800\\d{4}(?:\\d{4})?',
+    'NationalNumberPattern' => '800\\d{8}|80[01]\\d{4}',
     'ExampleNumber' => '8001234',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TD.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TD.php
index 7efd33562..8e51d08d9 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TD.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TD.php
@@ -22,7 +22,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:6[0235689]|77|9\\d)\\d{6}',
+    'NationalNumberPattern' => '(?:6[0-689]|77|9\\d)\\d{6}',
     'ExampleNumber' => '63012345',
   ],
   'tollFree' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TH.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TH.php
index a69350e26..710c93708 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TH.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TH.php
@@ -29,7 +29,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '671[0-8]\\d{5}|(?:14|6[1-6]|[89]\\d)\\d{7}',
+    'NationalNumberPattern' => '67(?:1[0-8]|2[4-7])\\d{5}|(?:14|6[1-6]|[89]\\d)\\d{7}',
     'ExampleNumber' => '812345678',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TM.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TM.php
index 2f594f511..fbe4bec9a 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TM.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TM.php
@@ -9,7 +9,7 @@
 return  [
   'generalDesc' =>
    [
-    'NationalNumberPattern' => '[1-6]\\d{7}',
+    'NationalNumberPattern' => '(?:[1-6]\\d|71)\\d{6}',
     'PossibleLength' =>
      [
       0 => 8,
@@ -22,7 +22,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '6\\d{7}',
+    'NationalNumberPattern' => '(?:6\\d|71)\\d{6}',
     'ExampleNumber' => '66123456',
   ],
   'tollFree' =>
@@ -127,7 +127,7 @@
       'format' => '$1 $2',
       'leadingDigitsPatterns' =>
        [
-        0 => '6',
+        0 => '[67]',
       ],
       'nationalPrefixFormattingRule' => '8 $1',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TO.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TO.php
index 8c50b393f..7691e8ffb 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TO.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TO.php
@@ -27,7 +27,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:55[4-6]|6(?:[09]\\d|3[02]|8[15-9])|(?:7\\d|8[46-9])\\d|999)\\d{4}',
+    'NationalNumberPattern' => '(?:5(?:4[0-5]|5[4-6])|6(?:[09]\\d|3[02]|8[15-9])|(?:7\\d|8[46-9])\\d|999)\\d{4}',
     'ExampleNumber' => '7715123',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TZ.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TZ.php
index 7cd2218dc..416809b14 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TZ.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_TZ.php
@@ -22,7 +22,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '77[2-9]\\d{6}|(?:6[125-9]|7[13-689])\\d{7}',
+    'NationalNumberPattern' => '(?:6[125-9]|7[13-9])\\d{7}',
     'ExampleNumber' => '621234567',
   ],
   'tollFree' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UA.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UA.php
index 06a7df6ce..111cebcdf 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UA.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UA.php
@@ -39,7 +39,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:39|50|6[36-8]|7[1-3]|9[1-9])\\d{7}',
+    'NationalNumberPattern' => '(?:39|50|6[36-8]|7[1-357]|9[1-9])\\d{7}',
     'ExampleNumber' => '501234567',
     'PossibleLength' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UG.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UG.php
index bcba0728a..10d6b829e 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UG.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_UG.php
@@ -23,7 +23,7 @@
   ],
   'fixedLine' =>
    [
-    'NationalNumberPattern' => '20(?:(?:240|30[67])\\d|6(?:00[0-2]|30[0-4]))\\d{3}|(?:20(?:[017]\\d|2[5-9]|32|5[0-4]|6[15-9])|[34]\\d{3})\\d{5}',
+    'NationalNumberPattern' => '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}',
     'ExampleNumber' => '312345678',
     'PossibleLengthLocalOnly' =>
      [
@@ -34,7 +34,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '726[01]\\d{5}|7(?:[015-8]\\d|20|36|4[0-4]|9[89])\\d{6}',
+    'NationalNumberPattern' => '72(?:[48]0|6[01])\\d{5}|7(?:[015-8]\\d|20|36|4[0-5]|9[89])\\d{6}',
     'ExampleNumber' => '712345678',
   ],
   'tollFree' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_US.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_US.php
index e7708744e..f85f57657 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_US.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_US.php
@@ -21,7 +21,7 @@
   ],
   'fixedLine' =>
    [
-    'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|73020\\d)\\d{4}|(?:472[24]|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}',
+    'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
     'ExampleNumber' => '2015550123',
     'PossibleLengthLocalOnly' =>
      [
@@ -30,7 +30,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|73020\\d)\\d{4}|(?:472[24]|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}',
+    'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|7302[0-4]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[2-47-9])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[1459]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
     'ExampleNumber' => '2015550123',
     'PossibleLengthLocalOnly' =>
      [
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_XK.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_XK.php
index ea6b468df..e9e73ec09 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_XK.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_XK.php
@@ -9,16 +9,19 @@
 return  [
   'generalDesc' =>
    [
-    'NationalNumberPattern' => '[23]\\d{7,8}|(?:4\\d\\d|[89]00)\\d{5}',
+    'NationalNumberPattern' => '2\\d{7,8}|3\\d{7,11}|(?:4\\d\\d|[89]00)\\d{5}',
     'PossibleLength' =>
      [
       0 => 8,
       1 => 9,
+      2 => 10,
+      3 => 11,
+      4 => 12,
     ],
   ],
   'fixedLine' =>
    [
-    'NationalNumberPattern' => '(?:2[89]|39)0\\d{6}|[23][89]\\d{6}',
+    'NationalNumberPattern' => '38\\d{6,10}|(?:2[89]|39)(?:0\\d{5,6}|[1-9]\\d{5})',
     'ExampleNumber' => '28012345',
   ],
   'mobile' =>
@@ -135,7 +138,19 @@
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' =>
        [
-        0 => '[23]',
+        0 => '2|39',
+      ],
+      'nationalPrefixFormattingRule' => '0$1',
+      'domesticCarrierCodeFormattingRule' => '',
+      'nationalPrefixOptionalWhenFormatting' => false,
+    ],
+    3 =>
+     [
+      'pattern' => '(\\d{2})(\\d{7,10})',
+      'format' => '$1 $2',
+      'leadingDigitsPatterns' =>
+       [
+        0 => '3',
       ],
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_YT.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_YT.php
index cd7b04d1d..4013fdd5b 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_YT.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_YT.php
@@ -17,7 +17,7 @@
   ],
   'fixedLine' =>
    [
-    'NationalNumberPattern' => '269(?:0[0-467]|5[0-4]|6\\d|[78]0)\\d{4}',
+    'NationalNumberPattern' => '269(?:0[0-467]|15|5[0-4]|6\\d|[78]0)\\d{4}',
     'ExampleNumber' => '269601234',
   ],
   'mobile' =>
diff --git a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ZW.php b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ZW.php
index 283ffc7c9..d43edf2c0 100644
--- a/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ZW.php
+++ b/giggsey/libphonenumber-for-php-lite/src/data/PhoneNumberMetadata_ZW.php
@@ -37,7 +37,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '7(?:[178]\\d|3[1-9])\\d{6}',
+    'NationalNumberPattern' => '7(?:[1278]\\d|3[1-9])\\d{6}',
     'ExampleNumber' => '712345678',
     'PossibleLength' =>
      [