diff --git a/src/libphonenumber/carrier/data/Map.php b/src/libphonenumber/carrier/data/Map.php
index 599600111..bf98fca7d 100644
--- a/src/libphonenumber/carrier/data/Map.php
+++ b/src/libphonenumber/carrier/data/Map.php
@@ -14,163 +14,165 @@
     1 => 1246,
     2 => 1264,
     3 => 1441,
-    4 => 1649,
-    5 => 1671,
-    6 => 1767,
-    7 => 1787,
-    8 => 1809,
-    9 => 1868,
-    10 => 1939,
-    11 => 20,
-    12 => 211,
-    13 => 212,
-    14 => 213,
-    15 => 216,
-    16 => 220,
-    17 => 221,
-    18 => 222,
-    19 => 223,
-    20 => 224,
-    21 => 225,
-    22 => 226,
-    23 => 227,
-    24 => 228,
-    25 => 229,
-    26 => 230,
-    27 => 231,
-    28 => 232,
-    29 => 233,
-    30 => 234,
-    31 => 235,
-    32 => 236,
-    33 => 237,
-    34 => 238,
-    35 => 239,
-    36 => 240,
-    37 => 241,
-    38 => 242,
-    39 => 243,
-    40 => 244,
-    41 => 245,
-    42 => 248,
-    43 => 249,
-    44 => 250,
-    45 => 251,
-    46 => 252,
-    47 => 253,
-    48 => 254,
-    49 => 255,
-    50 => 256,
-    51 => 257,
-    52 => 258,
-    53 => 260,
-    54 => 261,
-    55 => 263,
-    56 => 265,
-    57 => 267,
-    58 => 268,
-    59 => 27,
-    60 => 297,
-    61 => 298,
-    62 => 299,
-    63 => 30,
-    64 => 31,
-    65 => 32,
-    66 => 33,
-    67 => 350,
-    68 => 351,
-    69 => 352,
-    70 => 353,
-    71 => 355,
-    72 => 356,
-    73 => 357,
-    74 => 358,
-    75 => 359,
-    76 => 36,
-    77 => 370,
-    78 => 372,
-    79 => 374,
-    80 => 375,
-    81 => 376,
-    82 => 380,
-    83 => 381,
-    84 => 385,
-    85 => 386,
-    86 => 387,
-    87 => 389,
-    88 => 39,
-    89 => 40,
-    90 => 41,
-    91 => 420,
-    92 => 421,
-    93 => 43,
-    94 => 45,
-    95 => 47,
-    96 => 48,
-    97 => 49,
-    98 => 501,
-    99 => 506,
-    100 => 51,
-    101 => 53,
-    102 => 54,
-    103 => 55,
-    104 => 56,
-    105 => 57,
-    106 => 58,
-    107 => 591,
-    108 => 595,
-    109 => 597,
-    110 => 598,
-    111 => 599,
-    112 => 60,
-    113 => 61,
-    114 => 62,
-    115 => 63,
-    116 => 64,
-    117 => 65,
-    118 => 66,
-    119 => 670,
-    120 => 673,
-    121 => 675,
-    122 => 676,
-    123 => 677,
-    124 => 678,
-    125 => 679,
-    126 => 685,
-    127 => 686,
-    128 => 7,
-    129 => 84,
-    130 => 852,
-    131 => 855,
-    132 => 856,
-    133 => 86,
-    134 => 880,
-    135 => 90,
-    136 => 91,
-    137 => 92,
-    138 => 93,
-    139 => 94,
-    140 => 960,
-    141 => 962,
-    142 => 964,
-    143 => 965,
-    144 => 966,
-    145 => 967,
-    146 => 968,
-    147 => 970,
-    148 => 971,
-    149 => 972,
-    150 => 973,
-    151 => 974,
-    152 => 975,
-    153 => 977,
-    154 => 98,
-    155 => 992,
-    156 => 993,
-    157 => 994,
-    158 => 995,
-    159 => 996,
-    160 => 998,
+    4 => 1473,
+    5 => 1649,
+    6 => 1671,
+    7 => 1767,
+    8 => 1787,
+    9 => 1809,
+    10 => 1868,
+    11 => 1939,
+    12 => 20,
+    13 => 211,
+    14 => 212,
+    15 => 213,
+    16 => 216,
+    17 => 220,
+    18 => 221,
+    19 => 222,
+    20 => 223,
+    21 => 224,
+    22 => 225,
+    23 => 226,
+    24 => 227,
+    25 => 228,
+    26 => 229,
+    27 => 230,
+    28 => 231,
+    29 => 232,
+    30 => 233,
+    31 => 234,
+    32 => 235,
+    33 => 236,
+    34 => 237,
+    35 => 238,
+    36 => 239,
+    37 => 240,
+    38 => 241,
+    39 => 242,
+    40 => 243,
+    41 => 244,
+    42 => 245,
+    43 => 248,
+    44 => 249,
+    45 => 250,
+    46 => 251,
+    47 => 252,
+    48 => 253,
+    49 => 254,
+    50 => 255,
+    51 => 256,
+    52 => 257,
+    53 => 258,
+    54 => 260,
+    55 => 261,
+    56 => 263,
+    57 => 265,
+    58 => 267,
+    59 => 268,
+    60 => 27,
+    61 => 297,
+    62 => 298,
+    63 => 299,
+    64 => 30,
+    65 => 31,
+    66 => 32,
+    67 => 33,
+    68 => 350,
+    69 => 351,
+    70 => 352,
+    71 => 353,
+    72 => 355,
+    73 => 356,
+    74 => 357,
+    75 => 358,
+    76 => 359,
+    77 => 36,
+    78 => 370,
+    79 => 372,
+    80 => 373,
+    81 => 374,
+    82 => 375,
+    83 => 376,
+    84 => 380,
+    85 => 381,
+    86 => 385,
+    87 => 386,
+    88 => 387,
+    89 => 389,
+    90 => 39,
+    91 => 40,
+    92 => 41,
+    93 => 420,
+    94 => 421,
+    95 => 43,
+    96 => 45,
+    97 => 47,
+    98 => 48,
+    99 => 49,
+    100 => 501,
+    101 => 506,
+    102 => 51,
+    103 => 53,
+    104 => 54,
+    105 => 55,
+    106 => 56,
+    107 => 57,
+    108 => 58,
+    109 => 591,
+    110 => 595,
+    111 => 597,
+    112 => 598,
+    113 => 599,
+    114 => 60,
+    115 => 61,
+    116 => 62,
+    117 => 63,
+    118 => 64,
+    119 => 65,
+    120 => 66,
+    121 => 670,
+    122 => 673,
+    123 => 675,
+    124 => 676,
+    125 => 677,
+    126 => 678,
+    127 => 679,
+    128 => 685,
+    129 => 686,
+    130 => 7,
+    131 => 84,
+    132 => 852,
+    133 => 855,
+    134 => 856,
+    135 => 86,
+    136 => 880,
+    137 => 90,
+    138 => 91,
+    139 => 92,
+    140 => 93,
+    141 => 94,
+    142 => 960,
+    143 => 962,
+    144 => 964,
+    145 => 965,
+    146 => 966,
+    147 => 967,
+    148 => 968,
+    149 => 970,
+    150 => 971,
+    151 => 972,
+    152 => 973,
+    153 => 974,
+    154 => 975,
+    155 => 977,
+    156 => 98,
+    157 => 992,
+    158 => 993,
+    159 => 994,
+    160 => 995,
+    161 => 996,
+    162 => 998,
   ),
   'ru' => 
   array (
diff --git a/src/libphonenumber/carrier/data/en/1473.php b/src/libphonenumber/carrier/data/en/1473.php
new file mode 100644
index 000000000..5e9ce3217
--- /dev/null
+++ b/src/libphonenumber/carrier/data/en/1473.php
@@ -0,0 +1,5 @@
+<?php
+return array (
+  1473520 => 'Affordable Island Communications',
+  1473521 => 'Affordable Island Communications',
+);
\ No newline at end of file
diff --git a/src/libphonenumber/carrier/data/en/213.php b/src/libphonenumber/carrier/data/en/213.php
index 9e95a2f23..cfa8a6d22 100644
--- a/src/libphonenumber/carrier/data/en/213.php
+++ b/src/libphonenumber/carrier/data/en/213.php
@@ -1,5 +1,6 @@
 <?php
 return array (
+  21354 => 'Nedjma',
   21355 => 'Nedjma',
   21356 => 'Nedjma',
   2136 => 'Mobilis',
diff --git a/src/libphonenumber/carrier/data/en/226.php b/src/libphonenumber/carrier/data/en/226.php
index d88ac34e3..8ab48f755 100644
--- a/src/libphonenumber/carrier/data/en/226.php
+++ b/src/libphonenumber/carrier/data/en/226.php
@@ -7,8 +7,9 @@
   22664 => 'Airtel',
   22665 => 'Airtel',
   22666 => 'Airtel',
-  226670 => 'Airtel',
+  22667 => 'Airtel',
   22668 => 'Telecel Faso',
+  22669 => 'Telecel Faso',
   22670 => 'Telmob',
   22671 => 'Telmob',
   22672 => 'Telmob',
diff --git a/src/libphonenumber/carrier/data/en/229.php b/src/libphonenumber/carrier/data/en/229.php
index fdca7f489..ab5ca7491 100644
--- a/src/libphonenumber/carrier/data/en/229.php
+++ b/src/libphonenumber/carrier/data/en/229.php
@@ -1,6 +1,9 @@
 <?php
 return array (
+  22961 => 'MTN',
   22964 => 'Moov',
+  22966 => 'MTN',
+  22967 => 'MTN',
   22968 => 'Glo',
   22990 => 'Libercom',
   22993 => 'BLK',
diff --git a/src/libphonenumber/carrier/data/en/234.php b/src/libphonenumber/carrier/data/en/234.php
index dfcc86bbb..d6d513890 100644
--- a/src/libphonenumber/carrier/data/en/234.php
+++ b/src/libphonenumber/carrier/data/en/234.php
@@ -226,7 +226,8 @@
   2348885 => 'Starcomms',
   2348886 => 'Starcomms',
   2348887 => 'Starcomms',
-  2349091 => 'Etisalat',
+  234903 => 'MTN',
+  234909 => 'Etisalat',
   234980 => 'Starcomms',
   234987 => 'Starcomms',
 );
\ No newline at end of file
diff --git a/src/libphonenumber/carrier/data/en/267.php b/src/libphonenumber/carrier/data/en/267.php
index f4de6ab6b..78cc41a58 100644
--- a/src/libphonenumber/carrier/data/en/267.php
+++ b/src/libphonenumber/carrier/data/en/267.php
@@ -31,4 +31,5 @@
   267767 => 'Mascom',
   267769 => 'Orange',
   267776 => 'Mascom',
+  267777 => 'Mascom',
 );
\ No newline at end of file
diff --git a/src/libphonenumber/carrier/data/en/373.php b/src/libphonenumber/carrier/data/en/373.php
new file mode 100644
index 000000000..4672aca13
--- /dev/null
+++ b/src/libphonenumber/carrier/data/en/373.php
@@ -0,0 +1,9 @@
+<?php
+return array (
+  373562 => 'IDC',
+  373774 => 'IDC',
+  373775 => 'IDC',
+  373777 => 'IDC',
+  373778 => 'IDC',
+  373779 => 'IDC',
+);
\ No newline at end of file
diff --git a/src/libphonenumber/carrier/data/en/389.php b/src/libphonenumber/carrier/data/en/389.php
index a5121ea60..43296bac2 100644
--- a/src/libphonenumber/carrier/data/en/389.php
+++ b/src/libphonenumber/carrier/data/en/389.php
@@ -4,6 +4,7 @@
   38971 => 'T-Mobile',
   38972 => 'T-Mobile',
   389732 => 'Albafone',
+  3897421 => 'Mobik Telekomunikacii',
   38975 => 'One',
   38976 => 'One',
   38977 => 'vip',
diff --git a/src/libphonenumber/carrier/data/en/48.php b/src/libphonenumber/carrier/data/en/48.php
index 4273522de..5ae5c2738 100644
--- a/src/libphonenumber/carrier/data/en/48.php
+++ b/src/libphonenumber/carrier/data/en/48.php
@@ -7,6 +7,7 @@
   48532 => 'T-Mobile',
   48533 => 'Play',
   48535 => 'Play',
+  4857 => 'Play',
   48600 => 'T-Mobile',
   48601 => 'Plus',
   48602 => 'T-Mobile',
diff --git a/src/libphonenumber/carrier/data/en/49.php b/src/libphonenumber/carrier/data/en/49.php
index f8a3b3e74..2902a54b6 100644
--- a/src/libphonenumber/carrier/data/en/49.php
+++ b/src/libphonenumber/carrier/data/en/49.php
@@ -2,7 +2,18 @@
 return array (
   49151 => 'T-Mobile',
   491520 => 'Vodafone',
-  49156 => 'Mobilcom',
+  491521 => 'Vodafone/Lycamobile',
+  491522 => 'Vodafone',
+  491523 => 'Vodafone',
+  491525 => 'Vodafone',
+  491529 => 'Vodafone/Truphone',
+  491570 => 'Eplus/Telogic',
+  491573 => 'Eplus',
+  491575 => 'Eplus',
+  491577 => 'Eplus',
+  491578 => 'Eplus',
+  491579 => 'Eplus/Sipgate',
+  491590 => 'O2',
   49160 => 'T-Mobile',
   49162 => 'Vodafone',
   49163 => 'Eplus',
diff --git a/src/libphonenumber/carrier/data/en/506.php b/src/libphonenumber/carrier/data/en/506.php
index 35b68408a..a86ee7624 100644
--- a/src/libphonenumber/carrier/data/en/506.php
+++ b/src/libphonenumber/carrier/data/en/506.php
@@ -1,5 +1,35 @@
 <?php
 return array (
+  506570 => 'OMV',
+  506571 => 'OMV',
+  506572 => 'OMV',
+  506573 => 'OMV',
+  50670010 => 'Claro',
+  50670011 => 'Claro',
+  50670012 => 'Claro',
+  50670013 => 'Claro',
+  50670014 => 'Claro',
+  5067002 => 'Claro',
+  5067003 => 'Claro',
+  5067004 => 'Claro',
+  5067005 => 'Claro',
+  5067006 => 'Claro',
+  5067007 => 'Claro',
+  5067008 => 'Claro',
+  5067009 => 'Claro',
+  506701 => 'Claro',
+  506702 => 'Claro',
+  506703 => 'Claro',
+  506704 => 'Claro',
+  506705 => 'Claro',
+  506706 => 'Claro',
+  506707 => 'Claro',
+  506708 => 'Claro',
+  506709 => 'Claro',
+  50671 => 'Claro',
+  50672 => 'Claro',
+  5067300 => 'Claro',
+  5067301 => 'Claro',
   50683 => 'Kolbi ICE',
   50688 => 'Kolbi ICE',
   50689 => 'Kolbi ICE',
diff --git a/src/libphonenumber/carrier/data/en/598.php b/src/libphonenumber/carrier/data/en/598.php
index 2fa3d2b89..c19cbc2e0 100644
--- a/src/libphonenumber/carrier/data/en/598.php
+++ b/src/libphonenumber/carrier/data/en/598.php
@@ -1,5 +1,10 @@
 <?php
 return array (
+  59891 => 'Antel',
+  598920 => 'Antel',
+  598921 => 'Antel',
+  598922 => 'Antel',
+  59893 => 'Movistar',
   59894 => 'Movistar',
   59895 => 'Movistar',
   59896 => 'Claro',
diff --git a/src/libphonenumber/carrier/data/en/91.php b/src/libphonenumber/carrier/data/en/91.php
index 8d760b575..0eab940e2 100644
--- a/src/libphonenumber/carrier/data/en/91.php
+++ b/src/libphonenumber/carrier/data/en/91.php
@@ -99,6 +99,7 @@
   917598 => 'CellOne',
   917599 => 'CellOne',
   917600 => 'AirTel',
+  917601 => 'Reliance',
   917602 => 'AirTel',
   917607 => 'AirTel',
   917620 => 'Reliance',
@@ -113,6 +114,8 @@
   917676 => 'Reliance',
   917677 => 'Reliance',
   917679 => 'Reliance',
+  917686 => 'Aircel',
+  917687 => 'Aircel',
   917696 => 'TATA DOCOMO',
   917697 => 'Idea Cellular Ltd',
   917698 => 'IDEA',
diff --git a/src/libphonenumber/carrier/data/en/92.php b/src/libphonenumber/carrier/data/en/92.php
index 5d5f3f989..1562fc00a 100644
--- a/src/libphonenumber/carrier/data/en/92.php
+++ b/src/libphonenumber/carrier/data/en/92.php
@@ -9,6 +9,7 @@
   92306 => 'Mobilink',
   92307 => 'Mobilink',
   92308 => 'Mobilink',
+  92310 => 'Zong',
   92311 => 'Ufone',
   92312 => 'Ufone',
   92313 => 'Ufone',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_883.php b/src/libphonenumber/data/PhoneNumberMetadata_883.php
index 5f8718872..fffb40ccf 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_883.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_883.php
@@ -48,7 +48,7 @@
     'NationalNumberPattern' => '
           51(?:
             00\\d{5}(?:\\d{3})?|
-            10\\d{8}
+            [13]0\\d{8}
           )
         ',
     'PossibleNumberPattern' => '\\d{9}(?:\\d{3})?',
@@ -106,6 +106,7 @@
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' => 
       array (
+        0 => '510',
       ),
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
@@ -116,6 +117,18 @@
       'format' => '$1 $2 $3 $4',
       'leadingDigitsPatterns' => 
       array (
+        0 => '510',
+      ),
+      'nationalPrefixFormattingRule' => '',
+      'domesticCarrierCodeFormattingRule' => '',
+    ),
+    2 => 
+    array (
+      'pattern' => '(\\d{4})(\\d{4})(\\d{4})',
+      'format' => '$1 $2 $3',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '51[13]',
       ),
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_BF.php b/src/libphonenumber/data/PhoneNumberMetadata_BF.php
index a8214ae1f..632fdfddb 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_BF.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_BF.php
@@ -37,9 +37,9 @@
   array (
     'NationalNumberPattern' => '
           6(?:
-            [0-24-68]\\d|
+            [0-24-689]\\d|
             3[0-7]|
-            70
+            7[0-2]
           )\\d{5}|
           7\\d{7}
         ',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_BJ.php b/src/libphonenumber/data/PhoneNumberMetadata_BJ.php
index 6539cdf8c..95d31ff32 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_BJ.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_BJ.php
@@ -30,7 +30,7 @@
   array (
     'NationalNumberPattern' => '
           (?:
-            6[46-8]|
+            6[146-8]|
             9[03-9]
           )\\d{6}
         ',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_BW.php b/src/libphonenumber/data/PhoneNumberMetadata_BW.php
index e4934b7e8..87f988919 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_BW.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_BW.php
@@ -54,7 +54,7 @@
           7(?:
             [1-35]\\d{6}|
             [46][0-7]\\d{5}|
-            7[0146]\\d{5}
+            7[01467]\\d{5}
           )
         ',
     'PossibleNumberPattern' => '\\d{8}',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_CL.php b/src/libphonenumber/data/PhoneNumberMetadata_CL.php
index 83282e776..c097e69f0 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_CL.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_CL.php
@@ -20,17 +20,13 @@
   array (
     'NationalNumberPattern' => '
           (?:
-            [23]2|
-            41|
-            58
+            22|
+            3[2-5]|
+            [47][1-35]|
+            5[1-3578]|
+            6[1347]
           )\\d{7}|
-          (?:
-            3[3-5]|
-            4[235]|
-            5[1-357]|
-            6[13-57]|
-            7[1-35]
-          )\\d{6,7}
+          65\\d{6,7}
         ',
     'PossibleNumberPattern' => '\\d{6,9}',
     'ExampleNumber' => '221234567',
@@ -123,7 +119,7 @@
   array (
     0 => 
     array (
-      'pattern' => '(2)(\\d{3,4})(\\d{4})',
+      'pattern' => '(\\d)(\\d{4})(\\d{4})',
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' => 
       array (
@@ -134,7 +130,7 @@
     ),
     1 => 
     array (
-      'pattern' => '(\\d{2})(\\d{2,3})(\\d{4})',
+      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' => 
       array (
@@ -148,6 +144,17 @@
       'domesticCarrierCodeFormattingRule' => '$CC ($1)',
     ),
     2 => 
+    array (
+      'pattern' => '(\\d{2})(\\d{2})(\\d{4})',
+      'format' => '$1 $2 $3',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '65',
+      ),
+      'nationalPrefixFormattingRule' => '($1)',
+      'domesticCarrierCodeFormattingRule' => '$CC ($1)',
+    ),
+    3 => 
     array (
       'pattern' => '(9)([5-9]\\d{3})(\\d{4})',
       'format' => '$1 $2 $3',
@@ -158,7 +165,7 @@
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
     ),
-    3 => 
+    4 => 
     array (
       'pattern' => '(44)(\\d{3})(\\d{4})',
       'format' => '$1 $2 $3',
@@ -169,7 +176,7 @@
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
     ),
-    4 => 
+    5 => 
     array (
       'pattern' => '([68]00)(\\d{3})(\\d{3,4})',
       'format' => '$1 $2 $3',
@@ -183,7 +190,7 @@
       'nationalPrefixFormattingRule' => '$1',
       'domesticCarrierCodeFormattingRule' => '',
     ),
-    5 => 
+    6 => 
     array (
       'pattern' => '(600)(\\d{3})(\\d{2})(\\d{3})',
       'format' => '$1 $2 $3 $4',
@@ -194,7 +201,7 @@
       'nationalPrefixFormattingRule' => '$1',
       'domesticCarrierCodeFormattingRule' => '',
     ),
-    6 => 
+    7 => 
     array (
       'pattern' => '(1230)(\\d{3})(\\d{4})',
       'format' => '$1 $2 $3',
@@ -205,7 +212,7 @@
       'nationalPrefixFormattingRule' => '$1',
       'domesticCarrierCodeFormattingRule' => '',
     ),
-    7 => 
+    8 => 
     array (
       'pattern' => '(\\d{4,5})',
       'format' => '$1',
@@ -221,7 +228,7 @@
   array (
     0 => 
     array (
-      'pattern' => '(2)(\\d{3,4})(\\d{4})',
+      'pattern' => '(\\d)(\\d{4})(\\d{4})',
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' => 
       array (
@@ -230,7 +237,7 @@
     ),
     1 => 
     array (
-      'pattern' => '(\\d{2})(\\d{2,3})(\\d{4})',
+      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' => 
       array (
@@ -242,6 +249,15 @@
       ),
     ),
     2 => 
+    array (
+      'pattern' => '(\\d{2})(\\d{2})(\\d{4})',
+      'format' => '$1 $2 $3',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '65',
+      ),
+    ),
+    3 => 
     array (
       'pattern' => '(9)([5-9]\\d{3})(\\d{4})',
       'format' => '$1 $2 $3',
@@ -250,7 +266,7 @@
         0 => '9',
       ),
     ),
-    3 => 
+    4 => 
     array (
       'pattern' => '(44)(\\d{3})(\\d{4})',
       'format' => '$1 $2 $3',
@@ -259,7 +275,7 @@
         0 => '44',
       ),
     ),
-    4 => 
+    5 => 
     array (
       'pattern' => '([68]00)(\\d{3})(\\d{3,4})',
       'format' => '$1 $2 $3',
@@ -271,7 +287,7 @@
           ',
       ),
     ),
-    5 => 
+    6 => 
     array (
       'pattern' => '(600)(\\d{3})(\\d{2})(\\d{3})',
       'format' => '$1 $2 $3 $4',
@@ -280,7 +296,7 @@
         0 => '60',
       ),
     ),
-    6 => 
+    7 => 
     array (
       'pattern' => '(1230)(\\d{3})(\\d{4})',
       'format' => '$1 $2 $3',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_CR.php b/src/libphonenumber/data/PhoneNumberMetadata_CR.php
index 854da7369..92bbb5ec8 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_CR.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_CR.php
@@ -21,13 +21,13 @@
     'NationalNumberPattern' => '
           5(?:
             0[0-4]|
-            7[01]
+            7[0-3]
           )\\d{5}|
           6(?:
             [0-2]\\d|
             30
           )\\d{5}|
-          7[0-2]\\d{6}|
+          7[0-3]\\d{6}|
           8[3-9]\\d{6}
         ',
     'PossibleNumberPattern' => '\\d{8}',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_DZ.php b/src/libphonenumber/data/PhoneNumberMetadata_DZ.php
index 03fc08408..da2fabe45 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_DZ.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_DZ.php
@@ -38,7 +38,7 @@
           )\\d{7}|
           6(?:
             [569]\\d|
-            70
+            7[0-2]
           )\\d{6}
         ',
     'PossibleNumberPattern' => '\\d{9}',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_FR.php b/src/libphonenumber/data/PhoneNumberMetadata_FR.php
index 549db4411..adf05752a 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_FR.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_FR.php
@@ -20,7 +20,7 @@
   array (
     'NationalNumberPattern' => '
           6\\d{8}|
-          7[5-9]\\d{7}
+          7[0-24-9]\\d{7}
         ',
     'PossibleNumberPattern' => '\\d{9}',
     'ExampleNumber' => '612345678',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_GD.php b/src/libphonenumber/data/PhoneNumberMetadata_GD.php
index 8239a3cfd..82767bef1 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_GD.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_GD.php
@@ -52,7 +52,10 @@
               20|
               58
             )|
-            53[3-8]
+            5(?:
+              2[01]|
+              3[3-8]
+            )
           )\\d{4}
         ',
     'PossibleNumberPattern' => '\\d{10}',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_IN.php b/src/libphonenumber/data/PhoneNumberMetadata_IN.php
index 62fa2b868..5eafb14ed 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_IN.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_IN.php
@@ -220,13 +220,12 @@
                 9[7-9]
               )|
               6(?:
-                0[027]|
+                0[0127]|
                 1[0-257-9]|
                 2[0-4]|
                 3[19]|
                 5[4589]|
-                [679]\\d|
-                8[0-589]
+                [6-9]\\d
               )|
               7(?:
                 0[2-9]|
@@ -432,13 +431,12 @@
                  9[7-9]
                )|
                6(?:
-                 0[027]|
+                 0[0-27]|
                  1[0-257-9]|
                  2[0-4]|
                  3[19]|
                  5[4589]|
-                 [679]|
-                 8[0-589]
+                 [6-9]
                )|
                7(?:
                  0[2-9]|
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_JP.php b/src/libphonenumber/data/PhoneNumberMetadata_JP.php
index dbd58e575..926909415 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_JP.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_JP.php
@@ -9,13 +9,13 @@
   array (
     'NationalNumberPattern' => '
           [1-9]\\d{8,9}|
-          0(?:
-            [36]\\d{7,14}|
-            7\\d{5,7}|
-            8\\d{7}
+          00(?:
+             [36]\\d{7,14}|
+             7\\d{5,7}|
+             8\\d{7}
           )
         ',
-    'PossibleNumberPattern' => '\\d{7,16}',
+    'PossibleNumberPattern' => '\\d{8,17}',
   ),
   'fixedLine' => 
   array (
@@ -80,18 +80,18 @@
     'NationalNumberPattern' => '
           120\\d{6}|
           800\\d{7}|
-          0(?:
-            37\\d{6,13}|
-            66\\d{6,13}|
-            777(?:
-              [01]\\d{2}|
-              5\\d{3}|
-              8\\d{4}
-            )|
-            882[1245]\\d{4}
+          00(?:
+             37\\d{6,13}|
+             66\\d{6,13}|
+             777(?:
+               [01]\\d{2}|
+               5\\d{3}|
+               8\\d{4}
+             )|
+             882[1245]\\d{4}
           )
         ',
-    'PossibleNumberPattern' => '\\d{7,16}',
+    'PossibleNumberPattern' => '\\d{8,17}',
     'ExampleNumber' => '120123456',
   ),
   'premiumRate' => 
@@ -157,19 +157,19 @@
   'noInternationalDialling' => 
   array (
     'NationalNumberPattern' => '
-          0(?:
-            37\\d{6,13}|
-            66\\d{6,13}|
-            777(?:
-              [01]\\d{2}|
-              5\\d{3}|
-              8\\d{4}
-            )|
-            882[1245]\\d{4}
+          00(?:
+             37\\d{6,13}|
+             66\\d{6,13}|
+             777(?:
+               [01]\\d{2}|
+               5\\d{3}|
+               8\\d{4}
+             )|
+             882[1245]\\d{4}
           )
         ',
-    'PossibleNumberPattern' => '\\d{7,16}',
-    'ExampleNumber' => '0777012',
+    'PossibleNumberPattern' => '\\d{8,17}',
+    'ExampleNumber' => '00777012',
   ),
   'id' => 'JP',
   'countryCode' => 81,
@@ -209,99 +209,99 @@
     ),
     2 => 
     array (
-      'pattern' => '(\\d{3})(\\d{4})',
+      'pattern' => '(\\d{4})(\\d{4})',
       'format' => '$1-$2',
       'leadingDigitsPatterns' => 
       array (
-        0 => '077',
+        0 => '0077',
       ),
-      'nationalPrefixFormattingRule' => '0$1',
+      'nationalPrefixFormattingRule' => '$1',
       'domesticCarrierCodeFormattingRule' => '',
     ),
     3 => 
     array (
-      'pattern' => '(\\d{3})(\\d{2})(\\d{3,4})',
+      'pattern' => '(\\d{4})(\\d{2})(\\d{3,4})',
       'format' => '$1-$2-$3',
       'leadingDigitsPatterns' => 
       array (
-        0 => '077',
+        0 => '0077',
       ),
-      'nationalPrefixFormattingRule' => '0$1',
+      'nationalPrefixFormattingRule' => '$1',
       'domesticCarrierCodeFormattingRule' => '',
     ),
     4 => 
     array (
-      'pattern' => '(\\d{3})(\\d{2})(\\d{4})',
+      'pattern' => '(\\d{4})(\\d{2})(\\d{4})',
       'format' => '$1-$2-$3',
       'leadingDigitsPatterns' => 
       array (
-        0 => '088',
+        0 => '0088',
       ),
-      'nationalPrefixFormattingRule' => '0$1',
+      'nationalPrefixFormattingRule' => '$1',
       'domesticCarrierCodeFormattingRule' => '',
     ),
     5 => 
     array (
-      'pattern' => '(\\d{3})(\\d{3})(\\d{3,4})',
+      'pattern' => '(\\d{4})(\\d{3})(\\d{3,4})',
       'format' => '$1-$2-$3',
       'leadingDigitsPatterns' => 
       array (
         0 => '
-            0(?:
-              37|
-              66
+            00(?:
+               37|
+               66
             )
           ',
       ),
-      'nationalPrefixFormattingRule' => '0$1',
+      'nationalPrefixFormattingRule' => '$1',
       'domesticCarrierCodeFormattingRule' => '',
     ),
     6 => 
     array (
-      'pattern' => '(\\d{3})(\\d{4})(\\d{4,5})',
+      'pattern' => '(\\d{4})(\\d{4})(\\d{4,5})',
       'format' => '$1-$2-$3',
       'leadingDigitsPatterns' => 
       array (
         0 => '
-            0(?:
-              37|
-              66
+            00(?:
+               37|
+               66
             )
           ',
       ),
-      'nationalPrefixFormattingRule' => '0$1',
+      'nationalPrefixFormattingRule' => '$1',
       'domesticCarrierCodeFormattingRule' => '',
     ),
     7 => 
     array (
-      'pattern' => '(\\d{3})(\\d{5})(\\d{5,6})',
+      'pattern' => '(\\d{4})(\\d{5})(\\d{5,6})',
       'format' => '$1-$2-$3',
       'leadingDigitsPatterns' => 
       array (
         0 => '
-            0(?:
-              37|
-              66
+            00(?:
+               37|
+               66
             )
           ',
       ),
-      'nationalPrefixFormattingRule' => '0$1',
+      'nationalPrefixFormattingRule' => '$1',
       'domesticCarrierCodeFormattingRule' => '',
     ),
     8 => 
     array (
-      'pattern' => '(\\d{3})(\\d{6})(\\d{6,7})',
+      'pattern' => '(\\d{4})(\\d{6})(\\d{6,7})',
       'format' => '$1-$2-$3',
       'leadingDigitsPatterns' => 
       array (
         0 => '
-            0(?:
-              37|
-              66
+            00(?:
+               37|
+               66
             )
           ',
       ),
-      'nationalPrefixFormattingRule' => '0$1',
+      'nationalPrefixFormattingRule' => '$1',
       'domesticCarrierCodeFormattingRule' => '',
     ),
     9 => 
@@ -1096,6 +1096,805 @@
   ),
   'intlNumberFormat' => 
   array (
+    0 => 
+    array (
+      'pattern' => '(\\d{3})(\\d{3})(\\d{3})',
+      'format' => '$1-$2-$3',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '
+            (?:
+              12|
+              57|
+              99
+            )0
+          ',
+      ),
+    ),
+    1 => 
+    array (
+      'pattern' => '(\\d{3})(\\d{3})(\\d{4})',
+      'format' => '$1-$2-$3',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '800',
+      ),
+    ),
+    2 => 
+    array (
+      'pattern' => '(\\d{2})(\\d{4})(\\d{4})',
+      'format' => '$1-$2-$3',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '
+            [2579]0|
+            80[1-9]
+          ',
+      ),
+    ),
+    3 => 
+    array (
+      'pattern' => '(\\d{4})(\\d)(\\d{4})',
+      'format' => '$1-$2-$3',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '
+            1(?:
+              26|
+              3[79]|
+              4[56]|
+              5[4-68]|
+              6[3-5]
+            )|
+            5(?:
+              76|
+              97
+            )|
+            499|
+            746|
+            8(?:
+              3[89]|
+              63|
+              47|
+              51
+            )|
+            9(?:
+              49|
+              80|
+              9[16]
+            )
+          ',
+        1 => '
+            1(?:
+              267|
+              3(?:
+                7[247]|
+                9[278]
+              )|
+              4(?:
+                5[67]|
+                66
+              )|
+              5(?:
+                47|
+                58|
+                64|
+                8[67]
+              )|
+              6(?:
+                3[245]|
+                48|
+                5[4-68]
+              )
+            )|
+            5(?:
+              76|
+              97
+            )9|
+            499[2468]|
+            7468|
+            8(?:
+              3(?:
+                8[78]|
+                96
+              )|
+              636|
+              477|
+              51[24]
+            )|
+            9(?:
+              496|
+              802|
+              9(?:
+                1[23]|
+                69
+              )
+            )
+          ',
+        2 => '
+            1(?:
+              267|
+              3(?:
+                7[247]|
+                9[278]
+              )|
+              4(?:
+                5[67]|
+                66
+              )|
+              5(?:
+                47|
+                58|
+                64|
+                8[67]
+              )|
+              6(?:
+                3[245]|
+                48|
+                5[4-68]
+              )
+            )|
+            5(?:
+              769|
+              979[2-69]
+            )|
+            499[2468]|
+            7468|
+            8(?:
+              3(?:
+                8[78]|
+                96[2457-9]
+              )|
+              636[2-57-9]|
+              477|
+              51[24]
+            )|
+            9(?:
+              496|
+              802|
+              9(?:
+                1[23]|
+                69
+              )
+            )
+          ',
+      ),
+    ),
+    4 => 
+    array (
+      'pattern' => '(\\d{3})(\\d{2})(\\d{4})',
+      'format' => '$1-$2-$3',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '
+            1(?:
+              2[3-6]|
+              3[3-9]|
+              4[2-6]|
+              5[2-8]|
+              [68][2-7]|
+              7[2-689]|
+              9[1-578]
+            )|
+            2(?:
+              2[03-689]|
+              3[3-58]|
+              4[0-468]|
+              5[04-8]|
+              6[013-8]|
+              7[06-9]|
+              8[02-57-9]|
+              9[13]
+            )|
+            4(?:
+              2[28]|
+              3[689]|
+              6[035-7]|
+              7[05689]|
+              80|
+              9[3-5]
+            )|
+            5(?:
+              3[1-36-9]|
+              4[4578]|
+              5[013-8]|
+              6[1-9]|
+              7[2-8]|
+              8[14-7]|
+              9[4-9]
+            )|
+            7(?:
+              2[15]|
+              3[5-9]|
+              4[02-9]|
+              6[135-8]|
+              7[0-4689]|
+              9[014-9]
+            )|
+            8(?:
+              2[49]|
+              3[3-8]|
+              4[5-8]|
+              5[2-9]|
+              6[35-9]|
+              7[579]|
+              8[03-579]|
+              9[2-8]
+            )|
+            9(?:
+              [23]0|
+              4[02-46-9]|
+              5[024-79]|
+              6[4-9]|
+              7[2-47-9]|
+              8[02-7]|
+              9[3-7]
+            )
+          ',
+        1 => '
+            1(?:
+              2[3-6]|
+              3[3-9]|
+              4[2-6]|
+              5(?:
+                [236-8]|
+                [45][2-69]
+              )|
+              [68][2-7]|
+              7[2-689]|
+              9[1-578]
+            )|
+            2(?:
+              2(?:
+                [04-689]|
+                3[23]
+              )|
+              3[3-58]|
+              4[0-468]|
+              5(?:
+                5[78]|
+                7[2-4]|
+                [0468][2-9]
+              )|
+              6(?:
+                [0135-8]|
+                4[2-5]
+              )|
+              7(?:
+                [0679]|
+                8[2-7]
+              )|
+              8(?:
+                [024578]|
+                3[25-9]|
+                9[6-9]
+              )|
+              9(?:
+                11|
+                3[2-4]
+              )
+            )|
+            4(?:
+              2(?:
+                2[2-9]|
+                8[237-9]
+              )|
+              3[689]|
+              6[035-7]|
+              7(?:
+                [059][2-8]|
+                [68]
+              )|
+              80|
+              9[3-5]
+            )|
+            5(?:
+              3[1-36-9]|
+              4[4578]|
+              5[013-8]|
+              6[1-9]|
+              7[2-8]|
+              8[14-7]|
+              9(?:
+                [89][2-8]|
+                [4-7]
+              )
+            )|
+            7(?:
+              2[15]|
+              3[5-9]|
+              4[02-9]|
+              6[135-8]|
+              7[0-4689]|
+              9(?:
+                [017-9]|
+                4[6-8]|
+                5[2-478]|
+                6[2-589]
+              )
+            )|
+            8(?:
+              2(?:
+                4[4-8]|
+                9[2-8]
+              )|
+              3(?:
+                7[2-6]|
+                [3-6][2-9]|
+                8[2-5]
+              )|
+              4[5-8]|
+              5[2-9]|
+              6(?:
+                [37]|
+                5[4-7]|
+                6[2-9]|
+                8[2-8]|
+                9[236-9]
+              )|
+              7[579]|
+              8[03-579]|
+              9[2-8]
+            )|
+            9(?:
+              [23]0|
+              4[02-46-9]|
+              5[024-79]|
+              6[4-9]|
+              7[2-47-9]|
+              8[02-7]|
+              9(?:
+                3[34]|
+                [4-7]
+              )
+            )
+          ',
+        2 => '
+            1(?:
+              2[3-6]|
+              3[3-9]|
+              4[2-6]|
+              5(?:
+                [236-8]|
+                [45][2-69]
+              )|
+              [68][2-7]|
+              7[2-689]|
+              9[1-578]
+            )|
+            2(?:
+              2(?:
+                [04-689]|
+                3[23]
+              )|
+              3[3-58]|
+              4[0-468]|
+              5(?:
+                5[78]|
+                7[2-4]|
+                [0468][2-9]
+              )|
+              6(?:
+                [0135-8]|
+                4[2-5]
+              )|
+              7(?:
+                [0679]|
+                8[2-7]
+              )|
+              8(?:
+                [024578]|
+                3[25-9]|
+                9[6-9]
+              )|
+              9(?:
+                11|
+                3[2-4]
+              )
+            )|
+            4(?:
+              2(?:
+                2[2-9]|
+                8[237-9]
+              )|
+              3[689]|
+              6[035-7]|
+              7(?:
+                [059][2-8]|
+                [68]
+              )|
+              80|
+              9[3-5]
+            )|
+            5(?:
+              3[1-36-9]|
+              4[4578]|
+              5[013-8]|
+              6[1-9]|
+              7[2-8]|
+              8[14-7]|
+              9(?:
+                [89][2-8]|
+                [4-7]
+              )
+            )|
+            7(?:
+              2[15]|
+              3[5-9]|
+              4[02-9]|
+              6[135-8]|
+              7[0-4689]|
+              9(?:
+                [017-9]|
+                4[6-8]|
+                5[2-478]|
+                6[2-589]
+              )
+            )|
+            8(?:
+              2(?:
+                4[4-8]|
+                9(?:
+                  [3578]|
+                  20|
+                  4[04-9]|
+                  6[56]
+                )
+              )|
+              3(?:
+                7(?:
+                  [2-5]|
+                  6[0-59]
+                )|
+                [3-6][2-9]|
+                8[2-5]
+              )|
+              4[5-8]|
+              5[2-9]|
+              6(?:
+                [37]|
+                5(?:
+                  [467]|
+                  5[014-9]
+                )|
+                6(?:
+                  [2-8]|
+                  9[02-69]
+                )|
+                8[2-8]|
+                9(?:
+                  [236-8]|
+                  9[23]
+                )
+              )|
+              7[579]|
+              8[03-579]|
+              9[2-8]
+            )|
+            9(?:
+              [23]0|
+              4[02-46-9]|
+              5[024-79]|
+              6[4-9]|
+              7[2-47-9]|
+              8[02-7]|
+              9(?:
+                3(?:
+                  3[02-9]|
+                  4[0-24689]
+                )|
+                4[2-69]|
+                [5-7]
+              )
+            )
+          ',
+        3 => '
+            1(?:
+              2[3-6]|
+              3[3-9]|
+              4[2-6]|
+              5(?:
+                [236-8]|
+                [45][2-69]
+              )|
+              [68][2-7]|
+              7[2-689]|
+              9[1-578]
+            )|
+            2(?:
+              2(?:
+                [04-689]|
+                3[23]
+              )|
+              3[3-58]|
+              4[0-468]|
+              5(?:
+                5[78]|
+                7[2-4]|
+                [0468][2-9]
+              )|
+              6(?:
+                [0135-8]|
+                4[2-5]
+              )|
+              7(?:
+                [0679]|
+                8[2-7]
+              )|
+              8(?:
+                [024578]|
+                3[25-9]|
+                9[6-9]
+              )|
+              9(?:
+                11|
+                3[2-4]
+              )
+            )|
+            4(?:
+              2(?:
+                2[2-9]|
+                8[237-9]
+              )|
+              3[689]|
+              6[035-7]|
+              7(?:
+                [059][2-8]|
+                [68]
+              )|
+              80|
+              9[3-5]
+            )|
+            5(?:
+              3[1-36-9]|
+              4[4578]|
+              5[013-8]|
+              6[1-9]|
+              7[2-8]|
+              8[14-7]|
+              9(?:
+                [89][2-8]|
+                [4-7]
+              )
+            )|
+            7(?:
+              2[15]|
+              3[5-9]|
+              4[02-9]|
+              6[135-8]|
+              7[0-4689]|
+              9(?:
+                [017-9]|
+                4[6-8]|
+                5[2-478]|
+                6[2-589]
+              )
+            )|
+            8(?:
+              2(?:
+                4[4-8]|
+                9(?:
+                  [3578]|
+                  20|
+                  4[04-9]|
+                  6(?:
+                    5[25]|
+                    60
+                  )
+                )
+              )|
+              3(?:
+                7(?:
+                  [2-5]|
+                  6[0-59]
+                )|
+                [3-6][2-9]|
+                8[2-5]
+              )|
+              4[5-8]|
+              5[2-9]|
+              6(?:
+                [37]|
+                5(?:
+                  [467]|
+                  5[014-9]
+                )|
+                6(?:
+                  [2-8]|
+                  9[02-69]
+                )|
+                8[2-8]|
+                9(?:
+                  [236-8]|
+                  9[23]
+                )
+              )|
+              7[579]|
+              8[03-579]|
+              9[2-8]
+            )|
+            9(?:
+              [23]0|
+              4[02-46-9]|
+              5[024-79]|
+              6[4-9]|
+              7[2-47-9]|
+              8[02-7]|
+              9(?:
+                3(?:
+                  3[02-9]|
+                  4[0-24689]
+                )|
+                4[2-69]|
+                [5-7]
+              )
+            )
+          ',
+      ),
+    ),
+    5 => 
+    array (
+      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+      'format' => '$1-$2-$3',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '
+            1|
+            2(?:
+              2[37]|
+              5[5-9]|
+              64|
+              78|
+              8[39]|
+              91
+            )|
+            4(?:
+              2[2689]|
+              64|
+              7[347]
+            )|
+            5(?:
+              [2-589]|
+              39
+            )|
+            60|
+            8(?:
+              [46-9]|
+              3[279]|
+              2[124589]
+            )|
+            9(?:
+              [235-8]|
+              93
+            )
+          ',
+        1 => '
+            1|
+            2(?:
+              2[37]|
+              5(?:
+                [57]|
+                [68]0|
+                9[19]
+              )|
+              64|
+              78|
+              8[39]|
+              917
+            )|
+            4(?:
+              2(?:
+                [68]|
+                20|
+                9[178]
+              )|
+              64|
+              7[347]
+            )|
+            5(?:
+              [2-589]|
+              39[67]
+            )|
+            60|
+            8(?:
+              [46-9]|
+              3[279]|
+              2[124589]
+            )|
+            9(?:
+              [235-8]|
+              93[34]
+            )
+          ',
+        2 => '
+            1|
+            2(?:
+              2[37]|
+              5(?:
+                [57]|
+                [68]0|
+                9(?:
+                  17|
+                  99
+                )
+              )|
+              64|
+              78|
+              8[39]|
+              917
+            )|
+            4(?:
+              2(?:
+                [68]|
+                20|
+                9[178]
+              )|
+              64|
+              7[347]
+            )|
+            5(?:
+              [2-589]|
+              39[67]
+            )|
+            60|
+            8(?:
+              [46-9]|
+              3[279]|
+              2[124589]
+            )|
+            9(?:
+              [235-8]|
+              93(?:
+                31|
+                4
+              )
+            )
+          ',
+      ),
+    ),
+    6 => 
+    array (
+      'pattern' => '(\\d{3})(\\d{2})(\\d{4})',
+      'format' => '$1-$2-$3',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '
+            2(?:
+              9[14-79]|
+              74|
+              [34]7|
+              [56]9
+            )|
+            82|
+            993
+          ',
+      ),
+    ),
+    7 => 
+    array (
+      'pattern' => '(\\d)(\\d{4})(\\d{4})',
+      'format' => '$1-$2-$3',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '
+            3|
+            4(?:
+              2[09]|
+              7[01]
+            )|
+            6[1-9]
+          ',
+      ),
+    ),
+    8 => 
+    array (
+      'pattern' => '(\\d{2})(\\d{3})(\\d{4})',
+      'format' => '$1-$2-$3',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '[2479][1-9]',
+      ),
+    ),
   ),
   'mainCountryForCode' => false,
   'leadingZeroPossible' => true,
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_MD.php b/src/libphonenumber/data/PhoneNumberMetadata_MD.php
index 49875b05e..8d5930d00 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_MD.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_MD.php
@@ -45,7 +45,7 @@
             )|
             7(?:
               67|
-              7[47-9]|
+              7[457-9]|
               [89]\\d
             )
           )\\d{5}
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_NG.php b/src/libphonenumber/data/PhoneNumberMetadata_NG.php
index 6208e0030..c3c2f4d78 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_NG.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_NG.php
@@ -128,7 +128,7 @@
               0[2-9]|
               1\\d
             )\\d|
-            9091
+            90[39]\\d
           )\\d{6}
         ',
     'PossibleNumberPattern' => '\\d{8,10}',
@@ -247,7 +247,7 @@
         0 => '
             70|
             8[01]|
-            909
+            90[39]
           ',
       ),
       'nationalPrefixFormattingRule' => '0$1',
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_NZ.php b/src/libphonenumber/data/PhoneNumberMetadata_NZ.php
index 04aca03d2..bbf4b99a9 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_NZ.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_NZ.php
@@ -33,9 +33,9 @@
           2(?:
             [028]\\d{7,8}|
             1(?:
-              0\\d{5,7}|
-              [12]\\d{5,6}|
-              [3-9]\\d{5}
+              [03]\\d{5,7}|
+              [12457]\\d{5,6}|
+              [689]\\d{5}
             )|
             [79]\\d{7}
           )
@@ -163,7 +163,7 @@
     ),
     3 => 
     array (
-      'pattern' => '(\\d{2})(\\d{3})(\\d{3,4})',
+      'pattern' => '(\\d{2})(\\d{3})(\\d{3,5})',
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' => 
       array (
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_PK.php b/src/libphonenumber/data/PhoneNumberMetadata_PK.php
index d2dc12dc3..b7c3fdc7f 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_PK.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_PK.php
@@ -71,8 +71,7 @@
     'NationalNumberPattern' => '
           3(?:
             0\\d|
-            1[1-5]|
-            2[0-5]|
+            [12][0-5]|
             [34][1-7]|
             55|
             64
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_PL.php b/src/libphonenumber/data/PhoneNumberMetadata_PL.php
index 6ad185d94..e722bb740 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_PL.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_PL.php
@@ -40,7 +40,7 @@
   array (
     'NationalNumberPattern' => '
           (?:
-            5[013]|
+            5[0137]|
             6[069]|
             7[2389]|
             88
@@ -170,7 +170,7 @@
       array (
         0 => '
             39|
-            5[013]|
+            5[0137]|
             6[0469]|
             7[02389]|
             8[08]
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_SY.php b/src/libphonenumber/data/PhoneNumberMetadata_SY.php
index 10d59d7b5..9e9cf9856 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_SY.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_SY.php
@@ -19,7 +19,10 @@
               4\\d|
               [2356]
             )|
-            2[1-35]|
+            2(?:
+              1\\d?|
+              [235]
+            )|
             3(?:
               [13]\\d|
               4
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_UY.php b/src/libphonenumber/data/PhoneNumberMetadata_UY.php
index 8407242a5..45c5dced2 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_UY.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_UY.php
@@ -21,7 +21,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '9[13-9]\\d{6}',
+    'NationalNumberPattern' => '9[1-9]\\d{6}',
     'PossibleNumberPattern' => '\\d{8}',
     'ExampleNumber' => '94231234',
   ),
diff --git a/src/libphonenumber/data/PhoneNumberMetadata_VU.php b/src/libphonenumber/data/PhoneNumberMetadata_VU.php
index 0c0eb2084..b2bf214ab 100644
--- a/src/libphonenumber/data/PhoneNumberMetadata_VU.php
+++ b/src/libphonenumber/data/PhoneNumberMetadata_VU.php
@@ -14,7 +14,7 @@
   array (
     'NationalNumberPattern' => '
           (?:
-            2[2-9]\\d|
+            2[02-9]\\d|
             3(?:
               [5-7]\\d|
               8[0-8]
diff --git a/src/libphonenumber/data/ShortNumberMetadata_LV.php b/src/libphonenumber/data/ShortNumberMetadata_LV.php
index 675ac58c8..e8c3313e8 100644
--- a/src/libphonenumber/data/ShortNumberMetadata_LV.php
+++ b/src/libphonenumber/data/ShortNumberMetadata_LV.php
@@ -7,28 +7,47 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '[01]\\d{1,2}',
-    'PossibleNumberPattern' => '\\d{2,3}',
+    'NationalNumberPattern' => '
+          0\\d|
+          1\\d{2,6}|
+          8\\d{3,4}
+        ',
+    'PossibleNumberPattern' => '\\d{2,6}',
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '[01]\\d{1,2}',
-    'PossibleNumberPattern' => '\\d{2,3}',
+    'NationalNumberPattern' => '
+          0\\d|
+          1\\d{2,6}|
+          8\\d{3,4}
+        ',
+    'PossibleNumberPattern' => '\\d{2,6}',
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '[01]\\d{1,2}',
-    'PossibleNumberPattern' => '\\d{2,3}',
+    'NationalNumberPattern' => '
+          0\\d|
+          1\\d{2,6}|
+          8\\d{3,4}
+        ',
+    'PossibleNumberPattern' => '\\d{2,6}',
   ),
   'tollFree' => 
   array (
-    'NationalNumberPattern' => 'NA',
-    'PossibleNumberPattern' => 'NA',
+    'NationalNumberPattern' => '116000',
+    'PossibleNumberPattern' => '\\d{6}',
+    'ExampleNumber' => '116000',
   ),
   'premiumRate' => 
   array (
-    'NationalNumberPattern' => 'NA',
-    'PossibleNumberPattern' => 'NA',
+    'NationalNumberPattern' => '
+          1180|
+          8(?:
+            2\\d{3}|
+            [89]\\d{2}
+          )
+        ',
+    'PossibleNumberPattern' => '\\d{4,5}',
   ),
   'sharedCost' => 
   array (
@@ -59,7 +78,7 @@
   array (
     'NationalNumberPattern' => '
           0[123]|
-          112
+          11[023]
         ',
     'PossibleNumberPattern' => '\\d{2,3}',
     'ExampleNumber' => '112',
@@ -72,21 +91,36 @@
   'shortCode' => 
   array (
     'NationalNumberPattern' => '
-          0[123]|
-          112
+          0[1-4]|
+          1(?:
+            1(?:
+              [02-4]|
+              6(?:
+                000|
+                111
+              )|
+              8[0189]
+            )|
+            55|
+            655|
+            77
+          )|
+          821[57]4
         ',
-    'PossibleNumberPattern' => '\\d{2,3}',
+    'PossibleNumberPattern' => '\\d{2,6}',
     'ExampleNumber' => '112',
   ),
   'standardRate' => 
   array (
-    'NationalNumberPattern' => 'NA',
-    'PossibleNumberPattern' => 'NA',
+    'NationalNumberPattern' => '1181',
+    'PossibleNumberPattern' => '\\d{4}',
+    'ExampleNumber' => '1181',
   ),
   'carrierSpecific' => 
   array (
-    'NationalNumberPattern' => 'NA',
-    'PossibleNumberPattern' => 'NA',
+    'NationalNumberPattern' => '16\\d{2}',
+    'PossibleNumberPattern' => '\\d{4}',
+    'ExampleNumber' => '1655',
   ),
   'noInternationalDialling' => 
   array (
diff --git a/src/libphonenumber/data/ShortNumberMetadata_MD.php b/src/libphonenumber/data/ShortNumberMetadata_MD.php
index 083c0b8c3..4fb699dab 100644
--- a/src/libphonenumber/data/ShortNumberMetadata_MD.php
+++ b/src/libphonenumber/data/ShortNumberMetadata_MD.php
@@ -82,7 +82,8 @@
                   23
                 )
               )|
-              8\\d
+              8\\d|
+              99
             )|
             4\\d{3}|
             5[0-3]\\d|