intl-tel-input 18.2.1 → 18.3.0

package/third_party/libphonenumber/resources/PhoneNumberMetadata.xml

@@ -758,7 +758,7 @@
             4[02-9]|
             5[0-46-9]|
             [6-8]\d|
-            9[01]
+            9[0-2]
           )\d{4}
         </nationalNumberPattern>
       </voip>
@@ -1556,7 +1556,7 @@
             3(?:
               364|
               4(?:
-                1[2-7]|
+                1[2-8]|
                 [235][4-6]|
                 84
               )|
@@ -1829,7 +1829,7 @@
               3(?:
                 364|
                 4(?:
-                  1[2-7]|
+                  1[2-8]|
                   [235][4-6]|
                   84
                 )|
@@ -2535,7 +2535,7 @@
             [0-3]\d|
             4[047-9]|
             5[0-25-9]|
-            6[016-9]|
+            6[0-26-9]|
             7[02-8]|
             8[0-24-9]|
             9[0-37-9]
@@ -3567,6 +3567,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>
@@ -3575,6 +3576,7 @@
             0[469]|
             1[0-47]|
             3[389]|
+            43|
             6[69]|
             7[78]
           )\d{6}
@@ -3890,7 +3892,7 @@
         <numberFormat pattern="(\d{4})(\d{4})">
           <leadingDigits>
             [13679]|
-            8[047]
+            8[02-4679]
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
@@ -3921,17 +3923,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>
@@ -3945,8 +3948,8 @@
         <nationalNumberPattern>
           (?:
             3(?:
-              [1-79]\d|
-              8[0-47-9]
+              [0-79]\d|
+              8[0-57-9]
             )\d|
             6(?:
               3(?:
@@ -3954,6 +3957,7 @@
                 33|
                 6[16]
               )|
+              441|
               6(?:
                 3[03-9]|
                 [69]\d|
@@ -3966,7 +3970,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. -->
@@ -3976,7 +3980,7 @@
         <nationalNumberPattern>
           (?:
             87|
-            9[014578]
+            9[0-8]
           )\d{6}
         </nationalNumberPattern>
       </premiumRate>
@@ -4070,7 +4074,7 @@
         <exampleNumber>90011234</exampleNumber>
         <nationalNumberPattern>
           (?:
-            4[0-356]|
+            4[0-6]|
             [56]\d|
             9[013-9]
           )\d{6}
@@ -4117,6 +4121,7 @@
         <nationalNumberPattern>
           590(?:
             2[7-9]|
+            3[3-7]|
             5[12]|
             87
           )\d{4}
@@ -4157,7 +4162,7 @@
               395|
               76[018]
             )\d|
-            475[0-2]
+            475[0-5]
           )\d{4}
         </nationalNumberPattern>
       </voip>
@@ -4919,7 +4924,7 @@
         <numberFormat pattern="(\d{3})(\d{4})">
           <leadingDigits>
             [24-6]|
-            3[15-79]
+            3[15-9]
           </leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
@@ -4966,7 +4971,8 @@
               1[0-35-9]|
               55|
               [69]\d|
-              7[013]
+              7[013]|
+              81
             )|
             4(?:
               6[03]|
@@ -4996,10 +5002,7 @@
         <nationalNumberPattern>
           (?:
             321|
-            7(?:
-              [1-7]\d|
-              8[0-4]
-            )
+            7[1-8]\d
           )\d{5}
         </nationalNumberPattern>
       </mobile>
@@ -5026,7 +5029,7 @@
           79(?:
             1(?:
               [01]\d|
-              2[0-7]
+              2[0-8]
             )|
             2[0-7]\d
           )\d{3}
@@ -5593,7 +5596,7 @@
             [0-3]\d|
             4[047-9]|
             5[0-25-9]|
-            6[016-9]|
+            6[0-26-9]|
             7[02-8]|
             8[0-24-9]|
             9[0-37-9]
@@ -7326,7 +7329,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)"
@@ -7371,7 +7374,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. -->
@@ -7379,13 +7385,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]|
@@ -7524,7 +7529,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">
@@ -7536,6 +7541,7 @@
         <nationalNumberPattern>
           [27]\d{6,7}|
           [34]\d{5,7}|
+          63\d{6}|
           (?:
             5|
             8\d\d
@@ -7550,7 +7556,7 @@
         <nationalNumberPattern>
           (?:
             3[23]|
-            48
+            4[89]
           )\d{4,6}|
           (?:
             31|
@@ -7570,7 +7576,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"/>
@@ -7819,7 +7830,7 @@
             [0-3]\d|
             4[047-9]|
             5[0-25-9]|
-            6[016-9]|
+            6[0-26-9]|
             7[02-8]|
             8[0-24-9]|
             9[0-37-9]
@@ -9146,7 +9157,10 @@
             8(?:
               1(?:
                 0(?:
-                  000|
+                  0(?:
+                    00|
+                    [178]\d
+                  )|
                   [3-9]\d\d
                 )|
                 (?:
@@ -9174,7 +9188,7 @@
                     3[5-9]
                   )\d|
                   7(?:
-                    [0-3679]\d|
+                    [0-79]\d|
                     8[13-9]
                   )|
                   8(?:
@@ -9253,9 +9267,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>
@@ -9330,9 +9348,9 @@
               8[0-247-9]
             )|
             7(?:
-              [017]\d|
+              [0167]\d|
               2[0-2]|
-              6[0-8]|
+              5[01]|
               8[0-3]
             )
           )\d{6}
@@ -9341,7 +9359,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"/>
@@ -9353,9 +9371,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>
@@ -10111,9 +10132,11 @@
         <possibleLengths national="9"/>
         <exampleNumber>123456789</exampleNumber>
         <nationalNumberPattern>
+          59[1-9]\d{6}|
           (?:
-            [1-35]\d|
-            4[1-9]
+            [1-3]\d|
+            4[1-9]|
+            5[0-8]
           )\d{7}
         </nationalNumberPattern>
       </fixedLine>
@@ -10415,7 +10438,7 @@
                 4(?:
                   [0-5]\d\d|
                   69[7-9]|
-                  70[0-579]
+                  70[0-79]
                 )|
                 (?:
                   (?:
@@ -11004,6 +11027,9 @@
             5(?:
               00(?:
                 0\d|
+                11|
+                22|
+                33|
                 44|
                 5[05]|
                 77|
@@ -11035,7 +11061,7 @@
               )|
               8(?:
                 0(?:
-                  [01]\d|
+                  [018]\d|
                   2[0-4]
                 )|
                 58[89]|
@@ -11133,10 +11159,10 @@
         <exampleNumber>594101234</exampleNumber>
         <nationalNumberPattern>
           594(?:
-            [0239]\d|
-            [16][0-3]|
-            4[03-9]|
+            [02-49]\d|
+            1[0-4]|
             5[6-9]|
+            6[0-3]|
             80
           )\d{4}
         </nationalNumberPattern>
@@ -11169,7 +11195,7 @@
               396|
               76\d
             )\d|
-            476[0-2]
+            476[0-5]
           )\d{4}
         </nationalNumberPattern>
       </voip>
@@ -11474,9 +11500,8 @@
           (?:
             19|
             3[1-7]|
-            6[14689]|
+            [68][1-9]|
             70|
-            8[14-79]|
             9\d
           )\d{4}
         </nationalNumberPattern>
@@ -11648,7 +11673,7 @@
             0[1-68]|
             [14][0-24-9]|
             2[0-68]|
-            3[1289]|
+            3[1-9]|
             5[3-579]|
             [68][0-689]|
             7[08]|
@@ -11690,7 +11715,7 @@
               395|
               76[018]
             )\d|
-            475[0-2]
+            475[0-5]
           )\d{4}
         </nationalNumberPattern>
       </voip>
@@ -11921,7 +11946,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})">
@@ -11931,6 +11956,7 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
+          80\d{6}|
           (?:
             1\d{3}|
             [2-7]
@@ -11945,7 +11971,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"/>
@@ -11963,7 +11994,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>
@@ -11981,6 +12012,7 @@
         <exampleNumber>6713001234</exampleNumber>
         <nationalNumberPattern>
           671(?:
+            2\d\d|
             3(?:
               00|
               3[39]|
@@ -12032,6 +12064,7 @@
         <exampleNumber>6713001234</exampleNumber>
         <nationalNumberPattern>
           671(?:
+            2\d\d|
             3(?:
               00|
               3[39]|
@@ -12189,17 +12222,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>
@@ -12213,7 +12245,7 @@
               3[1-4]|
               5[3-9]|
               6\d|
-              7[0-24-79]
+              7[0-79]
             )|
             3(?:
               2[25-9]|
@@ -12223,6 +12255,7 @@
               4[0-24]|
               5[56]
             )|
+            50[0-6]|
             77[1-57]
           )\d{4}
         </nationalNumberPattern>
@@ -12235,8 +12268,14 @@
         <exampleNumber>6091234</exampleNumber>
         <nationalNumberPattern>
           (?:
+            510|
             6\d\d|
-            70[0-35-7]
+            7(?:
+              0\d|
+              1[0-8]|
+              25|
+              49
+            )
           )\d{4}
         </nationalNumberPattern>
       </mobile>
@@ -12246,7 +12285,12 @@
         <nationalNumberPattern>
           (?:
             289|
-            862
+            8(?:
+              00|
+              6[28]|
+              88|
+              99
+            )
           )\d{4}
         </nationalNumberPattern>
       </tollFree>
@@ -12255,6 +12299,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) -->
@@ -12313,13 +12362,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}
@@ -12336,32 +12385,34 @@
             4(?:
               44[5-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-6]|
               8[0-4]
             )|
-            848[015-9]|
+            848[0-25-9]|
             9(?:
               29[013-9]|
-              59[0-4]
+              59[0-4]|
+              899
             )
           )\d{4}|
           (?:
             4(?:
-              4[01]|
-              6[2358]
+              4[015]|
+              6[02357-9]
             )|
             5(?:
               [1-59][0-46-9]|
@@ -12661,7 +12712,7 @@
                 [01]\d|
                 44|
                 77|
-                9[67]
+                9[5-7]
               )
             )
           )\d{4}|
@@ -12671,7 +12722,7 @@
       <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]"/>
@@ -13367,17 +13418,17 @@
           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]|
@@ -15576,7 +15627,7 @@
                 40|
                 5[06]|
                 6[2-589]|
-                7[025-9]|
+                7[0-25-9]|
                 8[04]|
                 9[4-9]
               )|
@@ -15883,8 +15934,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})">
@@ -15924,8 +15982,7 @@
             8(?:
               3[89]|
               47|
-              51|
-              63
+              51
             )|
             9(?:
               80|
@@ -15963,8 +16020,7 @@
                 96
               )|
               477|
-              51[2-9]|
-              636
+              51[2-9]
             )|
             9(?:
               802|
@@ -16009,8 +16065,7 @@
                 96[2457-9]
               )|
               477|
-              51[2-9]|
-              636[457-9]
+              51[2-9]
             )|
             9(?:
               802|
@@ -16082,7 +16137,7 @@
             )|
             5(?:
               2|
-              3[045]|
+              3[0459]|
               4[0-369]|
               5[29]|
               8[02389]|
@@ -16098,7 +16153,7 @@
             )|
             8(?:
               2[124589]|
-              3[27-9]|
+              3[26-9]|
               49|
               51|
               6|
@@ -16163,12 +16218,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]
             )|
@@ -16191,13 +16251,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]|
@@ -16216,11 +16280,6 @@
                 4[0178]
               )
             )|
-            (?:
-              49|
-              55|
-              83
-            )[29]|
             (?:
               264|
               837
@@ -16297,7 +16356,14 @@
             )|
             5(?:
               2|
-              3[045]|
+              3(?:
+                [045]|
+                9(?:
+                  [0-58]|
+                  6[4-9]|
+                  7[0-35689]
+                )
+              )|
               4[0-369]|
               5[29]|
               8[02389]|
@@ -16324,6 +16390,7 @@
               )|
               3(?:
                 [29]|
+                60|
                 7(?:
                   [017-9]|
                   6[6-8]
@@ -16333,7 +16400,7 @@
               51|
               6(?:
                 [0-24]|
-                36[23]|
+                36[2-57-9]|
                 5(?:
                   [0-389]|
                   5[23]
@@ -16342,7 +16409,10 @@
                   [01]|
                   9[178]
                 )|
-                72|
+                7(?:
+                  2[2-468]|
+                  3[78]
+                )|
                 9[0145]
               )|
               7[0-468]|
@@ -16393,257 +16463,102 @@
               )
             )[019]
           </leadingDigits>
+          <format>$1-$2-$3</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{2})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>
+            [14]|
+            [289][2-9]|
+            5[3-9]|
+            7[2-4679]
+          </leadingDigits>
+          <format>$1-$2-$3</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{4})(\d{2})(\d{3,4})">
+          <leadingDigits>007</leadingDigits>
+          <leadingDigits>0077</leadingDigits>
+          <format>$1-$2-$3</format>
+          <intlFormat>NA</intlFormat>
+        </numberFormat>
+        <numberFormat pattern="(\d{4})(\d{2})(\d{4})">
+          <leadingDigits>008</leadingDigits>
+          <format>$1-$2-$3</format>
+          <intlFormat>NA</intlFormat>
+        </numberFormat>
+        <numberFormat pattern="(\d{3})(\d{3})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>800</leadingDigits>
+          <format>$1-$2-$3</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{4})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>[257-9]</leadingDigits>
+          <format>$1-$2-$3</format>
+        </numberFormat>
+        <numberFormat pattern="(\d{4})(\d{3})(\d{3,4})">
+          <leadingDigits>0</leadingDigits>
+          <format>$1-$2-$3</format>
+          <intlFormat>NA</intlFormat>
+        </numberFormat>
+        <numberFormat pattern="(\d{4})(\d{4})(\d{4,5})">
+          <leadingDigits>0</leadingDigits>
+          <format>$1-$2-$3</format>
+          <intlFormat>NA</intlFormat>
+        </numberFormat>
+        <numberFormat pattern="(\d{4})(\d{5})(\d{5,6})">
+          <leadingDigits>0</leadingDigits>
+          <format>$1-$2-$3</format>
+          <intlFormat>NA</intlFormat>
+        </numberFormat>
+        <numberFormat pattern="(\d{4})(\d{6})(\d{6,7})">
+          <leadingDigits>0</leadingDigits>
+          <format>$1-$2-$3</format>
+          <intlFormat>NA</intlFormat>
+        </numberFormat>
+      </availableFormats>
+      <generalDesc>
+        <nationalNumberPattern>
+          00[1-9]\d{6,14}|
+          [257-9]\d{9}|
+          (?:
+            00|
+            [1-9]\d\d
+          )\d{6}
+        </nationalNumberPattern>
+      </generalDesc>
+      <!-- Toll-free numbers with a leading "00" cannot be dialled internationally. -->
+      <noInternationalDialling>
+        <possibleLengths national="[8-17]"/>
+        <nationalNumberPattern>
+          00(?:
+            777(?:
+              [01]|
+              (?:
+                5|
+                8\d
+              )\d
+            )|
+            882[1245]\d\d
+          )\d\d|
+          00(?:
+            37|
+            66|
+            78
+          )\d{6,13}
+        </nationalNumberPattern>
+      </noInternationalDialling>
+      <fixedLine>
+        <possibleLengths national="9"/>
+        <exampleNumber>312345678</exampleNumber>
+        <nationalNumberPattern>
+          (?:
             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]
-              )
-            )|
-            (?:
-              223|
-              8699
-            )[014-9]|
-            (?:
-              25[0468]|
-              422|
-              838
-            )[01]|
-            (?:
-              48|
-              829(?:
-                2|
-                66
-              )|
-              9[23]
-            )[1-9]|
-            (?:
-              47[59]|
-              59[89]|
-              8(?:
-                68|
-                9
-              )
-            )[019]
-          </leadingDigits>
-          <format>$1-$2-$3</format>
-        </numberFormat>
-        <numberFormat pattern="(\d{3})(\d{2})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>
-            [14]|
-            [289][2-9]|
-            5[3-9]|
-            7[2-4679]
-          </leadingDigits>
-          <format>$1-$2-$3</format>
-        </numberFormat>
-        <numberFormat pattern="(\d{4})(\d{2})(\d{3,4})">
-          <leadingDigits>007</leadingDigits>
-          <leadingDigits>0077</leadingDigits>
-          <format>$1-$2-$3</format>
-          <intlFormat>NA</intlFormat>
-        </numberFormat>
-        <numberFormat pattern="(\d{4})(\d{2})(\d{4})">
-          <leadingDigits>008</leadingDigits>
-          <format>$1-$2-$3</format>
-          <intlFormat>NA</intlFormat>
-        </numberFormat>
-        <numberFormat pattern="(\d{3})(\d{3})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>800</leadingDigits>
-          <format>$1-$2-$3</format>
-        </numberFormat>
-        <numberFormat pattern="(\d{2})(\d{4})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>[257-9]</leadingDigits>
-          <format>$1-$2-$3</format>
-        </numberFormat>
-        <numberFormat pattern="(\d{4})(\d{3})(\d{3,4})">
-          <leadingDigits>0</leadingDigits>
-          <format>$1-$2-$3</format>
-          <intlFormat>NA</intlFormat>
-        </numberFormat>
-        <numberFormat pattern="(\d{4})(\d{4})(\d{4,5})">
-          <leadingDigits>0</leadingDigits>
-          <format>$1-$2-$3</format>
-          <intlFormat>NA</intlFormat>
-        </numberFormat>
-        <numberFormat pattern="(\d{4})(\d{5})(\d{5,6})">
-          <leadingDigits>0</leadingDigits>
-          <format>$1-$2-$3</format>
-          <intlFormat>NA</intlFormat>
-        </numberFormat>
-        <numberFormat pattern="(\d{4})(\d{6})(\d{6,7})">
-          <leadingDigits>0</leadingDigits>
-          <format>$1-$2-$3</format>
-          <intlFormat>NA</intlFormat>
-        </numberFormat>
-      </availableFormats>
-      <generalDesc>
-        <nationalNumberPattern>
-          00[1-9]\d{6,14}|
-          [257-9]\d{9}|
-          (?:
-            00|
-            [1-9]\d\d
-          )\d{6}
-        </nationalNumberPattern>
-      </generalDesc>
-      <!-- Toll-free numbers with a leading "00" cannot be dialled internationally. -->
-      <noInternationalDialling>
-        <possibleLengths national="[8-17]"/>
-        <nationalNumberPattern>
-          00(?:
-            777(?:
-              [01]|
-              (?:
-                5|
-                8\d
-              )\d
-            )|
-            882[1245]\d\d
-          )\d\d|
-          00(?:
-            37|
-            66|
-            78
-          )\d{6,13}
-        </nationalNumberPattern>
-      </noInternationalDialling>
-      <fixedLine>
-        <possibleLengths national="9"/>
-        <exampleNumber>312345678</exampleNumber>
-        <nationalNumberPattern>
-          (?:
-            1(?:
-              1[235-8]|
-              2[3-6]|
-              3[3-9]|
-              4[2-6]|
-              [58][2-8]|
-              6[2-7]|
-              7[2-9]|
-              9[1-9]
+              1[235-8]|
+              2[3-6]|
+              3[3-9]|
+              4[2-6]|
+              [58][2-8]|
+              6[2-7]|
+              7[2-9]|
+              9[1-9]
             )|
             (?:
               2[2-9]|
@@ -16868,10 +16783,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. -->
@@ -16956,7 +16868,10 @@
               55
             )|
             88[08]|
-            99[05-9]
+            9(?:
+              12|
+              9[05-9]
+            )
           )\d{6}
         </nationalNumberPattern>
       </mobile>
@@ -17583,7 +17498,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}
@@ -17955,7 +17870,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>
           (?:
@@ -18492,7 +18407,7 @@
             6(?:
               (?:
                 4[5-9]|
-                5[0-4]
+                5[0-469]
               )\d|
               6(?:
                 [0245]\d|
@@ -19167,32 +19082,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>
@@ -19205,7 +19094,10 @@
               3[5-9]|
               9
             )|
-            892
+            8(?:
+              0[89]|
+              92
+            )
           </leadingDigits>
           <leadingDigits>
             5(?:
@@ -19216,7 +19108,10 @@
               3[5-9]|
               9
             )|
-            892
+            8(?:
+              0[89]|
+              92
+            )
           </leadingDigits>
           <format>$1-$2</format>
         </numberFormat>
@@ -19237,20 +19132,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]
             )|
             (?:
@@ -19271,9 +19164,9 @@
               8[0-247-9]
             )|
             7(?:
-              [017]\d|
+              [0167]\d|
               2[0-2]|
-              6[0-8]|
+              5[01]|
               8[0-3]
             )
           )\d{6}
@@ -19282,7 +19175,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"/>
@@ -19294,9 +19187,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>
@@ -19603,7 +19499,7 @@
             0[079]|
             [14]3|
             [27][79]|
-            30|
+            3[03-7]|
             5[0-268]|
             87
           )\d{4}
@@ -19644,7 +19540,7 @@
               395|
               76[018]
             )\d|
-            475[0-2]
+            475[0-5]
           )\d{4}
         </nationalNumberPattern>
       </voip>
@@ -19843,6 +19739,7 @@
             [0-25-8]\d\d|
             3(?:
               [1-48]\d|
+              6[01]|
               7[01578]
             )|
             4(?:
@@ -20710,8 +20607,8 @@
             [03-7]\d|
             10|
             2[7-9]|
-            8[09]|
-            9[4-9]
+            8[0-39]|
+            9[04-9]
           )\d{4}
         </nationalNumberPattern>
       </fixedLine>
@@ -20742,8 +20639,8 @@
         <exampleNumber>976612345</exampleNumber>
         <nationalNumberPattern>
           9(?:
-            397[01]|
-            477[0-2]|
+            397[0-2]|
+            477[0-5]|
             76(?:
               6\d|
               7[0-367]
@@ -21049,7 +20946,7 @@
             )|
             4(?:
               [013568]\d|
-              2[4-7]
+              2[4-8]
             )|
             54(?:
               [3-5]\d|
@@ -21083,7 +20980,7 @@
               9[0-8]
             )|
             7(?:
-              0[0-2]|
+              0[0-3]|
               3[013]
             )
           )\d{5}
@@ -21312,6 +21209,7 @@
             (?:
               [27]2|
               44|
+              87|
               99
             )[1-9]|
             65[0-689]
@@ -21324,7 +21222,7 @@
               4[0-35-9]|
               6[0-46-9]|
               7[013-9]|
-              8[1-79]|
+              8[1-69]|
               9[1-8]
             )|
             [2-9]\d
@@ -21390,7 +21288,7 @@
               3[1-6]|
               4[124-6]|
               6[1246-9]|
-              7[1-378]|
+              7[0-378]|
               9[12479]
             )|
             9(?:
@@ -21526,7 +21424,7 @@
               3[1-6]|
               4[124-6]|
               6[1246-9]|
-              7[1-378]|
+              7[0-378]|
               9[12479]
             )|
             9(?:
@@ -21733,7 +21631,7 @@
               )|
               7(?:
                 [0-4]\d|
-                5[0-6]
+                5[0-7]
               )
             )|
             (?:
@@ -22614,7 +22512,6 @@
         <nationalNumberPattern>
           (?:
             4[015-8]|
-            59|
             9\d
           )\d{6}
         </nationalNumberPattern>
@@ -22816,7 +22713,7 @@
       <generalDesc>
         <nationalNumberPattern>
           (?:
-            [47]|
+            [4-7]|
             888\d
           )\d{3}
         </nationalNumberPattern>
@@ -22827,9 +22724,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>
 
@@ -22843,21 +22745,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>
@@ -22878,8 +22782,7 @@
               10|
               74
             )|
-            [59]|
-            80
+            [589]
           </leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
@@ -22903,25 +22806,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>
@@ -22942,18 +22843,16 @@
         <possibleLengths national="[8-10]"/>
         <exampleNumber>211234567</exampleNumber>
         <nationalNumberPattern>
-          2[0-27-9]\d{7,8}|
+          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. -->
@@ -22973,7 +22872,7 @@
         <exampleNumber>900123456</exampleNumber>
         <nationalNumberPattern>
           (?:
-            11\d{5}|
+            1[13-57-9]\d{5}|
             50(?:
               0[08]|
               30|
@@ -22995,11 +22894,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}
@@ -23047,7 +22947,7 @@
           (?:
             7(?:
               [1289]\d|
-              69|
+              6[89]|
               7[0-5]
             )|
             9(?:
@@ -23130,7 +23030,7 @@
               3[0137]|
               4[17]|
               5[05]|
-              6[58]|
+              6[058]|
               7[0167]|
               8[2358]|
               9[1389]
@@ -23169,7 +23069,7 @@
               3[03]|
               4[04]|
               5[05-9]|
-              6[056]|
+              6[0156]|
               7[0-24-9]|
               8[5-9]|
               90
@@ -23886,8 +23786,8 @@
         <exampleNumber>3012345678</exampleNumber>
         <nationalNumberPattern>
           3(?:
-            [0-24]\d|
-            3[0-7]|
+            [0-247]\d|
+            3[0-79]|
             55|
             64
           )\d{7}
@@ -24112,7 +24012,7 @@
               [145]\d|
               3[1-5]
             )|
-            2[0-4]\d
+            2\d\d
           )\d{4}|
           (?:
             45|
@@ -24192,8 +24092,8 @@
         <exampleNumber>430123</exampleNumber>
         <nationalNumberPattern>
           (?:
-            4[1-356]|
-            50
+            4[1-35-7]|
+            5[01]
           )\d{4}
         </nationalNumberPattern>
       </fixedLine>
@@ -24863,7 +24763,7 @@
             2\d\d|
             3(?:
               0\d|
-              1[0-3]
+              1[0-6]
             )
           )\d{4}
         </nationalNumberPattern>
@@ -24872,30 +24772,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-3]|
-              479[0-2]|
-              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>
@@ -24923,6 +24811,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) -->
@@ -24953,7 +24855,7 @@
              \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>
@@ -24961,6 +24863,7 @@
         <nationalNumberPattern>
           (?:
             [2378]\d|
+            62|
             90
           )\d{7}|
           [23]\d{5}
@@ -24995,12 +24898,15 @@
         <exampleNumber>712034567</exampleNumber>
         <nationalNumberPattern>
           7020\d{5}|
-          7(?:
-            0[013-9]|
-            1[0-3]|
-            [2-7]\d|
-            8[03-8]|
-            9[0-29]
+          (?:
+            62\d|
+            7(?:
+              0[013-9]|
+              1[0-3]|
+              [2-7]\d|
+              8[03-8]|
+              9[0-39]
+            )
           )\d{6}
         </nationalNumberPattern>
       </mobile>
@@ -25138,7 +25044,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>
@@ -25366,14 +25273,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>
@@ -25401,7 +25308,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"/>
@@ -25474,7 +25381,7 @@
           579[01]\d{5}|
           5(?:
             [013-689]\d|
-            7[0-35-8]
+            7[0-8]
           )\d{6}
         </nationalNumberPattern>
       </mobile>
@@ -26001,7 +25908,7 @@
           <leadingDigits>
             [369]|
             8(?:
-              0[1-6]|
+              0[1-8]|
               [1-9]
             )
           </leadingDigits>
@@ -26050,12 +25957,12 @@
         <exampleNumber>81234567</exampleNumber>
         <nationalNumberPattern>
           8(?:
-            06[0-689]|
+            08[013]|
             95[0-2]
           )\d{4}|
           (?:
             8(?:
-              0[1-5]|
+              0[1-7]|
               [1-8]\d|
               9[0-4]
             )|
@@ -26264,7 +26171,7 @@
           0\d{4}|
           (?:
             [489]\d|
-            [57]9
+            79
           )\d{6}
         </nationalNumberPattern>
       </generalDesc>
@@ -26280,7 +26187,6 @@
         <nationalNumberPattern>
           (?:
             4[015-8]|
-            59|
             9\d
           )\d{6}
         </nationalNumberPattern>
@@ -26723,8 +26629,9 @@
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3})(\d{3})">
           <leadingDigits>
-            [3478]|
+            [348]|
             64|
+            79|
             90
           </leadingDigits>
           <format>$1 $2 $3</format>
@@ -26734,6 +26641,7 @@
             1|
             28|
             6[0-35-9]|
+            77|
             9[2-9]
           </leadingDigits>
           <format>$1 $2</format>
@@ -26784,7 +26692,7 @@
                 3[59]|
                 4[89]|
                 6\d|
-                79|
+                7[79]|
                 8[08]
               )\d|
               9(?:
@@ -26963,31 +26871,25 @@
         <exampleNumber>21234567</exampleNumber>
         <nationalNumberPattern>
           2(?:
-            (?:
-              [1-6]\d\d|
-              990
-            )\d|
-            790[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>
@@ -27551,8 +27453,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>
@@ -27596,9 +27498,15 @@
         <possibleLengths national="9"/>
         <exampleNumber>917123456</exampleNumber>
         <nationalNumberPattern>
-          41[18]\d{6}|
           (?:
-            0[0-27]|
+            4(?:
+              1[18]|
+              4[02-479]
+            )|
+            81[1-9]
+          )\d{6}|
+          (?:
+            0[0-57-9]|
             1[017]|
             2[02]|
             [34]0|
@@ -27815,7 +27723,7 @@
           (?:
             (?:
               [259]\d|
-              4[0-7]
+              4[0-8]
             )\d|
             3(?:
               1[1-35]|
@@ -27969,13 +27877,13 @@
           <leadingDigits>
             5(?:
               [0-59]|
-              616
+              61[06]
             )
           </leadingDigits>
           <leadingDigits>
             5(?:
               [0-59]|
-              6161
+              61[06]1
             )
           </leadingDigits>
           <format>$1 $2 $3 $4</format>
@@ -28052,7 +27960,10 @@
         <possibleLengths national="10"/>
         <exampleNumber>5012345678</exampleNumber>
         <nationalNumberPattern>
-          56161\d{5}|
+          561(?:
+            011|
+            61\d
+          )\d{4}|
           5(?:
             0[15-7]|
             1[06]|
@@ -28848,10 +28759,10 @@
         <nationalNumberPattern>
           726[01]\d{5}|
           7(?:
-            [01578]\d|
+            [015-8]\d|
             20|
             36|
-            [46][0-4]|
+            4[0-4]|
             9[89]
           )\d{6}
         </nationalNumberPattern>
@@ -28916,19 +28827,23 @@
         <possibleLengths national="10" localOnly="7"/>
         <exampleNumber>2015550123</exampleNumber>
         <nationalNumberPattern>
-          5056(?:
-            [0-35-9]\d|
-            4[46]
+          (?:
+            5056(?:
+              [0-35-9]\d|
+              4[468]
+            )|
+            73020\d
           )\d{4}|
           (?:
             4722|
-            505[2-57-9]
+            505[2-57-9]|
+            983[289]
           )\d{6}|
           (?:
             2(?:
               0[1-35-9]|
               1[02-9]|
-              2[03-589]|
+              2[03-57-9]|
               3[149]|
               4[08]|
               5[1-46]|
@@ -28939,11 +28854,11 @@
             3(?:
               0[1-57-9]|
               1[02-9]|
-              2[01356]|
+              2[013569]|
               3[0-24679]|
               4[167]|
               5[0-2]|
-              6[014]|
+              6[0149]|
               8[056]
             )|
             4(?:
@@ -29016,19 +28931,23 @@
         <possibleLengths national="10" localOnly="7"/>
         <exampleNumber>2015550123</exampleNumber>
         <nationalNumberPattern>
-          5056(?:
-            [0-35-9]\d|
-            4[46]
+          (?:
+            5056(?:
+              [0-35-9]\d|
+              4[468]
+            )|
+            73020\d
           )\d{4}|
           (?:
             4722|
-            505[2-57-9]
+            505[2-57-9]|
+            983[289]
           )\d{6}|
           (?:
             2(?:
               0[1-35-9]|
               1[02-9]|
-              2[03-589]|
+              2[03-57-9]|
               3[149]|
               4[08]|
               5[1-46]|
@@ -29039,11 +28958,11 @@
             3(?:
               0[1-57-9]|
               1[02-9]|
-              2[01356]|
+              2[013569]|
               3[0-24679]|
               4[167]|
               5[0-2]|
-              6[014]|
+              6[0149]|
               8[056]
             )|
             4(?:
@@ -29186,11 +29105,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>
@@ -29204,23 +29127,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|
@@ -29236,7 +29156,10 @@
           (?:
             1(?:
               770|
-              987
+              9(?:
+                20|
+                87
+              )
             )|
             (?:
               2\d|
@@ -29251,17 +29174,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>
@@ -29279,13 +29199,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
@@ -29338,7 +29259,7 @@
               )|
               (?:
                 1[12]|
-                8\d
+                [68]\d
               )\d|
               2(?:
                 22|
@@ -29363,11 +29284,6 @@
                 5[1-9]|
                 6[1457]
               )|
-              6(?:
-                22|
-                3[12457]|
-                4[13-8]
-              )|
               9(?:
                 22|
                 5[1-9]
@@ -29385,8 +29301,8 @@
         <nationalNumberPattern>
           (?:
             (?:
+              [25]0|
               33|
-              50|
               88|
               9[0-57-9]
             )\d{3}|
@@ -29599,27 +29515,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(?:
@@ -30289,12 +30184,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) -->
@@ -30363,7 +30258,7 @@
           )\d{6}|
           (?:
             3\d|
-            5[689]|
+            5[1689]|
             7[06-9]|
             8[1-8]|
             9[0-8]
@@ -30724,20 +30619,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|
-            9398
-          )\d{5}
+            80|
+            9\d
+          )\d{7}|
+          (?:
+            26|
+            63
+          )9\d{6}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
@@ -30746,7 +30638,7 @@
         <nationalNumberPattern>
           269(?:
             0[0-467]|
-            5[0-3]|
+            5[0-4]|
             6\d|
             [78]0
           )\d{4}
@@ -30756,17 +30648,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]
-            )|
-            9398[01]
+          639(?:
+            0[0-79]|
+            1[019]|
+            [267]\d|
+            3[09]|
+            40|
+            5[05-9]|
+            9[04-79]
           )\d{4}
         </nationalNumberPattern>
       </mobile>
@@ -30776,6 +30665,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) -->
@@ -31496,17 +31398,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>
 
@@ -31727,7 +31639,7 @@
             [24-9]0\d{4,7}
           )|
           (?:
-            1[013-79]|
+            1[0-79]|
             2[24-689]|
             3[02-689]|
             4[0-4]