telephone_number 1.4.20 → 1.4.21

data/data/telephone_number_data_file.xml

@@ -758,7 +758,7 @@
             4[02-9]|
             5[0-46-9]|
             [6-8]\d|
-            9[01]
+            9[0-2]
           )\d{4}
         </nationalNumberPattern>
       </voip>
@@ -1449,9 +1449,12 @@
             )
           )[46]\d{5}|
           (?:
-            29(?:
-              54|
-              66
+            2(?:
+              657|
+              9(?:
+                54|
+                66
+              )
             )|
             3(?:
               7(?:
@@ -1489,11 +1492,11 @@
                 02|
                 23
               )|
-              657|
               920
             )|
             3(?:
               4(?:
+                46|
                 8[27]|
                 92
               )|
@@ -1517,8 +1520,8 @@
             3(?:
               329|
               4(?:
-                [47]6|
                 62|
+                76|
                 89
               )|
               564
@@ -1556,7 +1559,7 @@
             3(?:
               364|
               4(?:
-                1[2-7]|
+                1[2-8]|
                 [235][4-6]|
                 84
               )|
@@ -1723,9 +1726,12 @@
             )
           )\d{5}|
           9(?:
-            29(?:
-              54|
-              66
+            2(?:
+              657|
+              9(?:
+                54|
+                66
+              )
             )|
             3(?:
               7(?:
@@ -1763,11 +1769,11 @@
                 02|
                 23
               )|
-              657|
               920
             )|
             3(?:
               4(?:
+                46|
                 8[27]|
                 92
               )|
@@ -1791,8 +1797,8 @@
             3(?:
               329|
               4(?:
-                [47]6|
                 62|
+                76|
                 89
               )|
               564
@@ -1829,7 +1835,7 @@
               3(?:
                 364|
                 4(?:
-                  1[2-7]|
+                  1[2-8]|
                   [235][4-6]|
                   84
                 )|
@@ -2449,23 +2455,30 @@
         <nationalNumberPattern>
           (?:
             (?:
-              2(?:
-                [0-26-9]\d|
-                3[0-8]|
-                4[02-9]|
-                5[0135-9]
-              )|
+              (?:
+                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|
-                4[0-578]|
-                6[1-9]|
-                7[0-35-9]
-              )|
-              7(?:
-                [013-57-9]\d|
-                2[0-8]
+                (?:
+                  [0-3589]\d|
+                  6[1-9]|
+                  7[0-35-9]
+                )\d|
+                4(?:
+                  [0-578]\d|
+                  90
+                )
               )
-            )\d{3}|
+            )\d\d|
             8(?:
               51(?:
                 0(?:
@@ -2490,7 +2503,8 @@
                   [4-6]\d|
                   7[89]|
                   9[0-4]
-                )
+                )|
+                3\d\d
               )|
               (?:
                 6[0-8]|
@@ -2525,18 +2539,20 @@
         <exampleNumber>412345678</exampleNumber>
         <nationalNumberPattern>
           4(?:
-            79[01]|
-            83[0-389]|
-            93[0-6]
+            (?:
+              79|
+              94
+            )[01]|
+            83[0-389]
           )\d{5}|
           4(?:
             [0-3]\d|
             4[047-9]|
             5[0-25-9]|
-            6[016-9]|
+            6[0-36-9]|
             7[02-8]|
             8[0-24-9]|
-            9[0-27-9]
+            9[0-37-9]
           )\d{6}
         </nationalNumberPattern>
       </mobile>
@@ -3201,9 +3217,9 @@
               9
             )|
             6(?:
+              [15]|
               28|
-              4[14]|
-              5
+              4[14]
             )|
             7[2-589]|
             8(?:
@@ -3565,6 +3581,7 @@
         <exampleNumber>8001234567</exampleNumber>
         <nationalNumberPattern>80[03]\d{7}</nationalNumberPattern>
       </tollFree>
+      <!-- Prefix 9643 added as per user report. -->
       <voip>
         <possibleLengths national="10"/>
         <exampleNumber>9604123456</exampleNumber>
@@ -3573,6 +3590,7 @@
             0[469]|
             1[0-47]|
             3[389]|
+            43|
             6[69]|
             7[78]
           )\d{6}
@@ -3654,19 +3672,10 @@
               2[0-57]|
               3[04-7]|
               44|
-              6[569]|
+              6[4-69]|
               7[0579]
             )|
-            90(?:
-              0[0-8]|
-              1[36]|
-              2[0-3568]|
-              3[0-689]|
-              [47][2-68]|
-              5[1-68]|
-              6[0-378]|
-              9[34679]
-            )
+            90\d\d
           )\d{4}
         </nationalNumberPattern>
       </premiumRate>
@@ -3742,7 +3751,7 @@
         <nationalNumberPattern>
           (?:
             0[1-35-7]|
-            5[1-8]|
+            5[0-8]|
             [67]\d
           )\d{6}
         </nationalNumberPattern>
@@ -3897,7 +3906,7 @@
         <numberFormat pattern="(\d{4})(\d{4})">
           <leadingDigits>
             [13679]|
-            8[047]
+            8[02-4679]
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
@@ -3928,17 +3937,18 @@
                 0\d|
                 3[12]|
                 44|
+                55|
                 7[7-9]|
                 88
               )|
               9[69][69]
             )|
             7(?:
+              [07]\d\d|
               1(?:
                 11|
                 78
-              )|
-              7\d\d
+              )
             )
           )\d{4}
         </nationalNumberPattern>
@@ -3952,8 +3962,8 @@
         <nationalNumberPattern>
           (?:
             3(?:
-              [1-79]\d|
-              8[0-47-9]
+              [0-79]\d|
+              8[0-57-9]
             )\d|
             6(?:
               3(?:
@@ -3961,10 +3971,11 @@
                 33|
                 6[16]
               )|
+              441|
               6(?:
                 3[03-9]|
                 [69]\d|
-                7[0-6]
+                7[0-689]
               )
             )
           )\d{4}
@@ -3973,7 +3984,7 @@
       <tollFree>
         <possibleLengths national="8"/>
         <exampleNumber>80123456</exampleNumber>
-        <nationalNumberPattern>80\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>8[02369]\d{6}</nationalNumberPattern>
       </tollFree>
       <!-- 87 numbers are "wholly paid by the caller", so they are slotted under premium-rate for
            now. -->
@@ -3983,7 +3994,7 @@
         <nationalNumberPattern>
           (?:
             87|
-            9[014578]
+            9[0-8]
           )\d{6}
         </nationalNumberPattern>
       </premiumRate>
@@ -4077,7 +4088,7 @@
         <exampleNumber>90011234</exampleNumber>
         <nationalNumberPattern>
           (?:
-            4[0-2]|
+            4[0-7]|
             [56]\d|
             9[013-9]
           )\d{6}
@@ -4110,14 +4121,12 @@
                mobileNumberPortableRegion="true">
       <generalDesc>
         <nationalNumberPattern>
+          590\d{6}|
           (?:
-            590|
-            (?:
-              69|
-              80
-            )\d|
-            976
-          )\d{6}
+            69|
+            80|
+            9\d
+          )\d{7}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -4126,6 +4135,7 @@
         <nationalNumberPattern>
           590(?:
             2[7-9]|
+            3[3-7]|
             5[12]|
             87
           )\d{4}
@@ -4146,6 +4156,16 @@
             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}
         </nationalNumberPattern>
@@ -4160,7 +4180,15 @@
       <voip>
         <possibleLengths national="9"/>
         <exampleNumber>976012345</exampleNumber>
-        <nationalNumberPattern>976[01]\d{5}</nationalNumberPattern>
+        <nationalNumberPattern>
+          9(?:
+            (?:
+              39[5-7]|
+              76[018]
+            )\d|
+            475[0-5]
+          )\d{4}
+        </nationalNumberPattern>
       </voip>
     </territory>
 
@@ -4200,7 +4228,7 @@
           441(?:
             [2378]\d|
             5[0-39]|
-            92
+            9[02]
           )\d{5}
         </nationalNumberPattern>
       </mobile>
@@ -4767,6 +4795,7 @@
               0[1-9]|
               1[02-9]|
               2\d|
+              3[0-4]|
               [89]9
             )
           )\d{4}
@@ -4920,7 +4949,7 @@
         <numberFormat pattern="(\d{3})(\d{4})">
           <leadingDigits>
             [24-6]|
-            3[15-79]
+            3[15-9]
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
@@ -4967,7 +4996,8 @@
               1[0-35-9]|
               55|
               [69]\d|
-              7[013]
+              7[013]|
+              81
             )|
             4(?:
               6[03]|
@@ -4997,10 +5027,7 @@
         <nationalNumberPattern>
           (?:
             321|
-            7(?:
-              [1-7]\d|
-              8[0-4]
-            )
+            7[1-8]\d
           )\d{5}
         </nationalNumberPattern>
       </mobile>
@@ -5027,7 +5054,7 @@
           79(?:
             1(?:
               [01]\d|
-              2[0-7]
+              2[0-8]
             )|
             2[0-7]\d
           )\d{3}
@@ -5337,9 +5364,9 @@
             4(?:
               03|
               1[68]|
+              [26]8|
               3[178]|
               50|
-              68|
               74
             )|
             5(?:
@@ -5395,9 +5422,9 @@
             4(?:
               03|
               1[68]|
+              [26]8|
               3[178]|
               50|
-              68|
               74
             )|
             5(?:
@@ -5584,18 +5611,20 @@
         <exampleNumber>412345678</exampleNumber>
         <nationalNumberPattern>
           4(?:
-            79[01]|
-            83[0-389]|
-            93[0-6]
+            (?:
+              79|
+              94
+            )[01]|
+            83[0-389]
           )\d{5}|
           4(?:
             [0-3]\d|
             4[047-9]|
             5[0-25-9]|
-            6[016-9]|
+            6[0-36-9]|
             7[02-8]|
             8[0-24-9]|
-            9[0-27-9]
+            9[0-37-9]
           )\d{6}
         </nationalNumberPattern>
       </mobile>
@@ -5783,12 +5812,7 @@
       <premiumRate>
         <possibleLengths national="9"/>
         <exampleNumber>800123456</exampleNumber>
-        <nationalNumberPattern>
-          80(?:
-            0\d\d|
-            120
-          )\d{4}
-        </nationalNumberPattern>
+        <nationalNumberPattern>80[0-2]\d{6}</nationalNumberPattern>
       </premiumRate>
     </territory>
 
@@ -6090,11 +6114,11 @@
               3(?:
                 2\d\d|
                 3(?:
-                  [0346]\d|
+                  [03467]\d|
                   1[0-35-9]|
                   2[1-9]|
                   5[0-24-9]|
-                  7[0-3]
+                  8[0-3]
                 )|
                 600
               )|
@@ -6159,11 +6183,11 @@
               3(?:
                 2\d\d|
                 3(?:
-                  [0346]\d|
+                  [03467]\d|
                   1[0-35-9]|
                   2[1-9]|
                   5[0-24-9]|
-                  7[0-3]
+                  8[0-3]
                 )|
                 600
               )|
@@ -7330,7 +7354,7 @@
     <!-- http://www.itu.int/oth/T020200002C/en -->
     <!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_Colombia -->
     <territory id="CO" countryCode="57" internationalPrefix="00(?:4(?:[14]4|56)|[579])"
-               nationalPrefix="0" nationalPrefixForParsing="0(4(?:[14]4|56)|[579])?"
+               nationalPrefix="0" nationalPrefixForParsing="0([3579]|4(?:[14]4|56))?"
                mobileNumberPortableRegion="true">
       <availableFormats>
         <numberFormat pattern="(\d{3})(\d{7})" nationalPrefixFormattingRule="($FG)"
@@ -7375,7 +7399,10 @@
             [0-4]\d|
             5[0-4]
           )\d{4}|
-          60[124-8][2-9]\d{6}
+          60(?:
+            [124-7][2-9]|
+            8[1-9]
+          )\d{6}
         </nationalNumberPattern>
       </fixedLine>
       <!-- Added prefix 323 based on user report and online evidences. -->
@@ -7383,13 +7410,12 @@
         <possibleLengths national="10"/>
         <exampleNumber>3211234567</exampleNumber>
         <nationalNumberPattern>
+          333301[0-5]\d{3}|
           3333(?:
-            0(?:
-              0\d|
-              1[0-5]
-            )|
-            [4-9]\d\d
-          )\d{3}|
+            00|
+            2[5-9]|
+            [3-9]\d
+          )\d{4}|
           (?:
             3(?:
               24[1-9]|
@@ -7528,7 +7554,7 @@
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="(\d)(\d{7})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>5</leadingDigits>
+          <leadingDigits>[56]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{7})" nationalPrefixFormattingRule="$NP$FG">
@@ -7540,6 +7566,7 @@
         <nationalNumberPattern>
           [27]\d{6,7}|
           [34]\d{5,7}|
+          63\d{6}|
           (?:
             5|
             8\d\d
@@ -7554,7 +7581,7 @@
         <nationalNumberPattern>
           (?:
             3[23]|
-            48
+            4[89]
           )\d{4,6}|
           (?:
             31|
@@ -7574,7 +7601,12 @@
       <mobile>
         <possibleLengths national="8"/>
         <exampleNumber>51234567</exampleNumber>
-        <nationalNumberPattern>5\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            5\d|
+            63
+          )\d{6}
+        </nationalNumberPattern>
       </mobile>
       <tollFree>
         <possibleLengths national="10"/>
@@ -7813,18 +7845,20 @@
         <exampleNumber>412345678</exampleNumber>
         <nationalNumberPattern>
           4(?:
-            79[01]|
-            83[0-389]|
-            93[0-6]
+            (?:
+              79|
+              94
+            )[01]|
+            83[0-389]
           )\d{5}|
           4(?:
             [0-3]\d|
             4[047-9]|
             5[0-25-9]|
-            6[016-9]|
+            6[0-36-9]|
             7[02-8]|
             8[0-24-9]|
-            9[0-27-9]
+            9[0-37-9]
           )\d{6}
         </nationalNumberPattern>
       </mobile>
@@ -7992,12 +8026,16 @@
         <exampleNumber>601123456</exampleNumber>
         <nationalNumberPattern>
           (?:
-            60[1-8]|
+            60[1-8]\d|
             7(?:
-              0[2-5]|
-              [2379]\d
+              0(?:
+                [2-5]\d|
+                60
+              )|
+              190|
+              [2379]\d\d
             )
-          )\d{6}
+          )\d{5}
         </nationalNumberPattern>
       </mobile>
       <tollFree>
@@ -8269,16 +8307,22 @@
           <leadingDigits>18[68]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
+        <!-- Mobile format for 15x mobile numbers. -->
+        <numberFormat pattern="(\d{4})(\d{7})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>15[1279]</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
         <!-- Some mobile numbers (carrier services etc..) have a 6 digit NSN and need to be formatted
              with 5 leading digits (as opposed to the 4.7 format).
              These are all in the ranges 150, 155, 156 and 158. -->
         <numberFormat pattern="(\d{5})(\d{6})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>15[0568]</leadingDigits>
-          <format>$1 $2</format>
-        </numberFormat>
-        <!-- Mobile format for 15x mobile numbers. -->
-        <numberFormat pattern="(\d{4})(\d{7})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>15[1279]</leadingDigits>
+          <leadingDigits>15[03568]</leadingDigits>
+          <leadingDigits>
+            15(?:
+              [0568]|
+              31
+            )
+          </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
         <!-- Various UAN numbers. -->
@@ -8439,7 +8483,10 @@
         <possibleLengths national="10,11"/>
         <exampleNumber>15123456789</exampleNumber>
         <nationalNumberPattern>
-          15[0-25-9]\d{8}|
+          15(?:
+            [0-25-9]\d\d|
+            310
+          )\d{6}|
           1(?:
             6[023]|
             7\d
@@ -9148,7 +9195,10 @@
             8(?:
               1(?:
                 0(?:
-                  000|
+                  0(?:
+                    00|
+                    [178]\d
+                  )|
                   [3-9]\d\d
                 )|
                 (?:
@@ -9164,7 +9214,10 @@
               )|
               2(?:
                 0(?:
-                  000|
+                  0(?:
+                    00|
+                    4\d
+                  )|
                   (?:
                     19|
                     [2-7]\d
@@ -9176,7 +9229,7 @@
                     3[5-9]
                   )\d|
                   7(?:
-                    [3679]\d|
+                    [0-79]\d|
                     8[13-9]
                   )|
                   8(?:
@@ -9255,9 +9308,13 @@
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>[189]</leadingDigits>
+          <leadingDigits>[89]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{8})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>1</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
@@ -9332,9 +9389,9 @@
               8[0-247-9]
             )|
             7(?:
-              [017]\d|
-              2[0-2]|
-              6[0-8]|
+              [0167]\d|
+              2[0-4]|
+              5[01]|
               8[0-3]
             )
           )\d{6}
@@ -9343,7 +9400,7 @@
       <tollFree>
         <possibleLengths national="9"/>
         <exampleNumber>801234567</exampleNumber>
-        <nationalNumberPattern>80\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>80[0-7]\d{6}</nationalNumberPattern>
       </tollFree>
       <premiumRate>
         <possibleLengths national="9"/>
@@ -9355,9 +9412,12 @@
         <possibleLengths national="9"/>
         <exampleNumber>592401234</exampleNumber>
         <nationalNumberPattern>
-          592(?:
-            4[0-2]|
-            93
+          (?:
+            592(?:
+              4[0-2]|
+              93
+            )|
+            80[89]\d\d
           )\d{4}
         </nationalNumberPattern>
       </voip>
@@ -9674,11 +9734,12 @@
         <possibleLengths national="9"/>
         <exampleNumber>911234567</exampleNumber>
         <nationalNumberPattern>
-          7001\d{5}|
+          700[1-9]\d{5}|
           (?:
             7(?:
               0[1-9]|
-              1[01]|
+              1[0-8]|
+              22|
               77|
               86|
               99
@@ -9710,17 +9771,10 @@
           <format>$1</format>
           <intlFormat>NA</intlFormat>
         </numberFormat>
-        <!-- General format for 1-digit prefix (5-10 digit numbers). -->
-        <numberFormat pattern="(\d)(\d{4,9})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>
-            [2568][1-8]|
-            3(?:
-              0[1-9]|
-              [1-9]
-            )|
-            9
-          </leadingDigits>
-          <format>$1 $2</format>
+        <!-- Format for 5 digit UAN numbers. -->
+        <numberFormat pattern="(\d{5})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>20[2-59]</leadingDigits>
+          <format>$1</format>
         </numberFormat>
         <!-- Format for 6 digit short codes. -->
         <numberFormat pattern="(\d{6})">
@@ -9731,8 +9785,10 @@
         <!-- General format for 3-digit prefix (6-10 digit numbers). -->
         <numberFormat pattern="(\d{3})(\d{3,7})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>
-            [12]00|
-            [368]|
+            (?:
+              [1-3]0|
+              [68]
+            )0|
             70[07-9]
           </leadingDigits>
           <format>$1 $2</format>
@@ -9740,7 +9796,9 @@
         <!-- General format for 2-digit prefix (6-10 digit numbers). -->
         <numberFormat pattern="(\d{2})(\d{4,8})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>
-            [1245]|
+            [14]|
+            2[09]|
+            50|
             7[135]
           </leadingDigits>
           <format>$1 $2</format>
@@ -9749,6 +9807,21 @@
           <leadingDigits>7</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
+        <!-- General format for 1-digit prefix (5-10 digit numbers). -->
+        <numberFormat pattern="(\d)(\d{4,9})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>
+            (?:
+              1[3-79]|
+              [2568]
+            )[1-8]|
+            3(?:
+              0[1-9]|
+              [1-9]
+            )|
+            9
+          </leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
@@ -9801,7 +9874,11 @@
         <nationalNumberPattern>
           (?:
             1[3-79][1-8]|
-            [235689][1-8]\d
+            [23568][1-8]\d|
+            9(?:
+              00|
+              [1-8]\d
+            )
           )\d{2,6}
         </nationalNumberPattern>
       </fixedLine>
@@ -10113,8 +10190,14 @@
         <exampleNumber>123456789</exampleNumber>
         <nationalNumberPattern>
           (?:
-            [1-35]\d|
-            4[1-9]
+            26[013-9]|
+            59[1-35-9]
+          )\d{6}|
+          (?:
+            [13]\d|
+            2[0-57-9]|
+            4[1-9]|
+            5[0-8]
           )\d{7}
         </nationalNumberPattern>
       </fixedLine>
@@ -10416,7 +10499,7 @@
                 4(?:
                   [0-5]\d\d|
                   69[7-9]|
-                  70[0-579]
+                  70[0-79]
                 )|
                 (?:
                   (?:
@@ -10429,113 +10512,112 @@
                   )
                 )\d
               )|
-              2(?:
+              (?:
+                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]
+                  )
+                )|
                 (?:
-                  0[024-9]|
-                  2[3-9]|
-                  3[3-79]|
-                  4[1-689]|
-                  [58][02-9]|
-                  6[0-47-9]|
-                  7[013-9]|
-                  9\d
-                )\d\d|
-                1(?:
-                  [0-7]\d\d|
+                  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(?:
-                    [02]\d|
-                    1[0-246-9]
+                    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]
                   )
-                )
-              )|
-              (?:
-                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]
+                )\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(?:
@@ -11002,49 +11084,63 @@
             )\d|
             22252[0-4]
           )\d\d|
-          5(?:
-            00(?:
-              0\d|
-              5[05]
-            )|
-            11(?:
-              00|
-              [124]\d|
-              3[01]
-            )|
-            (?:
-              520|
-              909
-            )0|
-            75(?:
-              00|
-              [57]5
-            )|
-            8(?:
-              0(?:
-                [01]\d|
-                2[0-4]
+          (?:
+            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
+                )
               )|
-              58[89]|
               8(?:
-                55|
-                88
+                0(?:
+                  [018]\d|
+                  2[0-4]
+                )|
+                58[89]|
+                8(?:
+                  55|
+                  88
+                )
+              )|
+              9(?:
+                090|
+                [1-35-9]\d\d
               )
-            )
-          )\d{4}|
-          (?:
-            5(?:
-              [14]4|
-              5[0157-9]|
-              68|
-              7[0147-9]|
-              9[1-35-9]
             )|
-            790
-          )\d{6}|
+            790\d\d
+          )\d{4}|
           5(?:
             0(?:
-              070|
+              0[17]0|
               505
             )|
             1(?:
@@ -11099,21 +11195,24 @@
                mobileNumberPortableRegion="true">
       <availableFormats>
         <numberFormat pattern="(\d{3})(\d{2})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>[569]</leadingDigits>
+          <leadingDigits>
+            [56]|
+            9[47]
+          </leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{2})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>8</leadingDigits>
+          <leadingDigits>[89]</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
+          [56]94\d{6}|
           (?:
-            [56]94|
-            80\d|
-            976
-          )\d{6}
+            80|
+            9\d
+          )\d{7}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -11121,9 +11220,8 @@
         <exampleNumber>594101234</exampleNumber>
         <nationalNumberPattern>
           594(?:
-            [0239]\d|
-            1[0-2]|
-            4[03-9]|
+            [02-49]\d|
+            1[0-5]|
             5[6-9]|
             6[0-3]|
             80
@@ -11152,7 +11250,15 @@
       <voip>
         <possibleLengths national="9"/>
         <exampleNumber>976012345</exampleNumber>
-        <nationalNumberPattern>976\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>
+          9(?:
+            (?:
+              396|
+              76\d
+            )\d|
+            476[0-5]
+          )\d{4}
+        </nationalNumberPattern>
       </voip>
     </territory>
 
@@ -11387,9 +11493,9 @@
       <generalDesc>
         <nationalNumberPattern>
           (?:
-            [25]\d\d|
-            606
-          )\d{5}
+            [25]\d|
+            60
+          )\d{6}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -11399,8 +11505,8 @@
           2190[0-2]\d{3}|
           2(?:
             0(?:
-              0\d|
-              20
+              [02]\d|
+              3[01]
             )|
             16[24-9]|
             2[2-5]\d
@@ -11411,14 +11517,17 @@
         <possibleLengths national="8"/>
         <exampleNumber>57123456</exampleNumber>
         <nationalNumberPattern>
-          525(?:
-            0\d|
-            1[0-4]
-          )\d{3}|
+          5251[0-4]\d{3}|
           (?:
-            5[146-8]\d|
-            606
-          )\d{5}
+            5(?:
+              [146-8]\d\d|
+              250
+            )|
+            60(?:
+              1[01]|
+              6\d
+            )
+          )\d{4}
         </nationalNumberPattern>
       </mobile>
     </territory>
@@ -11452,9 +11561,8 @@
           (?:
             19|
             3[1-7]|
-            6[14689]|
+            [68][1-9]|
             70|
-            8[14-79]|
             9\d
           )\d{4}
         </nationalNumberPattern>
@@ -11523,7 +11631,7 @@
         <nationalNumberPattern>
           (?:
             [23679]\d|
-            5[0-389]
+            5[0-489]
           )\d{5}
         </nationalNumberPattern>
       </mobile>
@@ -11610,14 +11718,12 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
+          590\d{6}|
           (?:
-            590|
-            (?:
-              69|
-              80
-            )\d|
-            976
-          )\d{6}
+            69|
+            80|
+            9\d
+          )\d{7}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -11628,11 +11734,10 @@
             0[1-68]|
             [14][0-24-9]|
             2[0-68]|
-            3[1289]|
+            3[1-9]|
             5[3-579]|
-            6[0-489]|
+            [68][0-689]|
             7[08]|
-            8[0-689]|
             9\d
           )\d{4}
         </nationalNumberPattern>
@@ -11651,6 +11756,16 @@
             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}
         </nationalNumberPattern>
@@ -11665,7 +11780,15 @@
       <voip>
         <possibleLengths national="9"/>
         <exampleNumber>976012345</exampleNumber>
-        <nationalNumberPattern>976[01]\d{5}</nationalNumberPattern>
+        <nationalNumberPattern>
+          9(?:
+            (?:
+              39[5-7]|
+              76[018]
+            )\d|
+            475[0-5]
+          )\d{4}
+        </nationalNumberPattern>
       </voip>
     </territory>
 
@@ -11894,7 +12017,7 @@
     <territory id="GT" countryCode="502" internationalPrefix="00">
       <availableFormats>
         <numberFormat pattern="(\d{4})(\d{4})">
-          <leadingDigits>[2-7]</leadingDigits>
+          <leadingDigits>[2-8]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
         <numberFormat pattern="(\d{4})(\d{3})(\d{4})">
@@ -11904,6 +12027,7 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
+          80\d{6}|
           (?:
             1\d{3}|
             [2-7]
@@ -11918,7 +12042,12 @@
       <mobile>
         <possibleLengths national="8"/>
         <exampleNumber>51234567</exampleNumber>
-        <nationalNumberPattern>[3-5]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            [3-5]\d\d|
+            80[0-4]
+          )\d{5}
+        </nationalNumberPattern>
       </mobile>
       <tollFree>
         <possibleLengths national="11"/>
@@ -11936,7 +12065,7 @@
     <!-- Calling code and formatting shared with 'US' -->
     <!-- http://www.nationalnanpa.com/nas/public/assigned_code_query_step1.do?method=resetCodeQueryModel -->
     <territory id="GU" countryCode="1" leadingDigits="671" internationalPrefix="011"
-               nationalPrefix="1" nationalPrefixForParsing="([3-9]\d{6})$|1"
+               nationalPrefix="1" nationalPrefixForParsing="([2-9]\d{6})$|1"
                nationalPrefixTransformRule="671$1">
       <generalDesc>
         <nationalNumberPattern>
@@ -11954,6 +12083,7 @@
         <exampleNumber>6713001234</exampleNumber>
         <nationalNumberPattern>
           671(?:
+            2\d\d|
             3(?:
               00|
               3[39]|
@@ -12005,6 +12135,7 @@
         <exampleNumber>6713001234</exampleNumber>
         <nationalNumberPattern>
           671(?:
+            2\d\d|
             3(?:
               00|
               3[39]|
@@ -12162,17 +12293,16 @@
     <territory id="GY" countryCode="592" internationalPrefix="001">
       <availableFormats>
         <numberFormat pattern="(\d{3})(\d{4})">
-          <leadingDigits>[2-46-9]</leadingDigits>
+          <leadingDigits>[2-9]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          9008\d{3}|
           (?:
-            [2-467]\d\d|
-            862
-          )\d{4}
+            [2-8]\d{3}|
+            9008
+          )\d{3}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -12186,7 +12316,7 @@
               3[1-4]|
               5[3-9]|
               6\d|
-              7[0-24-79]
+              7[0-79]
             )|
             3(?:
               2[25-9]|
@@ -12196,6 +12326,7 @@
               4[0-24]|
               5[56]
             )|
+            50[0-6]|
             77[1-57]
           )\d{4}
         </nationalNumberPattern>
@@ -12208,8 +12339,14 @@
         <exampleNumber>6091234</exampleNumber>
         <nationalNumberPattern>
           (?:
+            510|
             6\d\d|
-            70[0-35-7]
+            7(?:
+              [01]\d|
+              2[156]|
+              31|
+              49
+            )
           )\d{4}
         </nationalNumberPattern>
       </mobile>
@@ -12219,7 +12356,12 @@
         <nationalNumberPattern>
           (?:
             289|
-            862
+            8(?:
+              00|
+              6[28]|
+              88|
+              99
+            )
           )\d{4}
         </nationalNumberPattern>
       </tollFree>
@@ -12228,6 +12370,11 @@
         <exampleNumber>9008123</exampleNumber>
         <nationalNumberPattern>9008\d{3}</nationalNumberPattern>
       </premiumRate>
+      <voip>
+        <possibleLengths national="7"/>
+        <exampleNumber>5151234</exampleNumber>
+        <nationalNumberPattern>515\d{4}</nationalNumberPattern>
+      </voip>
     </territory>
 
     <!-- Hong Kong (HK) -->
@@ -12286,13 +12433,13 @@
                 7[0-24-69]
               )\d|
               8(?:
-                [45][0-8]|
-                6[01]|
-                9\d
+                4[0-8]|
+                [59]\d|
+                6[01]
               )
             )|
             58(?:
-              0[1-8]|
+              0[1-9]|
               1[2-9]
             )
           )\d{4}
@@ -12307,34 +12454,37 @@
         <nationalNumberPattern>
           (?:
             4(?:
-              44[5-9]|
+              44[0-25-9]|
               6(?:
-                0[0-7]|
-                1[0-6]|
+                1[0-7]|
                 4[0-57-9]|
-                6[0-4]|
-                7[0-8]
+                6[0-4]
               )
             )|
-            573[0-6]|
+            5(?:
+              73[0-6]|
+              95[0-8]
+            )|
             6(?:
               26[013-8]|
               66[0-3]
             )|
             70(?:
-              7[1-5]|
+              7[1-8]|
               8[0-4]
             )|
-            848[015-9]|
+            848[0-35-9]|
             9(?:
               29[013-9]|
-              59[0-4]
+              39[01]|
+              59[0-4]|
+              899
             )
           )\d{4}|
           (?:
             4(?:
-              4[01]|
-              6[2358]
+              4[0-35-8]|
+              6[02357-9]
             )|
             5(?:
               [1-59][0-46-9]|
@@ -12347,7 +12497,8 @@
               [268][0-57-9]|
               7[0-79]
             )|
-            84[09]|
+            70[129]|
+            84[0-29]|
             9(?:
               0[1-9]|
               1[02-9]|
@@ -12578,7 +12729,10 @@
         </numberFormat>
         <!-- For 8 and 9 digit numbers of premium, personal and UAN numbers. -->
         <numberFormat pattern="(\d{2})(\d{3})(\d{3,4})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>[67]</leadingDigits>
+          <leadingDigits>
+            6|
+            7[245]
+          </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <!-- For 8 and 9 digit numbers of mobile. -->
@@ -12587,7 +12741,7 @@
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{3})(\d{3,4})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>[2-5]</leadingDigits>
+          <leadingDigits>[2-57]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})" nationalPrefixFormattingRule="$NP$FG">
@@ -12623,23 +12777,29 @@
         <possibleLengths national="8,9"/>
         <exampleNumber>921234567</exampleNumber>
         <nationalNumberPattern>
-          98\d{6,7}|
-          975(?:
-            1\d|
-            77|
-            9[67]
-          )\d{4}|
           9(?:
-            0[1-9]|
-            [1259]\d|
-            7[0679]
-          )\d{6}
+            (?:
+              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}
         </nationalNumberPattern>
       </mobile>
       <tollFree>
         <possibleLengths national="[7-9]"/>
         <exampleNumber>800123456</exampleNumber>
-        <nationalNumberPattern>80[01]\d{4,6}</nationalNumberPattern>
+        <nationalNumberPattern>80\d{5,7}</nationalNumberPattern>
       </tollFree>
       <premiumRate>
         <possibleLengths national="[6-8]"/>
@@ -13332,19 +13492,20 @@
         <possibleLengths national="9"/>
         <exampleNumber>502345678</exampleNumber>
         <nationalNumberPattern>
+          55410\d{4}|
           5(?:
             (?:
-              [02368]\d|
-              [19][2-9]|
-              4[1-9]
+              [02][02-9]|
+              [149][2-9]|
+              [36]\d|
+              8[3-7]
             )\d|
             5(?:
               01|
-              1[79]|
-              2[2-9]|
+              2\d|
               3[0-3]|
               4[34]|
-              5[015689]|
+              5[0-25689]|
               6[6-8]|
               7[0-267]|
               8[7-9]|
@@ -13395,14 +13556,18 @@
         <exampleNumber>771234567</exampleNumber>
         <nationalNumberPattern>
           7(?:
-            380|
+            38(?:
+              0\d|
+              5[09]|
+              88
+            )|
             8(?:
               33|
               55|
               77|
               81
-            )
-          )\d{5}|
+            )\d
+          )\d{4}|
           7(?:
             18|
             2[23]|
@@ -14826,11 +14991,14 @@
           )|
           94(?:
             000[09]|
+            (?:
+              12\d|
+              30[0-2]
+            )\d|
             2(?:
               121|
               [2689]0\d
             )|
-            30[0-2]\d|
             4(?:
               111|
               40\d
@@ -14858,13 +15026,14 @@
               [0-46]\d\d|
               5[15]0|
               8(?:
-                1\d|
+                [12]\d|
                 88
               )|
               9(?:
                 0[0-3]|
                 [19]\d|
                 21|
+                69|
                 77|
                 8[7-9]
               )
@@ -15126,7 +15295,8 @@
               44|
               [679]
             )|
-            [378]
+            [378]|
+            43
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -15159,6 +15329,7 @@
             9\d{7,8}
           )|
           (?:
+            43|
             55|
             70
           )\d{8}|
@@ -15245,13 +15416,18 @@
         </nationalNumberPattern>
       </fixedLine>
       <!-- User reported the existence of new 11 digit long numbers for TIM with the prefix 33X, so
-           it is also supported. -->
+           it is also supported.
+           Prefix 43 is 10 digits long and is used for SMS Application To
+           Person (A2P) for OTP, marketing, etc -->
       <mobile>
         <possibleLengths national="9,10"/>
         <exampleNumber>3123456789</exampleNumber>
         <nationalNumberPattern>
-          3[1-9]\d{8}|
-          3[2-9]\d{7}
+          3[2-9]\d{7,8}|
+          (?:
+            31|
+            43
+          )\d{8}
         </nationalNumberPattern>
       </mobile>
       <tollFree>
@@ -15368,7 +15544,7 @@
             )\d|
             7(?:
               00[378]|
-              97[7-9]
+              97\d
             )
           )\d{5}
         </nationalNumberPattern>
@@ -15538,7 +15714,7 @@
                 40|
                 5[06]|
                 6[2-589]|
-                7[025-9]|
+                7[0-25-9]|
                 8[04]|
                 9[4-9]
               )|
@@ -15845,8 +16021,15 @@
     <!-- http://www.soumu.go.jp/main_sosiki/joho_tsusin/top/tel_number/number_shitei.html -->
     <!-- https://www.itu.int/oth/T020200006D/en -->
     <!-- http://www.numberingplans.com/?page=dialling&sub=areacodes&ac=JP -->
+    <!-- nationalPrefixTransformRule is used here for purpose of capturing 0005999999 kind of
+         short codes without dropping intial '0' as national prefix. As we are using this field, the
+         library is unable to capture domestic carrier codes used, example input:
+         003768-0XX-YYYY-ZZZZ. Due to historic reasons, the parts that we captured in
+         nationalPrefixTransform rule can either be used to transform or to capture in fields like
+         preferred_domestic_carrier_code; schema is designed this way. -->
     <territory id="JP" countryCode="81" internationalPrefix="010" nationalPrefix="0"
-               mobileNumberPortableRegion="true">
+               nationalPrefixForParsing="(000[259]\d{6})$|(?:(?:003768)0?)|0"
+               nationalPrefixTransformRule="$1" mobileNumberPortableRegion="true">
       <availableFormats>
         <!-- National-only toll-free numbers (0037, 0066, 0077 and 0088). -->
         <numberFormat pattern="(\d{4})(\d{4})">
@@ -15886,8 +16069,7 @@
             8(?:
               3[89]|
               47|
-              51|
-              63
+              51
             )|
             9(?:
               80|
@@ -15925,8 +16107,7 @@
                 96
               )|
               477|
-              51[2-9]|
-              636
+              51[2-9]
             )|
             9(?:
               802|
@@ -15971,8 +16152,7 @@
                 96[2457-9]
               )|
               477|
-              51[2-9]|
-              636[457-9]
+              51[2-9]
             )|
             9(?:
               802|
@@ -16044,7 +16224,7 @@
             )|
             5(?:
               2|
-              3[045]|
+              3[0459]|
               4[0-369]|
               5[29]|
               8[02389]|
@@ -16060,7 +16240,7 @@
             )|
             8(?:
               2[124589]|
-              3[27-9]|
+              3[26-9]|
               49|
               51|
               6|
@@ -16125,12 +16305,17 @@
               [45]|
               6[248]|
               7[2-47]|
-              8[1-9]
+              8[1-9]|
+              9[29]
             )|
             5(?:
               2|
-              3[045]|
+              3(?:
+                [045]|
+                9[0-8]
+              )|
               4[0-369]|
+              5[29]|
               8[02389]|
               9[0-3]
             )|
@@ -16153,13 +16338,17 @@
                 4[0-39]|
                 9[0-2469]
               )|
+              3(?:
+                [29]|
+                60
+              )|
               49|
               51|
               6(?:
                 [0-24]|
                 36|
                 5[0-3589]|
-                72|
+                7[23]|
                 9[01459]
               )|
               7[0-468]|
@@ -16178,11 +16367,6 @@
                 4[0178]
               )
             )|
-            (?:
-              49|
-              55|
-              83
-            )[29]|
             (?:
               264|
               837
@@ -16259,7 +16443,14 @@
             )|
             5(?:
               2|
-              3[045]|
+              3(?:
+                [045]|
+                9(?:
+                  [0-58]|
+                  6[4-9]|
+                  7[0-35689]
+                )
+              )|
               4[0-369]|
               5[29]|
               8[02389]|
@@ -16286,6 +16477,7 @@
               )|
               3(?:
                 [29]|
+                60|
                 7(?:
                   [017-9]|
                   6[6-8]
@@ -16295,7 +16487,7 @@
               51|
               6(?:
                 [0-24]|
-                36[23]|
+                36[2-57-9]|
                 5(?:
                   [0-389]|
                   5[23]
@@ -16304,7 +16496,10 @@
                   [01]|
                   9[178]
                 )|
-                72|
+                7(?:
+                  2[2-468]|
+                  3[78]
+                )|
                 9[0145]
               )|
               7[0-468]|
@@ -16328,162 +16523,10 @@
               8294|
               96
             )[1-3]|
-            2(?:
-              57|
-              93
-            )[015-9]|
-            (?:
-              223|
-              8699
-            )[014-9]|
-            (?:
-              25[0468]|
-              422|
-              838
-            )[01]|
-            (?:
-              48|
-              8292|
-              9[23]
-            )[1-9]|
-            (?:
-              47[59]|
-              59[89]|
-              8(?:
-                68|
-                9
-              )
-            )[019]
-          </leadingDigits>
-          <leadingDigits>
-            1(?:
-              1|
-              5(?:
-                4[018]|
-                5[017]
-              )|
-              77|
-              88|
-              9[69]
-            )|
-            2(?:
-              2[127]|
-              3[0-269]|
-              4[59]|
-              5(?:
-                [1-3]|
-                5[0-69]|
-                7[015-9]|
-                9(?:
-                  17|
-                  99
-                )
-              )|
-              6(?:
-                2|
-                4[016-9]
-              )|
-              7(?:
-                [1-35]|
-                8[0189]
-              )|
-              8(?:
-                [16]|
-                3[0134]|
-                9[0-5]
-              )|
-              9(?:
-                [028]|
-                17|
-                3[015-9]
-              )
-            )|
-            4(?:
-              2(?:
-                [13-79]|
-                8[014-6]
-              )|
-              3[0-57]|
-              [45]|
-              6[248]|
-              7[2-47]|
-              9[29]
-            )|
-            5(?:
-              2|
-              3[045]|
-              4[0-369]|
-              5[29]|
-              8[02389]|
-              9[0-3]
-            )|
-            7(?:
-              2[02-46-9]|
-              34|
-              [58]|
-              6[0249]|
-              7[57]|
-              9(?:
-                [23]|
-                4[0-59]|
-                5[01569]|
-                6[0167]
-              )
-            )|
-            8(?:
-              2(?:
-                [1258]|
-                4[0-39]|
-                9(?:
-                  [019]|
-                  4[1-3]|
-                  6(?:
-                    [0-47-9]|
-                    5[01346-9]
-                  )
-                )
-              )|
-              3(?:
-                [29]|
-                7(?:
-                  [017-9]|
-                  6[6-8]
-                )
-              )|
-              49|
-              51|
-              6(?:
-                [0-24]|
-                36[23]|
-                5(?:
-                  [0-389]|
-                  5[23]
-                )|
-                6(?:
-                  [01]|
-                  9[178]
-                )|
-                72|
-                9[0145]
-              )|
-              7[0-468]|
-              8[68]
-            )|
-            9(?:
-              4[15]|
-              5[138]|
-              6[1-3]|
-              7[156]|
-              8[189]|
-              9(?:
-                [1289]|
-                3(?:
-                  31|
-                  4[357]
-                )|
-                4[0178]
-              )
-            )|
+            2(?:
+              57|
+              93
+            )[015-9]|
             (?:
               223|
               8699
@@ -16495,10 +16538,7 @@
             )[01]|
             (?:
               48|
-              829(?:
-                2|
-                66
-              )|
+              8292|
               9[23]
             )[1-9]|
             (?:
@@ -16792,7 +16832,7 @@
       <tollFree>
         <possibleLengths national="9,10"/>
         <exampleNumber>800223456</exampleNumber>
-        <nationalNumberPattern>800[2-8]\d{5,6}</nationalNumberPattern>
+        <nationalNumberPattern>800[02-8]\d{5,6}</nationalNumberPattern>
       </tollFree>
       <premiumRate>
         <possibleLengths national="9"/>
@@ -16830,10 +16870,7 @@
       <generalDesc>
         <nationalNumberPattern>
           8\d{9}|
-          (?:
-            [235-8]\d|
-            99
-          )\d{7}
+          [235-9]\d{8}
         </nationalNumberPattern>
       </generalDesc>
       <!-- Extra area codes found on Web Search: 3147. -->
@@ -16918,7 +16955,10 @@
               55
             )|
             88[08]|
-            99[05-9]
+            9(?:
+              12|
+              9[05-9]
+            )
           )\d{6}
         </nationalNumberPattern>
       </mobile>
@@ -17111,13 +17151,40 @@
         <exampleNumber>72001234</exampleNumber>
         <nationalNumberPattern>
           (?:
-            63\d{3}|
-            73(?:
-              0[0-5]\d|
-              140
+            6200[01]|
+            7(?:
+              310[1-9]|
+              5(?:
+                02[03-9]|
+                12[0-47-9]|
+                22[0-7]|
+                [34](?:
+                  0[1-9]|
+                  8[02-9]
+                )|
+                50[1-9]
+              )
             )
           )\d{3}|
-          [67]200[01]\d{3}
+          (?:
+            63\d\d|
+            7(?:
+              (?:
+                [0146-9]\d|
+                2[0-689]
+              )\d|
+              3(?:
+                [02-9]\d|
+                1[1-9]
+              )|
+              5(?:
+                [0-2][013-9]|
+                [34][1-79]|
+                5[1-9]|
+                [6-9]\d
+              )
+            )
+          )\d{4}
         </nationalNumberPattern>
       </mobile>
       <!-- ITU refers to these as "Overseas Operator" (used to call Phone Group's usage
@@ -17518,7 +17585,7 @@
             22[13]\d
           )\d{4,5}|
           1(?:
-            0[1-46-9]|
+            0[0-46-9]|
             [16-9]\d|
             2[013-9]
           )\d{6,7}
@@ -17578,7 +17645,7 @@
             6(?:
               [07]0|
               44|
-              6[168]|
+              6[0168]|
               88
             )|
             8(?:
@@ -17677,16 +17744,16 @@
               1(?:
                 00|
                 11|
-                66
+                6[16]
               )|
-              222|
+              2[26]2|
               3[36]3|
-              444|
+              4[46]4|
               7(?:
                 0[013-9]|
                 [67]\d
               )|
-              888|
+              8[68]8|
               9(?:
                 [069]\d|
                 3[039]
@@ -17694,18 +17761,20 @@
             )|
             9(?:
               (?:
-                0[09]|
-                22|
-                [4679]\d|
+                [04679]\d|
                 8[057-9]
               )\d|
               1(?:
                 1[01]|
                 99
               )|
+              2(?:
+                00|
+                2\d
+              )|
               3(?:
                 00|
-                33
+                3[03]
               )|
               5(?:
                 00|
@@ -17887,7 +17956,7 @@
     <!-- http://www.itu.int/oth/T020200006F/en -->
     <!-- https://telecom.kz/en/catalog/kazahstan.171777/5 -->
     <territory id="KZ" countryCode="7" leadingDigits="33|7" preferredInternationalPrefix="8~10"
-               internationalPrefix="810" nationalPrefix="8">
+               internationalPrefix="810" nationalPrefix="8" mobileNumberPortableRegion="true">
       <generalDesc>
         <nationalNumberPattern>
           (?:
@@ -18424,10 +18493,10 @@
             6(?:
               (?:
                 4[5-9]|
-                5[0-4]
+                5[0-469]
               )\d|
               6(?:
-                [0245]\d|
+                [024-6]\d|
                 [17]0|
                 3[7-9]
               )
@@ -18565,7 +18634,10 @@
     <territory id="LR" countryCode="231" internationalPrefix="00" nationalPrefix="0">
       <availableFormats>
         <numberFormat pattern="(\d)(\d{3})(\d{3})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>[4-6]</leadingDigits>
+          <leadingDigits>
+            4[67]|
+            [56]
+          </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <!-- Formatting from Ministry of Agriculture,
@@ -18575,14 +18647,14 @@
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{3})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>[23578]</leadingDigits>
+          <leadingDigits>[2-578]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
           (?:
-            [25]\d|
+            [245]\d|
             33|
             77|
             88
@@ -18594,14 +18666,9 @@
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
-        <possibleLengths national="8,9"/>
+        <possibleLengths national="8"/>
         <exampleNumber>21234567</exampleNumber>
-        <nationalNumberPattern>
-          (?:
-            2\d{3}|
-            33333
-          )\d{4}
-        </nationalNumberPattern>
+        <nationalNumberPattern>2\d{7}</nationalNumberPattern>
       </fixedLine>
       <!-- West Africa Telecom seems to be a mobile company from their website. -->
       <mobile>
@@ -18620,7 +18687,10 @@
                 88
               )\d
             )\d|
-            4[67]
+            4(?:
+              240|
+              [67]
+            )
           )\d{5}|
           [56]\d{6}
         </nationalNumberPattern>
@@ -18668,7 +18738,7 @@
       <tollFree>
         <possibleLengths national="8"/>
         <exampleNumber>80021234</exampleNumber>
-        <nationalNumberPattern>800[256]\d{4}</nationalNumberPattern>
+        <nationalNumberPattern>800[1256]\d{4}</nationalNumberPattern>
       </tollFree>
     </territory>
 
@@ -19104,32 +19174,6 @@
     <territory id="MA" mainCountryForCode="true" countryCode="212" internationalPrefix="00"
                nationalPrefix="0" mobileNumberPortableRegion="true">
       <availableFormats>
-        <numberFormat pattern="(\d{5})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>
-            5(?:
-              29|
-              38
-            )
-          </leadingDigits>
-          <leadingDigits>
-            5(?:
-              29[1289]|
-              389
-            )
-          </leadingDigits>
-          <leadingDigits>
-            529(?:
-              1[1-46-9]|
-              2[013-8]|
-              90
-            )|
-            5(?:
-              298|
-              389
-            )[0-46-9]
-          </leadingDigits>
-          <format>$1-$2</format>
-        </numberFormat>
         <!-- This format is added based on online references found. -->
         <numberFormat pattern="(\d{3})(\d{2})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>5[45]</leadingDigits>
@@ -19138,22 +19182,14 @@
         <numberFormat pattern="(\d{4})(\d{5})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>
             5(?:
-              2[2-489]|
-              3[5-9]|
-              9
-            )|
-            892
-          </leadingDigits>
-          <leadingDigits>
-            5(?:
-              2(?:
-                [2-49]|
-                8[235-9]
-              )|
-              3[5-9]|
+              2[2-46-9]|
+              3[3-9]|
               9
             )|
-            892
+            8(?:
+              0[89]|
+              92
+            )
           </leadingDigits>
           <format>$1-$2</format>
         </numberFormat>
@@ -19174,20 +19210,18 @@
         <possibleLengths national="9"/>
         <exampleNumber>520123456</exampleNumber>
         <nationalNumberPattern>
-          5293[01]\d{4}|
           5(?:
             2(?:
-              [0-25-7]\d|
+              [0-25-79]\d|
               3[1-578]|
               4[02-46-8]|
-              8[0235-7]|
-              9[0-289]
+              8[0235-7]
             )|
             3(?:
               [0-47]\d|
               5[02-9]|
               6[02-8]|
-              8[0189]|
+              8[014-9]|
               9[3-9]
             )|
             (?:
@@ -19208,9 +19242,9 @@
               8[0-247-9]
             )|
             7(?:
-              [017]\d|
-              2[0-2]|
-              6[0-8]|
+              [0167]\d|
+              2[0-4]|
+              5[01]|
               8[0-3]
             )
           )\d{6}
@@ -19219,7 +19253,7 @@
       <tollFree>
         <possibleLengths national="9"/>
         <exampleNumber>801234567</exampleNumber>
-        <nationalNumberPattern>80\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>80[0-7]\d{6}</nationalNumberPattern>
       </tollFree>
       <premiumRate>
         <possibleLengths national="9"/>
@@ -19231,9 +19265,12 @@
         <possibleLengths national="9"/>
         <exampleNumber>592401234</exampleNumber>
         <nationalNumberPattern>
-          592(?:
-            4[0-2]|
-            93
+          (?:
+            592(?:
+              4[0-2]|
+              93
+            )|
+            80[89]\d\d
           )\d{4}
         </nationalNumberPattern>
       </voip>
@@ -19524,14 +19561,12 @@
                mobileNumberPortableRegion="true">
       <generalDesc>
         <nationalNumberPattern>
+          590\d{6}|
           (?:
-            590|
-            (?:
-              69|
-              80
-            )\d|
-            976
-          )\d{6}
+            69|
+            80|
+            9\d
+          )\d{7}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -19542,7 +19577,7 @@
             0[079]|
             [14]3|
             [27][79]|
-            30|
+            3[03-7]|
             5[0-268]|
             87
           )\d{4}
@@ -19563,6 +19598,16 @@
             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}
         </nationalNumberPattern>
@@ -19577,7 +19622,15 @@
       <voip>
         <possibleLengths national="9"/>
         <exampleNumber>976012345</exampleNumber>
-        <nationalNumberPattern>976[01]\d{5}</nationalNumberPattern>
+        <nationalNumberPattern>
+          9(?:
+            (?:
+              39[5-7]|
+              76[018]
+            )\d|
+            475[0-5]
+          )\d{4}
+        </nationalNumberPattern>
       </voip>
     </territory>
 
@@ -19667,7 +19720,7 @@
               54
             )5|
             329|
-            45[356]
+            45[35-8]
           )\d{4}
         </nationalNumberPattern>
       </mobile>
@@ -19773,6 +19826,7 @@
             [0-25-8]\d\d|
             3(?:
               [1-48]\d|
+              6[01]|
               7[01578]
             )|
             4(?:
@@ -19995,11 +20049,9 @@
                 [89][0-6]
               )\d|
               4(?:
-                2[2-469]|
-                39|
-                46|
-                6[25]|
-                7[0-3]|
+                2[29]|
+                62|
+                7[0-2]|
                 83
               )|
               6
@@ -20011,11 +20063,8 @@
               )|
               4(?:
                 0\d|
-                2[246]|
-                39|
-                46|
-                62|
-                7[0-3]|
+                [26]2|
+                7[0-2]|
                 83
               )|
               51\d\d
@@ -20023,7 +20072,7 @@
             4(?:
               2(?:
                 2\d\d|
-                48[0-3]
+                48[013]
               )|
               3(?:
                 20\d|
@@ -20045,35 +20094,31 @@
                 124|
                 [56]2\d
               )\d|
-              247[23]|
+              2472|
               3(?:
                 20\d|
                 470
               )|
               4(?:
                 2[04]\d|
-                47[23]
+                472
               )|
               7(?:
                 (?:
                   3\d|
                   8[01459]
                 )\d|
-                4(?:
-                  39|
-                  60|
-                  7[013]
-                )
+                4[67]0
               )
             )
           )\d{4}|
           5(?:
             2(?:
               2\d{5,6}|
-              47[023]\d{4}
+              47[02]\d{4}
             )|
             (?:
-              347[23]|
+              3472|
               4(?:
                 2(?:
                   1|
@@ -20088,7 +20133,7 @@
               )|
               7(?:
                 20\d|
-                48[0-2]
+                48[01]
               )|
               8(?:
                 20\d|
@@ -20096,7 +20141,7 @@
               )|
               9(?:
                 20\d|
-                47[01]
+                470
               )
             )\d{4}
           )|
@@ -20143,10 +20188,15 @@
               )|
               4[24-7]|
               5(?:
-                2\d|
-                4[1-9]|
-                51
-              )\d|
+                (?:
+                  2\d|
+                  51
+                )\d|
+                4(?:
+                  [1-35-9]\d|
+                  4[0-57-9]
+                )
+              )|
               6[23]
             )\d{4}
           )|
@@ -20227,16 +20277,13 @@
                 )|
                 (?:
                   6\d|
+                  8[89]|
                   9[4-8]
                 )\d|
                 7(?:
                   3|
                   40|
                   [5-9]\d
-                )|
-                8(?:
-                  78|
-                  [89]\d
                 )
               )\d|
               4(?:
@@ -20261,7 +20308,7 @@
         <exampleNumber>8008001234</exampleNumber>
         <nationalNumberPattern>
           80080(?:
-            [01][1-9]|
+            0[1-9]|
             2\d
           )\d{3}
         </nationalNumberPattern>
@@ -20342,17 +20389,23 @@
         <exampleNumber>53123456</exampleNumber>
         <nationalNumberPattern>
           [12]2[1-3]\d{5,6}|
-          7(?:
-            0[0-5]\d|
-            128
-          )\d{4}|
           (?:
-            [12](?:
-              1|
-              27
-            )|
-            5[368]
-          )\d{6}|
+            (?:
+              [12](?:
+                1|
+                27
+              )|
+              5[368]
+            )\d\d|
+            7(?:
+              0(?:
+                [0-5]\d|
+                7[078]|
+                80
+              )|
+              128
+            )
+          )\d{4}|
           [12](?:
             3[2-8]|
             4[2-68]|
@@ -20366,7 +20419,7 @@
         <nationalNumberPattern>
           (?:
             83[01]|
-            920
+            92[039]
           )\d{5}|
           (?:
             5[05]|
@@ -20639,10 +20692,10 @@
         <nationalNumberPattern>
           596(?:
             [03-7]\d|
-            10|
+            1[05]|
             2[7-9]|
-            8[09]|
-            9[4-9]
+            8[0-39]|
+            9[04-9]
           )\d{4}
         </nationalNumberPattern>
       </fixedLine>
@@ -20673,10 +20726,8 @@
         <exampleNumber>976612345</exampleNumber>
         <nationalNumberPattern>
           9(?:
-            (?:
-              39|
-              47
-            )7[01]|
+            397[0-3]|
+            477[0-5]|
             76(?:
               6\d|
               7[0-367]
@@ -20982,7 +21033,7 @@
             )|
             4(?:
               [013568]\d|
-              2[4-7]
+              2[4-8]
             )|
             54(?:
               [3-5]\d|
@@ -21016,8 +21067,8 @@
               9[0-8]
             )|
             7(?:
-              01|
-              30
+              0[0-3]|
+              3[013]
             )
           )\d{5}
         </nationalNumberPattern>
@@ -21243,8 +21294,10 @@
         <nationalNumberPattern>
           1(?:
             (?:
-              [27]2|
+              22|
               44|
+              7[27]|
+              87|
               99
             )[1-9]|
             65[0-689]
@@ -21256,8 +21309,8 @@
               [35][1-9]|
               4[0-35-9]|
               6[0-46-9]|
-              7[013-9]|
-              8[1-79]|
+              7[013-689]|
+              8[1-69]|
               9[1-8]
             )|
             [2-9]\d
@@ -21311,8 +21364,8 @@
               9[4-8]
             )|
             7(?:
-              [13467][1-9]|
-              2\d|
+              [1346][1-9]|
+              [27]\d|
               5[13-9]|
               8[1-69]|
               9[17]
@@ -21323,7 +21376,7 @@
               3[1-6]|
               4[124-6]|
               6[1246-9]|
-              7[1-378]|
+              7[0-378]|
               9[12479]
             )|
             9(?:
@@ -21447,8 +21500,8 @@
               9[4-8]
             )|
             7(?:
-              [13467][1-9]|
-              2\d|
+              [1346][1-9]|
+              [27]\d|
               5[13-9]|
               8[1-69]|
               9[17]
@@ -21459,7 +21512,7 @@
               3[1-6]|
               4[124-6]|
               6[1246-9]|
-              7[1-378]|
+              7[0-378]|
               9[12479]
             )|
             9(?:
@@ -21665,9 +21718,8 @@
                 [1-9]\d
               )|
               7(?:
-                [0134]\d|
-                2[1-9]|
-                5[0-6]
+                [0-4]\d|
+                5[0-7]
               )
             )|
             (?:
@@ -22005,7 +22057,7 @@
           <leadingDigits>
             [089]|
             2[013]|
-            7[04]
+            7[047]
           </leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
@@ -22046,7 +22098,7 @@
         <nationalNumberPattern>
           (?:
             23|
-            7[04]|
+            7[047]|
             [89]\d
           )\d{6}
         </nationalNumberPattern>
@@ -22136,7 +22188,11 @@
         <!-- Fixed line format for 2 digit area code -->
         <numberFormat pattern="(\d{2})(\d{3})(\d{2,3})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>
-            [3-7]|
+            [3-6]|
+            7(?:
+              0[0-689]|
+              [1-79]
+            )|
             8[2-9]
           </leadingDigits>
           <format>$1 $2 $3</format>
@@ -22145,6 +22201,14 @@
           <leadingDigits>[7-9]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{3})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>20[129]</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{4})(\d{2})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>2</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
         <!-- 11-12 digit toll-free and UAN numbers. -->
         <numberFormat pattern="(\d{3})(\d{4})(\d{4,5})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>[78]</leadingDigits>
@@ -22158,18 +22222,25 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          (?:
-            [124-7]|
-            9\d{3}
-          )\d{6}|
+          2[0-24-9]\d{8}|
+          [78]\d{10,13}|
+          [7-9]\d{9}|
           [1-9]\d{7}|
-          [78]\d{9,13}
+          [124-7]\d{6}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
-        <possibleLengths national="7,8" localOnly="5,6"/>
+        <possibleLengths national="7,8,10" localOnly="5,6"/>
         <exampleNumber>18040123</exampleNumber>
         <nationalNumberPattern>
+          20(?:
+            [1259]\d|
+            3[013-9]|
+            4[1-8]|
+            6[024-689]|
+            7[1-79]|
+            8[2-9]
+          )\d{6}|
           (?:
             (?:
               [1-356]\d|
@@ -22208,14 +22279,17 @@
             819[01]
           )\d{6}|
           (?:
-            70[13-689]|
+            7(?:
+              0[13-9]|
+              [12]\d
+            )|
             8(?:
               0[1-9]|
               1[0-8]
             )|
             9(?:
               0[1-9]|
-              1[1-356]
+              1[1-6]
             )
           )\d{7}
         </nationalNumberPattern>
@@ -22510,14 +22584,11 @@
                internationalPrefix="00" mobileNumberPortableRegion="true">
       <availableFormats>
         <numberFormat pattern="(\d{3})(\d{2})(\d{3})">
-          <leadingDigits>
-            [489]|
-            59
-          </leadingDigits>
+          <leadingDigits>8</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(\d{2})(\d{2})(\d{2})(\d{2})">
-          <leadingDigits>[235-7]</leadingDigits>
+          <leadingDigits>[2-79]</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
@@ -22551,7 +22622,6 @@
         <nationalNumberPattern>
           (?:
             4[015-8]|
-            59|
             9\d
           )\d{6}
         </nationalNumberPattern>
@@ -22680,6 +22750,7 @@
         <exampleNumber>9841234567</exampleNumber>
         <nationalNumberPattern>
           9(?:
+            00|
             6[0-3]|
             7[024-6]|
             8[0-24-68]
@@ -22753,7 +22824,7 @@
       <generalDesc>
         <nationalNumberPattern>
           (?:
-            [47]|
+            [4-7]|
             888\d
           )\d{3}
         </nationalNumberPattern>
@@ -22764,9 +22835,14 @@
         <nationalNumberPattern>[47]\d{3}</nationalNumberPattern>
       </fixedLine>
       <mobile>
-        <possibleLengths national="7"/>
+        <possibleLengths national="4,7"/>
         <exampleNumber>8884012</exampleNumber>
-        <nationalNumberPattern>888[4-9]\d{3}</nationalNumberPattern>
+        <nationalNumberPattern>
+          (?:
+            [56]|
+            888[1-9]
+          )\d{3}
+        </nationalNumberPattern>
       </mobile>
     </territory>
 
@@ -22780,21 +22856,23 @@
       <availableFormats>
         <!-- Enhanced voice services -->
         <numberFormat pattern="(\d{2})(\d{3,8})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>8[1-579]</leadingDigits>
+          <leadingDigits>8[1-79]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
         <!-- 7, 8-digit variable cost (premium rate/toll free). -->
         <numberFormat pattern="(\d{3})(\d{2})(\d{2,3})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>
             50[036-8]|
-            [89]0
+            8|
+            90
           </leadingDigits>
           <leadingDigits>
             50(?:
               [0367]|
               88
             )|
-            [89]0
+            8|
+            90
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -22815,8 +22893,7 @@
               10|
               74
             )|
-            [59]|
-            80
+            [589]
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -22840,25 +22917,23 @@
               [169]|
               7[0-35-9]
             )|
-            7|
-            86
+            7
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          [29]\d{7,9}|
+          [1289]\d{9}|
           50\d{5}(?:
             \d{2,3}
           )?|
-          6[0-35-9]\d{6}|
-          7\d{7,8}|
-          8\d{4,9}|
+          [27-9]\d{7,8}|
           (?:
-            11\d|
-            [34]
-          )\d{7}
+            [34]\d|
+            6[0-35-9]
+          )\d{6}|
+          8\d{4,6}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -22879,15 +22954,16 @@
         <possibleLengths national="[8-10]"/>
         <exampleNumber>211234567</exampleNumber>
         <nationalNumberPattern>
-          2[0-27-9]\d{7,8}|
-          21\d{6}
+          2(?:
+            [0-27-9]\d|
+            6
+          )\d{6,7}|
+          2(?:
+            1\d|
+            75
+          )\d{5}
         </nationalNumberPattern>
       </mobile>
-      <pager>
-        <possibleLengths national="8,9"/>
-        <exampleNumber>26123456</exampleNumber>
-        <nationalNumberPattern>[28]6\d{6,7}</nationalNumberPattern>
-      </pager>
       <!-- These are the toll free patterns used, by Telecom and Telstra/Clear, but they are
            referred to as 'Value-added service' in the phone plan for some reason. 85 numbers are
            not covered, as telecom companies don't seem to support them yet. -->
@@ -22907,7 +22983,7 @@
         <exampleNumber>900123456</exampleNumber>
         <nationalNumberPattern>
           (?:
-            11\d{5}|
+            1[13-57-9]\d{5}|
             50(?:
               0[08]|
               30|
@@ -22929,11 +23005,12 @@
         <exampleNumber>83012378</exampleNumber>
         <nationalNumberPattern>
           8(?:
-            1[6-9]|
+            1[16-9]|
             22|
             3\d|
             4[045]|
             5[459]|
+            6[235-9]|
             7[0-3579]|
             90
           )\d{2,7}
@@ -22971,23 +23048,20 @@
       <fixedLine>
         <possibleLengths national="8"/>
         <exampleNumber>23123456</exampleNumber>
-        <nationalNumberPattern>2[2-6]\d{6}</nationalNumberPattern>
+        <nationalNumberPattern>2[1-6]\d{6}</nationalNumberPattern>
       </fixedLine>
       <mobile>
         <possibleLengths national="8"/>
         <exampleNumber>92123456</exampleNumber>
         <nationalNumberPattern>
-          1505\d{4}|
           (?:
-            7(?:
-              [1289]\d|
-              7[0-5]
-            )|
-            9(?:
-              0[1-9]|
-              [1-9]\d
-            )
-          )\d{5}
+            1505|
+            90[1-9]\d
+          )\d{4}|
+          (?:
+            7[126-9]|
+            9[1-9]
+          )\d{6}
         </nationalNumberPattern>
       </mobile>
       <!-- Link to document about toll-free numbers on http://www.tra.gov.om, which suggests they
@@ -23063,7 +23137,7 @@
               3[0137]|
               4[17]|
               5[05]|
-              6[58]|
+              6[058]|
               7[0167]|
               8[2358]|
               9[1389]
@@ -23102,7 +23176,7 @@
               3[03]|
               4[04]|
               5[05-9]|
-              6[056]|
+              6[0156]|
               7[0-24-9]|
               8[5-9]|
               90
@@ -23403,7 +23477,7 @@
         <nationalNumberPattern>
           (?:
             7\d|
-            8[128]
+            8[1-38]
           )\d{6}
         </nationalNumberPattern>
       </mobile>
@@ -23819,8 +23893,8 @@
         <exampleNumber>3012345678</exampleNumber>
         <nationalNumberPattern>
           3(?:
-            [0-24]\d|
-            3[0-7]|
+            [0-247]\d|
+            3[0-79]|
             55|
             64
           )\d{7}
@@ -24041,12 +24115,9 @@
         <exampleNumber>512345678</exampleNumber>
         <nationalNumberPattern>
           21(?:
-            1(?:
-              [145]\d|
-              3[1-5]
-            )|
-            2[0-4]\d
-          )\d{4}|
+            1[013-5]|
+            2\d
+          )\d{5}|
           (?:
             45|
             5[0137]|
@@ -24097,6 +24168,10 @@
           <leadingDigits>[45]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{3})(\d{3})">
+          <leadingDigits>7</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
         <numberFormat pattern="(\d{3})(\d{2})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>8</leadingDigits>
           <format>$1 $2 $3 $4</format>
@@ -24104,10 +24179,11 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
+          [45]\d{5}|
           (?:
-            [45]|
-            80\d\d
-          )\d{5}
+            708|
+            80\d
+          )\d{6}
         </nationalNumberPattern>
       </generalDesc>
       <!-- Fixed-line and mobile numbers do not include any main prefix (like country code)
@@ -24120,20 +24196,21 @@
         <exampleNumber>430123</exampleNumber>
         <nationalNumberPattern>
           (?:
-            4[1-356]|
-            50
+            4[1-35-7]|
+            5[01]
           )\d{4}
         </nationalNumberPattern>
       </fixedLine>
       <!-- 44 XXXX might be a mobile range as it is assigned to Globaltel. Category is not
            mentioned in the ITU doc. -->
       <mobile>
-        <possibleLengths national="6"/>
+        <possibleLengths national="6,9"/>
         <exampleNumber>551234</exampleNumber>
         <nationalNumberPattern>
           (?:
             4[02-4]|
-            5[056]
+            5[056]|
+            708[45][0-5]
           )\d{4}
         </nationalNumberPattern>
       </mobile>
@@ -24357,7 +24434,7 @@
               9\d
             )|
             [35]92(?:
-              3[03]|
+              3[034]|
               9\d
             )
           )\d{3}|
@@ -24376,7 +24453,12 @@
       <pager>
         <possibleLengths national="9"/>
         <exampleNumber>622212345</exampleNumber>
-        <nationalNumberPattern>6222\d{5}</nationalNumberPattern>
+        <nationalNumberPattern>
+          6(?:
+            222\d|
+            8988
+          )\d{4}
+        </nationalNumberPattern>
       </pager>
       <tollFree>
         <possibleLengths national="9"/>
@@ -24428,9 +24510,13 @@
         <exampleNumber>707123456</exampleNumber>
         <nationalNumberPattern>
           70(?:
-            7\d|
-            8[17]
-          )\d{5}
+            38[01]|
+            596|
+            (?:
+              7\d|
+              8[17]
+            )\d
+          )\d{4}
         </nationalNumberPattern>
       </uan>
       <voicemail>
@@ -24438,7 +24524,7 @@
         <exampleNumber>600110000</exampleNumber>
         <nationalNumberPattern>
           600\d{6}|
-          6[06]9233\d{3}
+          6[06]923[34]\d{3}
         </nationalNumberPattern>
       </voicemail>
     </territory>
@@ -24581,7 +24667,7 @@
           <leadingDigits>
             9(?:
               [5-79]|
-              8[1-6]
+              8[1-7]
             )
           </leadingDigits>
           <format>$1 $2</format>
@@ -24663,7 +24749,8 @@
           9(?:
             51|
             6[129]|
-            [78][1-6]|
+            7[1-6]|
+            8[1-7]|
             9[1-5]
           )\d{6}
         </nationalNumberPattern>
@@ -24741,12 +24828,7 @@
       <pager>
         <possibleLengths national="7"/>
         <exampleNumber>2123456</exampleNumber>
-        <nationalNumberPattern>
-          2(?:
-            1\d|
-            61
-          )\d{4}
-        </nationalNumberPattern>
+        <nationalNumberPattern>2[16]\d{5}</nationalNumberPattern>
       </pager>
       <!-- Prefix 800 with 9 digit length is added based on user report. -->
       <tollFree>
@@ -24791,7 +24873,7 @@
             2\d\d|
             3(?:
               0\d|
-              1[0-3]
+              1[0-6]
             )
           )\d{4}
         </nationalNumberPattern>
@@ -24800,30 +24882,18 @@
         <possibleLengths national="9"/>
         <exampleNumber>692123456</exampleNumber>
         <nationalNumberPattern>
-          (?:
-            69(?:
-              2\d\d|
-              3(?:
-                0[0-46]|
-                1[013]|
-                2[0-2]|
-                3[0-39]|
-                4\d|
-                5[0-5]|
-                6[0-6]|
-                7[0-27]|
-                8[0-8]|
-                9[0-479]
-              )
-            )|
-            9(?:
-              399[0-2]|
-              4790|
-              76(?:
-                2[27]|
-                3[0-37]|
-                9\d
-              )
+          69(?:
+            2\d\d|
+            3(?:
+              [06][0-6]|
+              1[013]|
+              2[0-2]|
+              3[0-39]|
+              4\d|
+              5[0-5]|
+              7[0-37]|
+              8[0-8]|
+              9[0-479]
             )
           )\d{4}
         </nationalNumberPattern>
@@ -24851,6 +24921,20 @@
           )\d{6}
         </nationalNumberPattern>
       </sharedCost>
+      <voip>
+        <possibleLengths national="9"/>
+        <exampleNumber>939901234</exampleNumber>
+        <nationalNumberPattern>
+          9(?:
+            399[0-3]|
+            479[0-5]|
+            76(?:
+              2[27]|
+              3[0-37]
+            )
+          )\d{4}
+        </nationalNumberPattern>
+      </voip>
     </territory>
 
     <!-- Romania (RO) -->
@@ -24881,14 +24965,14 @@
              \d{2}\d{3}\d{4} grouping, since the yellow pages (http://en.paginiaurii.ro/) and the
              majority of numbers found online follow this convention. -->
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>[237-9]</leadingDigits>
+          <leadingDigits>[236-9]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
           (?:
-            [2378]\d|
+            [236-8]\d|
             90
           )\d{7}|
           [23]\d{5}
@@ -24923,12 +25007,18 @@
         <exampleNumber>712034567</exampleNumber>
         <nationalNumberPattern>
           7020\d{5}|
-          7(?:
-            0[013-9]|
-            1[0-3]|
-            [2-7]\d|
-            8[03-8]|
-            9[0-29]
+          (?:
+            6(?:
+              2\d|
+              40
+            )|
+            7(?:
+              0[013-9]|
+              1[0-3]|
+              [2-7]\d|
+              8[03-8]|
+              9[0-39]
+            )
           )\d{6}
         </nationalNumberPattern>
       </mobile>
@@ -25066,7 +25156,8 @@
          http://www.minjust.ru/ru/structure/contact/. Contains formatting instructions for
          Kazakhstan as well. -->
     <territory id="RU" mainCountryForCode="true" countryCode="7" leadingDigits="3[04-689]|[489]"
-               preferredInternationalPrefix="8~10" internationalPrefix="810" nationalPrefix="8">
+               preferredInternationalPrefix="8~10" internationalPrefix="810" nationalPrefix="8"
+               mobileNumberPortableRegion="true">
       <availableFormats>
         <numberFormat pattern="(\d{3})(\d{2})(\d{2})">
           <leadingDigits>[0-79]</leadingDigits>
@@ -25294,14 +25385,14 @@
           <leadingDigits>0</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
-        <numberFormat pattern="(\d{3})(\d{3})(\d{3})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>[7-9]</leadingDigits>
-          <format>$1 $2 $3</format>
-        </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})">
           <leadingDigits>2</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{3})(\d{3})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>[7-9]</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
@@ -25329,7 +25420,7 @@
       <mobile>
         <possibleLengths national="9"/>
         <exampleNumber>720123456</exampleNumber>
-        <nationalNumberPattern>7[2389]\d{7}</nationalNumberPattern>
+        <nationalNumberPattern>7[237-9]\d{7}</nationalNumberPattern>
       </mobile>
       <tollFree>
         <possibleLengths national="9"/>
@@ -25402,7 +25493,7 @@
           579[01]\d{5}|
           5(?:
             [013-689]\d|
-            7[0-35-8]
+            7[0-8]
           )\d{6}
         </nationalNumberPattern>
       </mobile>
@@ -25929,7 +26020,7 @@
           <leadingDigits>
             [369]|
             8(?:
-              0[1-6]|
+              0[1-9]|
               [1-9]
             )
           </leadingDigits>
@@ -25978,12 +26069,12 @@
         <exampleNumber>81234567</exampleNumber>
         <nationalNumberPattern>
           8(?:
-            06[0-6]|
-            95[0-2]
-          )\d{4}|
+            09|
+            95
+          )[0-2]\d{4}|
           (?:
             8(?:
-              0[1-5]|
+              0[1-8]|
               [1-8]\d|
               9[0-4]
             )|
@@ -26192,7 +26283,7 @@
           0\d{4}|
           (?:
             [489]\d|
-            [57]9
+            79
           )\d{6}
         </nationalNumberPattern>
       </generalDesc>
@@ -26208,7 +26299,6 @@
         <nationalNumberPattern>
           (?:
             4[015-8]|
-            59|
             9\d
           )\d{6}
         </nationalNumberPattern>
@@ -26651,8 +26741,9 @@
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})">
           <leadingDigits>
-            [3478]|
+            [348]|
             64|
+            79|
             90
           </leadingDigits>
           <format>$1 $2 $3</format>
@@ -26661,10 +26752,8 @@
           <leadingDigits>
             1|
             28|
-            6(?:
-              0[5-7]|
-              [1-35-9]
-            )|
+            6[0-35-9]|
+            77|
             9[2-9]
           </leadingDigits>
           <format>$1 $2</format>
@@ -26714,13 +26803,10 @@
               (?:
                 3[59]|
                 4[89]|
-                79|
+                6\d|
+                7[79]|
                 8[08]
               )\d|
-              6(?:
-                0[5-7]|
-                [1-9]\d
-              )|
               9(?:
                 0\d|
                 [2-9]
@@ -26886,7 +26972,10 @@
       <generalDesc>
         <nationalNumberPattern>
           [267]\d{7}|
-          [89]00\d{4}(?:
+          (?:
+            80\d|
+            900
+          )\d{4}(?:
             \d{4}
           )?
         </nationalNumberPattern>
@@ -26897,37 +26986,33 @@
         <exampleNumber>21234567</exampleNumber>
         <nationalNumberPattern>
           2(?:
-            [1-6]\d{3}|
-            [79]90[034]|
-            890[0245]
-          )\d{3}
+            79(?:
+              0[0347-9]|
+              [1-9]\d
+            )|
+            89(?:
+              0[024589]|
+              [1-9]\d
+            )
+          )\d{3}|
+          2(?:
+            [1-69]\d|
+            [78][0-8]
+          )\d{5}
         </nationalNumberPattern>
       </fixedLine>
       <mobile>
         <possibleLengths national="8"/>
         <exampleNumber>70123456</exampleNumber>
-        <nationalNumberPattern>
-          66(?:
-            [02-9]\d\d|
-            1(?:
-              [02-9]\d|
-              16
-            )
-          )\d{3}|
-          (?:
-            6[0-57-9]|
-            7\d
-          )\d{6}
-        </nationalNumberPattern>
+        <nationalNumberPattern>[67]\d{7}</nationalNumberPattern>
       </mobile>
       <!-- Toll free numbers are either 800 NNNN or 800 NNNN NNNN. -->
       <tollFree>
         <possibleLengths national="7,11"/>
         <exampleNumber>8001234</exampleNumber>
         <nationalNumberPattern>
-          800\d{4}(?:
-            \d{4}
-          )?
+          800\d{8}|
+          80[01]\d{4}
         </nationalNumberPattern>
       </tollFree>
       <!-- Premium rate numbers are either 900 NNNN or 900 NNNN NNNN. -->
@@ -27432,7 +27517,10 @@
         <possibleLengths national="9"/>
         <exampleNumber>812345678</exampleNumber>
         <nationalNumberPattern>
-          671[0-8]\d{5}|
+          67(?:
+            1[0-8]|
+            2[4-7]
+          )\d{5}|
           (?:
             14|
             6[1-6]|
@@ -27482,8 +27570,8 @@
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{2})(\d{4})">
           <leadingDigits>
-            [34]7|
-            91[78]
+            44[02-479]|
+            [34]7
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -27497,12 +27585,7 @@
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>
-          (?:
-            00|
-            [1-57-9]\d
-          )\d{7}
-        </nationalNumberPattern>
+        <nationalNumberPattern>[0-57-9]\d{8}</nationalNumberPattern>
       </generalDesc>
       <fixedLine>
         <possibleLengths national="9" localOnly="3,[5-7]"/>
@@ -27532,11 +27615,18 @@
         <possibleLengths national="9"/>
         <exampleNumber>917123456</exampleNumber>
         <nationalNumberPattern>
-          41[18]\d{6}|
           (?:
-            [034]0|
+            4(?:
+              1[18]|
+              4[02-479]
+            )|
+            81[1-9]
+          )\d{6}|
+          (?:
+            0[0-57-9]|
             1[017]|
             2[02]|
+            [34]0|
             5[05]|
             7[0178]|
             8[078]|
@@ -27750,7 +27840,7 @@
           (?:
             (?:
               [259]\d|
-              4[0-7]
+              4[0-8]
             )\d|
             3(?:
               1[1-35]|
@@ -27842,7 +27932,10 @@
         <exampleNumber>7715123</exampleNumber>
         <nationalNumberPattern>
           (?:
-            55[4-6]|
+            5(?:
+              4[0-5]|
+              5[4-6]
+            )|
             6(?:
               [09]\d|
               3[02]|
@@ -27904,13 +27997,13 @@
           <leadingDigits>
             5(?:
               [0-59]|
-              616
+              61[06]
             )
           </leadingDigits>
           <leadingDigits>
             5(?:
               [0-59]|
-              6161
+              61[06]1
             )
           </leadingDigits>
           <format>$1 $2 $3 $4</format>
@@ -27987,7 +28080,10 @@
         <possibleLengths national="10"/>
         <exampleNumber>5012345678</exampleNumber>
         <nationalNumberPattern>
-          56161\d{5}|
+          561(?:
+            011|
+            61\d
+          )\d{4}|
           5(?:
             0[15-7]|
             1[06]|
@@ -28768,7 +28864,7 @@
             20(?:
               [017]\d|
               2[5-9]|
-              32|
+              3[1-4]|
               5[0-4]|
               6[15-9]
             )|
@@ -28781,12 +28877,15 @@
         <possibleLengths national="9"/>
         <exampleNumber>712345678</exampleNumber>
         <nationalNumberPattern>
-          726[01]\d{5}|
+          72(?:
+            [48]0|
+            6[01]
+          )\d{5}|
           7(?:
-            [01578]\d|
+            [015-8]\d|
             20|
             36|
-            [46][0-4]|
+            4[0-4]|
             9[89]
           )\d{6}
         </nationalNumberPattern>
@@ -28852,23 +28951,23 @@
         <exampleNumber>2015550123</exampleNumber>
         <nationalNumberPattern>
           (?:
-            47220[01]|
-            5(?:
-              05(?:
-                [2-57-9]\d\d|
-                6(?:
-                  [0-35-9]\d|
-                  4[46]
-                )
-              )|
-              57200
-            )
+            5056(?:
+              [0-35-9]\d|
+              4[468]
+            )|
+            7302[0-3]\d
           )\d{4}|
+          (?:
+            472[24]|
+            505[2-57-9]|
+            7306|
+            983[237-9]
+          )\d{6}|
           (?:
             2(?:
               0[1-35-9]|
               1[02-9]|
-              2[03-589]|
+              2[03-57-9]|
               3[149]|
               4[08]|
               5[1-46]|
@@ -28879,11 +28978,11 @@
             3(?:
               0[1-57-9]|
               1[02-9]|
-              2[01356]|
+              2[013569]|
               3[0-24679]|
               4[167]|
               5[0-2]|
-              6[014]|
+              6[01349]|
               8[056]
             )|
             4(?:
@@ -28903,7 +29002,7 @@
               20|
               3[0149]|
               4[01]|
-              5[19]|
+              5[179]|
               6[1-47]|
               7[0-5]|
               8[0256]
@@ -28912,7 +29011,8 @@
               0[1-35-9]|
               1[024-9]|
               2[03689]|
-              [34][016]|
+              3[016]|
+              4[0156]|
               5[01679]|
               6[0-279]|
               78|
@@ -28921,7 +29021,7 @@
             7(?:
               0[1-46-8]|
               1[2-9]|
-              2[04-7]|
+              2[04-8]|
               3[1247]|
               4[037]|
               5[47]|
@@ -28957,23 +29057,23 @@
         <exampleNumber>2015550123</exampleNumber>
         <nationalNumberPattern>
           (?:
-            47220[01]|
-            5(?:
-              05(?:
-                [2-57-9]\d\d|
-                6(?:
-                  [0-35-9]\d|
-                  4[46]
-                )
-              )|
-              57200
-            )
+            5056(?:
+              [0-35-9]\d|
+              4[468]
+            )|
+            7302[0-3]\d
           )\d{4}|
+          (?:
+            472[24]|
+            505[2-57-9]|
+            7306|
+            983[237-9]
+          )\d{6}|
           (?:
             2(?:
               0[1-35-9]|
               1[02-9]|
-              2[03-589]|
+              2[03-57-9]|
               3[149]|
               4[08]|
               5[1-46]|
@@ -28984,11 +29084,11 @@
             3(?:
               0[1-57-9]|
               1[02-9]|
-              2[01356]|
+              2[013569]|
               3[0-24679]|
               4[167]|
               5[0-2]|
-              6[014]|
+              6[01349]|
               8[056]
             )|
             4(?:
@@ -29008,7 +29108,7 @@
               20|
               3[0149]|
               4[01]|
-              5[19]|
+              5[179]|
               6[1-47]|
               7[0-5]|
               8[0256]
@@ -29017,7 +29117,8 @@
               0[1-35-9]|
               1[024-9]|
               2[03689]|
-              [34][016]|
+              3[016]|
+              4[0156]|
               5[01679]|
               6[0-279]|
               78|
@@ -29026,7 +29127,7 @@
             7(?:
               0[1-46-8]|
               1[2-9]|
-              2[04-7]|
+              2[04-8]|
               3[1247]|
               4[037]|
               5[47]|
@@ -29131,11 +29232,15 @@
     <territory id="UY" countryCode="598" preferredInternationalPrefix="00"
                internationalPrefix="0(?:0|1[3-9]\d)" nationalPrefix="0" preferredExtnPrefix=" int. ">
       <availableFormats>
+        <!-- 6 - 7 digit toll free numbers -->
+        <numberFormat pattern="(\d{3})(\d{3,4})">
+          <leadingDigits>0</leadingDigits>
+          <format>$1 $2</format>
+        </numberFormat>
         <numberFormat pattern="(\d{3})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>
-            405|
-            8|
-            90
+            [49]0|
+            8
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
@@ -29149,23 +29254,20 @@
           <leadingDigits>[124]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
-        <!-- 10 digit toll free numbers -->
-        <numberFormat pattern="(\d{3})(\d{3})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>4</leadingDigits>
+        <!-- 8 - 10 digit toll free numbers -->
+        <numberFormat pattern="(\d{3})(\d{3})(\d{2,4})">
+          <leadingDigits>0</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
-        <!-- 13 digit toll free numbers -->
-        <numberFormat pattern="(\d{3})(\d{3})(\d{3})(\d{4})">
+        <!-- 11 - 13 digit toll free numbers -->
+        <numberFormat pattern="(\d{3})(\d{3})(\d{3})(\d{2,4})">
           <leadingDigits>0</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          (?:
-            0004|
-            4
-          )\d{9}|
+          0004\d{2,9}|
           [1249]\d{7}|
           (?:
             [49]\d|
@@ -29181,7 +29283,10 @@
           (?:
             1(?:
               770|
-              987
+              9(?:
+                20|
+                87
+              )
             )|
             (?:
               2\d|
@@ -29196,17 +29301,14 @@
         <nationalNumberPattern>9[1-9]\d{6}</nationalNumberPattern>
       </mobile>
       <tollFree>
-        <possibleLengths national="7,10,13"/>
+        <possibleLengths national="[6-13]"/>
         <exampleNumber>8001234</exampleNumber>
         <nationalNumberPattern>
+          0004\d{2,9}|
           (?:
-            (?:
-              0004|
-              4
-            )\d{5}|
+            405|
             80[05]
-          )\d{4}|
-          405\d{4}
+          )\d{4}
         </nationalNumberPattern>
       </tollFree>
       <premiumRate>
@@ -29224,13 +29326,14 @@
                internationalPrefix="810" nationalPrefix="8">
       <availableFormats>
         <numberFormat pattern="(\d{2})(\d{3})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP $FG">
-          <leadingDigits>[35-9]</leadingDigits>
+          <leadingDigits>[235-9]</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
           (?:
+            20|
             33|
             [5-79]\d|
             88
@@ -29283,7 +29386,7 @@
               )|
               (?:
                 1[12]|
-                8\d
+                [68]\d
               )\d|
               2(?:
                 22|
@@ -29308,11 +29411,6 @@
                 5[1-9]|
                 6[1457]
               )|
-              6(?:
-                22|
-                3[12457]|
-                4[13-8]
-              )|
               9(?:
                 22|
                 5[1-9]
@@ -29330,8 +29428,8 @@
         <nationalNumberPattern>
           (?:
             (?:
+              [25]0|
               33|
-              50|
               88|
               9[0-57-9]
             )\d{3}|
@@ -29544,27 +29642,6 @@
                   9[079]
                 )
               )|
-              6(?:
-                2(?:
-                  2[1245]|
-                  4[2-4]
-                )|
-                39\d|
-                41[179]|
-                5(?:
-                  [349]\d|
-                  5[0-2]
-                )|
-                7(?:
-                  0[017]|
-                  [13]\d|
-                  22|
-                  44|
-                  55|
-                  67|
-                  88
-                )
-              )|
               9(?:
                 22[128]|
                 3(?:
@@ -30234,12 +30311,12 @@
         <!-- Format for old mobile ranges and VOIP. -->
         <numberFormat pattern="(\d{2})(\d{3})(\d{2})(\d{2})" nationalPrefixFormattingRule="$NP$FG"
                       nationalPrefixOptionalWhenFormatting="true">
-          <leadingDigits>[69]</leadingDigits>
+          <leadingDigits>6</leadingDigits>
           <format>$1 $2 $3 $4</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})" nationalPrefixFormattingRule="$NP$FG"
                       nationalPrefixOptionalWhenFormatting="true">
-          <leadingDigits>[3578]</leadingDigits>
+          <leadingDigits>[357-9]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <!-- 2-digit area codes (big cities) -->
@@ -30308,7 +30385,7 @@
           )\d{6}|
           (?:
             3\d|
-            5[689]|
+            5[1689]|
             7[06-9]|
             8[1-8]|
             9[0-8]
@@ -30669,20 +30746,17 @@
     <!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_France -->
     <!-- http://www.comores-online.com/mwezinet/internet/262 -->
     <!-- http://www.arcep.fr/index.php?id=2137&bloc=0596&CMD=RESULTS_NUMEROTATION -->
-    <territory id="YT" countryCode="262" leadingDigits="269|63|9398" internationalPrefix="00"
-               nationalPrefix="0">
+    <territory id="YT" countryCode="262" internationalPrefix="00" nationalPrefix="0">
       <generalDesc>
         <nationalNumberPattern>
           (?:
-            (?:
-              (?:
-                26|
-                63
-              )9|
-              80\d
-            )\d\d|
-            93980
-          )\d{4}
+            80|
+            9\d
+          )\d{7}|
+          (?:
+            26|
+            63
+          )9\d{6}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -30691,7 +30765,8 @@
         <nationalNumberPattern>
           269(?:
             0[0-467]|
-            5[0-3]|
+            15|
+            5[0-4]|
             6\d|
             [78]0
           )\d{4}
@@ -30701,17 +30776,14 @@
         <possibleLengths national="9"/>
         <exampleNumber>639012345</exampleNumber>
         <nationalNumberPattern>
-          (?:
-            639(?:
-              0[0-79]|
-              1[019]|
-              [267]\d|
-              3[09]|
-              40|
-              5[05-9]|
-              9[04-79]
-            )|
-            93980
+          639(?:
+            0[0-79]|
+            1[019]|
+            [267]\d|
+            3[09]|
+            40|
+            5[05-9]|
+            9[04-79]
           )\d{4}
         </nationalNumberPattern>
       </mobile>
@@ -30721,6 +30793,19 @@
         <exampleNumber>801234567</exampleNumber>
         <nationalNumberPattern>80\d{7}</nationalNumberPattern>
       </tollFree>
+      <voip>
+        <possibleLengths national="9"/>
+        <exampleNumber>939801234</exampleNumber>
+        <nationalNumberPattern>
+          9(?:
+            (?:
+              39|
+              47
+            )8[01]|
+            769\d
+          )\d{4}
+        </nationalNumberPattern>
+      </voip>
     </territory>
 
     <!-- South Africa (ZA) -->
@@ -31441,17 +31526,27 @@
       <availableFormats>
         <!-- Formatting chosen based on ITU document and Iridium website FAQ. -->
         <numberFormat pattern="(\d)(\d{3})(\d{5})">
-          <leadingDigits>[0-36-9]</leadingDigits>
+          <leadingDigits>[0-37-9]</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
+        <numberFormat pattern="(\d)(\d{3})(\d{5,6})">
+          <leadingDigits>6</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
       </availableFormats>
       <generalDesc>
-        <nationalNumberPattern>[0-36-9]\d{8}</nationalNumberPattern>
+        <nationalNumberPattern>
+          6\d{9}|
+          [0-36-9]\d{8}
+        </nationalNumberPattern>
       </generalDesc>
       <mobile>
-        <possibleLengths national="9"/>
+        <possibleLengths national="9,10"/>
         <exampleNumber>612345678</exampleNumber>
-        <nationalNumberPattern>[0-36-9]\d{8}</nationalNumberPattern>
+        <nationalNumberPattern>
+          6\d{9}|
+          [0-36-9]\d{8}
+        </nationalNumberPattern>
       </mobile>
     </territory>
 
@@ -31672,7 +31767,7 @@
             [24-9]0\d{4,7}
           )|
           (?:
-            1[013-79]|
+            1[0-79]|
             2[24-689]|
             3[02-689]|
             4[0-4]