diff --git a/resources/PhoneNumberMetadata.xml b/resources/PhoneNumberMetadata.xml
index 21cbf8ec..e3f4b4d4 100644
--- a/resources/PhoneNumberMetadata.xml
+++ b/resources/PhoneNumberMetadata.xml
@@ -3594,8 +3594,8 @@
     </territory>
 
     <!-- Belgium (BE) -->
-    <!-- http://www.bipt.be/en/operators/telecommunication/Numbering/Database -->
-    <!-- http://www.bipt.be/public/files/en/474/20140829153659_Belgian_numbering_plan -->
+    <!-- https://www.bipt.be/operatoren/publicatie/nationaal-nummeringsplan -->
+    <!-- https://www.bipt.be/operatoren/publicatie/databank-gereserveerde-en-toegewezen-nummers -->
     <!-- http://en.wikipedia.org/wiki/Telephone_numbers_in_Belgium -->
     <territory id="BE" countryCode="32" internationalPrefix="00" nationalPrefix="0"
                mobileNumberPortableRegion="true">
@@ -3745,7 +3745,7 @@
         <exampleNumber>70123456</exampleNumber>
         <nationalNumberPattern>
           (?:
-            0[1-35-7]|
+            0[1-7]|
             5[0-8]|
             [67]\d
           )\d{6}
@@ -5685,6 +5685,10 @@
           <leadingDigits>[1-6]</leadingDigits>
           <format>$1 $2</format>
         </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{2})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>2</leadingDigits>
+          <format>$1 $2 $3</format>
+        </numberFormat>
         <numberFormat pattern="(\d{2})(\d{3})(\d{4})" nationalPrefixFormattingRule="$NP$FG">
           <leadingDigits>1</leadingDigits>
           <format>$1 $2 $3</format>
@@ -5693,18 +5697,34 @@
           <leadingDigits>[89]</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
+        <numberFormat pattern="(\d{2})(\d{2})(\d{3})(\d{3})" nationalPrefixFormattingRule="$NP$FG">
+          <leadingDigits>5</leadingDigits>
+          <format>$1 $2 $3 $4</format>
+        </numberFormat>
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          [189]\d{8}|
+          (?:
+            (?:
+              [189]|
+              5\d
+            )\d|
+            2
+          )\d{7}|
           [1-68]\d{6}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
-        <possibleLengths national="7,9"/>
+        <possibleLengths national="[7-10]"/>
         <exampleNumber>1234567</exampleNumber>
         <nationalNumberPattern>
-          12\d{7}|
+          (?:
+            (?:
+              12|
+              573
+            )\d\d|
+            276
+          )\d{5}|
           [1-6]\d{6}
         </nationalNumberPattern>
       </fixedLine>
@@ -12388,6 +12408,7 @@
         <nationalNumberPattern>
           (?:
             [23679]\d|
+            4[015]|
             5[0-489]
           )\d{5}
         </nationalNumberPattern>
@@ -22816,32 +22837,9 @@
     <territory id="NG" countryCode="234" internationalPrefix="009" nationalPrefix="0"
                mobileNumberPortableRegion="true">
       <availableFormats>
-        <!-- Special case for (rare) 7-digit fixed line numbers. -->
-        <numberFormat pattern="(\d{2})(\d{2})(\d{3})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>78</leadingDigits>
-          <format>$1 $2 $3</format>
-        </numberFormat>
-        <!-- Fixed line format for 1 digit area code -->
-        <numberFormat pattern="(\d)(\d{3})(\d{3,4})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>
-            [12]|
-            9(?:
-              0[3-9]|
-              [1-9]
-            )
-          </leadingDigits>
-          <format>$1 $2 $3</format>
-        </numberFormat>
         <!-- Fixed line format for 2 digit area code -->
         <numberFormat pattern="(\d{2})(\d{3})(\d{2,3})" nationalPrefixFormattingRule="$NP$FG">
-          <leadingDigits>
-            [3-6]|
-            7(?:
-              0[0-689]|
-              [1-79]
-            )|
-            8[2-9]
-          </leadingDigits>
+          <leadingDigits>3</leadingDigits>
           <format>$1 $2 $3</format>
         </numberFormat>
         <numberFormat pattern="(\d{3})(\d{3})(\d{3,4})" nationalPrefixFormattingRule="$NP$FG">
@@ -22869,50 +22867,29 @@
       </availableFormats>
       <generalDesc>
         <nationalNumberPattern>
-          2[0-24-9]\d{8}|
-          [78]\d{10,13}|
-          [7-9]\d{9}|
-          [1-9]\d{7}|
-          [124-7]\d{6}
+          38\d{6}|
+          [78]\d{9,13}|
+          (?:
+            20|
+            9\d
+          )\d{8}
         </nationalNumberPattern>
       </generalDesc>
       <fixedLine>
-        <possibleLengths national="7,8,10" localOnly="5,6"/>
-        <exampleNumber>18040123</exampleNumber>
+        <possibleLengths national="8,10" localOnly="6,7"/>
+        <exampleNumber>2033123456</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|
-              4[02-8]|
+            20(?:
+              [1259]\d|
+              3[013-9]|
+              4[1-8]|
+              6[024-689]|
+              7[1-79]|
               8[2-9]
-            )\d|
-            9(?:
-              0[3-9]|
-              [1-9]\d
-            )
-          )\d{5}|
-          7(?:
-            0(?:
-              [013-689]\d|
-              2[0-24-9]
-            )\d{3,4}|
-            [1-79]\d{6}
-          )|
-          (?:
-            [12]\d|
-            4[147]|
-            5[14579]|
-            6[1578]|
-            7[1-3578]
-          )\d{5}
+            )|
+            38
+          )\d{6}
         </nationalNumberPattern>
       </fixedLine>
       <!-- Added 906 and 907 mobile prefixes based on reports. Prefix 707 is withdrawn as per few
@@ -25663,7 +25640,7 @@
           )0\d{5}|
           (?:
             6(?:
-              [04]0|
+              00|
               2\d
             )|
             7(?:
@@ -26727,7 +26704,7 @@
         <exampleNumber>81234567</exampleNumber>
         <nationalNumberPattern>
           8(?:
-            09[0-68]|
+            09[0-689]|
             95[0-2]
           )\d{4}|
           (?:
@@ -27314,9 +27291,9 @@
               90
             )\d|
             5(?:
-              01|
+              0[01]|
               [19]0|
-              25|
+              2[25]|
               [38]3|
               [4-7]\d
             )
@@ -28287,14 +28264,13 @@
             81[1-9]
           )\d{6}|
           (?:
-            0[0-57-9]|
+            [09]\d|
             1[017]|
             2[02]|
             [34]0|
             5[05]|
             7[01578]|
-            8[078]|
-            9\d
+            8[078]
           )\d{7}
         </nationalNumberPattern>
       </mobile>
@@ -29973,7 +29949,7 @@
               770|
               9(?:
                 20|
-                87
+                [89]7
               )
             )|
             (?:
diff --git a/resources/ShortNumberMetadata.xml b/resources/ShortNumberMetadata.xml
index 898db7dd..e799f7b2 100644
--- a/resources/ShortNumberMetadata.xml
+++ b/resources/ShortNumberMetadata.xml
@@ -2200,21 +2200,16 @@
       <generalDesc>
         <nationalNumberPattern>
           [1-9]\d\d(?:
-            \d\d(?:
-              \d(?:
-                \d{2}
-              )?
-            )?
+            \d{2,3}
           )?
         </nationalNumberPattern>
       </generalDesc>
       <shortCode>
-        <possibleLengths national="3,5,6,8"/>
+        <possibleLengths national="3,5,6"/>
         <exampleNumber>112</exampleNumber>
         <nationalNumberPattern>
-          112|
-          30000\d{3}|
           [1-35-9]\d{4,5}|
+          112|
           [2-8]11|
           9(?:
             11|
@@ -2254,15 +2249,10 @@
       </expandedEmergency>
       <!-- https://support.twitter.com/articles/20170024 -->
       <!-- http://www.txt.ca/en/shortcode-search/ -->
-      <!-- We also support so-called "long codes" (8 digits). Technically we know that 30000 is
-           not a valid short-code but this is too complex/not worth the time to exclude here. -->
       <smsServices>
-        <possibleLengths national="5,6,8"/>
+        <possibleLengths national="5,6"/>
         <exampleNumber>10000</exampleNumber>
-        <nationalNumberPattern>
-          300\d{5}|
-          [1-35-9]\d{4,5}
-        </nationalNumberPattern>
+        <nationalNumberPattern>[1-35-9]\d{4,5}</nationalNumberPattern>
       </smsServices>
     </territory>
 
diff --git a/resources/carrier/en/220.txt b/resources/carrier/en/220.txt
index 4aac136c..029d3253 100644
--- a/resources/carrier/en/220.txt
+++ b/resources/carrier/en/220.txt
@@ -14,6 +14,9 @@
 
 2202|Africell
 2203|QCell
+22040|Africell
+22041|Africell
+22045|Africell
 22050|QCell
 22051|QCell
 22052|QCell
diff --git a/resources/carrier/en/226.txt b/resources/carrier/en/226.txt
index 9e2e194d..0b4879de 100644
--- a/resources/carrier/en/226.txt
+++ b/resources/carrier/en/226.txt
@@ -19,6 +19,7 @@
 22601|Onatel
 22602|Onatel
 22603|Onatel
+22604|Orange
 22605|Orange
 22606|Orange
 22607|Orange
diff --git a/resources/carrier/en/32.txt b/resources/carrier/en/32.txt
index 078da639..f87ae7d3 100644
--- a/resources/carrier/en/32.txt
+++ b/resources/carrier/en/32.txt
@@ -20,7 +20,8 @@
 # VOO is brand name of mobile network of Nethys:
 # http://www.voo.be/en/gsm/abonnement-gsm/
 
-3245001|Gateway Communications
+3245001|GATEWAY COMMUNICATIONS S.A.
+324510|DIGI Communications
 32455|VOO
 32456|Mobile Vikings/JIM Mobile
 32460|Proximus
diff --git a/resources/carrier/en/40.txt b/resources/carrier/en/40.txt
index 87b87bfa..c249c860 100644
--- a/resources/carrier/en/40.txt
+++ b/resources/carrier/en/40.txt
@@ -15,7 +15,6 @@
 4060|Telekom
 4062|Vodafone
 4063|Digi Mobil
-4064|Orange
 407000|Enigma-System
 407013|Lycamobile
 407014|Lycamobile
diff --git a/resources/carrier/en/65.txt b/resources/carrier/en/65.txt
index 9723c23b..a015c43c 100644
--- a/resources/carrier/en/65.txt
+++ b/resources/carrier/en/65.txt
@@ -66,6 +66,7 @@
 658095|SingTel
 658096|Simba
 658098|Simba
+658099|SingTel
 6581|StarHub
 65810|M1
 65812|SingTel
@@ -83,6 +84,7 @@
 658228|SingTel
 65826|SingTel
 65827|M1
+658274|Simba
 65828|SingTel
 658282|M1
 658288|M1
diff --git a/resources/carrier/en/673.txt b/resources/carrier/en/673.txt
index 63a12f66..8a4dc6cb 100644
--- a/resources/carrier/en/673.txt
+++ b/resources/carrier/en/673.txt
@@ -14,15 +14,18 @@
 
 673228|DSTCom
 673229|DSTCom
-67371|DSTCom
-67372|DSTCom
-67373|DSTCom
-67374|Imagine
-67377|DSTCom
-67381|Progresif Cellular
-67382|Progresif Cellular
-67383|Progresif Cellular
-67386|DSTCom
-67387|DSTCom
-67388|DSTCom
-67389|DSTCom
+67371|UNN
+67372|UNN
+67373|UNN
+67374|UNN
+67376|UNN
+67377|UNN
+67379|UNN
+67381|UNN
+67382|UNN
+67383|UNN
+67384|UNN
+67386|UNN
+67387|UNN
+67388|UNN
+67389|UNN
diff --git a/resources/carrier/en/992.txt b/resources/carrier/en/992.txt
index 9c724c88..4ae30f4b 100644
--- a/resources/carrier/en/992.txt
+++ b/resources/carrier/en/992.txt
@@ -12,15 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+9920|ZET-MOBILE
 99200|Megafon
 99201|Megafon
 99202|Megafon
-99203|ZET-MOBILE
-99204|ZET-MOBILE
-99205|ZET-MOBILE
 99207|Megafon
-99208|ZET-MOBILE
-99209|ZET-MOBILE
 99210|O-Mobile
 99211|Tcell
 99217|Babilon-M
diff --git a/resources/geocoding/en/234.txt b/resources/geocoding/en/234.txt
index eaa859e7..9b50a44d 100644
--- a/resources/geocoding/en/234.txt
+++ b/resources/geocoding/en/234.txt
@@ -19,9 +19,8 @@
 # Note that the prefix for Pank Shin is more specific, so we don't classify
 # all mobile numbers as belonging to this locality.
 
-2341|Lagos
-2342|Ibadan
 234201|Lagos
+234202|Ibadan
 2342030|Ado Ekiti
 2342031|Ilorin
 2342033|New Bussa
@@ -73,74 +72,4 @@
 2342088|Umuahia
 2342089|Yenagoa
 234209|Abuja
-23430|Ado Ekiti
-23431|Ilorin
-23433|New Bussa
-23434|Akura
-23435|Oshogbo
-23436|Ile Ife
-23437|Ijebu Ode
-23438|Oyo
-23439|Abeokuta
-23441|Wukari
-23442|Enugu
-23443|Abakaliki
-23444|Makurdi
-23445|Ogoja
-23446|Onitsha
-23447|Lafia
-23448|Awka
-23450|Ikare
-23451|Owo
-23452|Benin
-23453|Warri
-23454|Sapele
-23455|Agbor
-23456|Asaba
-23457|Auchi
-23458|Lokoja
-23459|Okitipupa
-23460|Sokobo
-23461|Kafanchau
-23462|Kaduna
-23463|Gusau
-23464|Kano
-23465|Katsina
-23466|Minna
-23467|Kontagora
-23468|Birnin-Kebbi
-23469|Zaria
-2347020|Pank Shin
-23471|Azare
-23472|Gombe
-23473|Jos
-23474|Damaturu
-23475|Yola
-23476|Maiduguri
-23477|Bauchi
-23478|Hadejia
-23479|Jalingo
-23482|Aba
-23483|Owerri
-23484|Port Harcourt
-23485|Uyo
-23486|Ahoada
-23487|Calabar
-23488|Umuahia
-23489|Yenegoa
-234903|Abuja
-234904|Abuja
-234905|Abuja
-234906|Abuja
-234907|Abuja
-234908|Abuja
-234909|Abuja
-23491|Abuja
-23492|Abuja
-23493|Abuja
-23494|Abuja
-23495|Abuja
-23496|Abuja
-23497|Abuja
-23498|Abuja
-23499|Abuja
+2343|Oyo
diff --git a/resources/geocoding/fr/243.txt b/resources/geocoding/fr/243.txt
index 189e4130..daa9be75 100644
--- a/resources/geocoding/fr/243.txt
+++ b/resources/geocoding/fr/243.txt
@@ -21,4 +21,5 @@
 2433|Bas-Congo/Bandundu
 2434|Kasai-Oriental/Kasai-Occidental
 2435|Province Orientale (Kisanga/Mbandaka)
+243573|Oriental Province (Kisanga/Mbandaka)
 2436|Nord-Kivu/Sud-Kivu/Maniema