diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt
index b402455d..241cf641 100644
--- a/METADATA-VERSION.txt
+++ b/METADATA-VERSION.txt
@@ -2,4 +2,4 @@
 # It can be a commit, branch or tag of the https://github.com/google/libphonenumber project
 #
 # For more information, look at the phing tasks in build.xml
-v8.13.30
+v8.13.31
diff --git a/src/data/PhoneNumberMetadata_BM.php b/src/data/PhoneNumberMetadata_BM.php
index d713ab79..787a63dc 100644
--- a/src/data/PhoneNumberMetadata_BM.php
+++ b/src/data/PhoneNumberMetadata_BM.php
@@ -30,7 +30,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '441909\\d{4}|441(?:[2378]\\d|5[0-39]|92)\\d{5}',
+    'NationalNumberPattern' => '441(?:[2378]\\d|5[0-39]|9[02])\\d{5}',
     'ExampleNumber' => '4413701234',
     'PossibleLengthLocalOnly' =>
      [
diff --git a/src/data/PhoneNumberMetadata_CZ.php b/src/data/PhoneNumberMetadata_CZ.php
index e19b48d2..3993f594 100644
--- a/src/data/PhoneNumberMetadata_CZ.php
+++ b/src/data/PhoneNumberMetadata_CZ.php
@@ -29,7 +29,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '7060\\d{5}|(?:60[1-8]|7(?:0[2-5]|[2379]\\d))\\d{6}',
+    'NationalNumberPattern' => '(?:60[1-8]\\d|7(?:0(?:[2-5]\\d|60)|190|[2379]\\d\\d))\\d{5}',
     'ExampleNumber' => '601123456',
     'PossibleLength' =>
      [
diff --git a/src/data/PhoneNumberMetadata_EH.php b/src/data/PhoneNumberMetadata_EH.php
index 74a181f9..f23bbec9 100644
--- a/src/data/PhoneNumberMetadata_EH.php
+++ b/src/data/PhoneNumberMetadata_EH.php
@@ -22,7 +22,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-2]|5[01]|8[0-3]))\\d{6}',
+    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-4]|5[01]|8[0-3]))\\d{6}',
     'ExampleNumber' => '650123456',
   ],
   'tollFree' =>
diff --git a/src/data/PhoneNumberMetadata_GY.php b/src/data/PhoneNumberMetadata_GY.php
index 2218d7e3..1555c816 100644
--- a/src/data/PhoneNumberMetadata_GY.php
+++ b/src/data/PhoneNumberMetadata_GY.php
@@ -22,7 +22,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:510|6\\d\\d|7(?:[01]\\d|2[156]|49))\\d{4}',
+    'NationalNumberPattern' => '(?:510|6\\d\\d|7(?:[01]\\d|2[156]|31|49))\\d{4}',
     'ExampleNumber' => '6091234',
   ],
   'tollFree' =>
diff --git a/src/data/PhoneNumberMetadata_JE.php b/src/data/PhoneNumberMetadata_JE.php
index 828b452d..085996b1 100644
--- a/src/data/PhoneNumberMetadata_JE.php
+++ b/src/data/PhoneNumberMetadata_JE.php
@@ -30,7 +30,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '7(?:(?:(?:50|82)9|937)\\d|7(?:00[378]|97[7-9]))\\d{5}',
+    'NationalNumberPattern' => '7(?:(?:(?:50|82)9|937)\\d|7(?:00[378]|97\\d))\\d{5}',
     'ExampleNumber' => '7797712345',
   ],
   'tollFree' =>
diff --git a/src/data/PhoneNumberMetadata_LS.php b/src/data/PhoneNumberMetadata_LS.php
index 6b789270..b74165eb 100644
--- a/src/data/PhoneNumberMetadata_LS.php
+++ b/src/data/PhoneNumberMetadata_LS.php
@@ -27,7 +27,7 @@
   ],
   'tollFree' =>
    [
-    'NationalNumberPattern' => '800[256]\\d{4}',
+    'NationalNumberPattern' => '800[1256]\\d{4}',
     'ExampleNumber' => '80021234',
   ],
   'premiumRate' =>
diff --git a/src/data/PhoneNumberMetadata_MA.php b/src/data/PhoneNumberMetadata_MA.php
index 27bf9b2f..7bedefaf 100644
--- a/src/data/PhoneNumberMetadata_MA.php
+++ b/src/data/PhoneNumberMetadata_MA.php
@@ -22,7 +22,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-2]|5[01]|8[0-3]))\\d{6}',
+    'NationalNumberPattern' => '(?:6(?:[0-79]\\d|8[0-247-9])|7(?:[0167]\\d|2[0-4]|5[01]|8[0-3]))\\d{6}',
     'ExampleNumber' => '650123456',
   ],
   'tollFree' =>
@@ -108,8 +108,7 @@
       'format' => '$1-$2',
       'leadingDigitsPatterns' =>
        [
-        0 => '5(?:2[2-489]|3[5-9]|9)|8(?:0[89]|92)',
-        1 => '5(?:2(?:[2-49]|8[235-9])|3[5-9]|9)|8(?:0[89]|92)',
+        0 => '5(?:2[2-46-9]|3[3-9]|9)|8(?:0[89]|92)',
       ],
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/src/data/PhoneNumberMetadata_NG.php b/src/data/PhoneNumberMetadata_NG.php
index 0b0f93ad..907bb99e 100644
--- a/src/data/PhoneNumberMetadata_NG.php
+++ b/src/data/PhoneNumberMetadata_NG.php
@@ -44,7 +44,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:702[0-24-9]|819[01])\\d{6}|(?:7(?:0[13-689]|[12]\\d)|8(?:0[1-9]|1[0-8])|9(?:0[1-9]|1[1-6]))\\d{7}',
+    'NationalNumberPattern' => '(?:702[0-24-9]|819[01])\\d{6}|(?:7(?:0[13-9]|[12]\\d)|8(?:0[1-9]|1[0-8])|9(?:0[1-9]|1[1-6]))\\d{7}',
     'ExampleNumber' => '8021234567',
     'PossibleLength' =>
      [
@@ -164,7 +164,7 @@
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' =>
        [
-        0 => '[3-7]|8[2-9]',
+        0 => '[3-6]|7(?:0[0-689]|[1-79])|8[2-9]',
       ],
       'nationalPrefixFormattingRule' => '0$1',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/src/data/PhoneNumberMetadata_NP.php b/src/data/PhoneNumberMetadata_NP.php
index 9e33f0a7..c74195a0 100644
--- a/src/data/PhoneNumberMetadata_NP.php
+++ b/src/data/PhoneNumberMetadata_NP.php
@@ -38,7 +38,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '9(?:6[0-3]|7[024-6]|8[0-24-68])\\d{7}',
+    'NationalNumberPattern' => '9(?:00|6[0-3]|7[024-6]|8[0-24-68])\\d{7}',
     'ExampleNumber' => '9841234567',
     'PossibleLength' =>
      [
diff --git a/src/data/PhoneNumberMetadata_OM.php b/src/data/PhoneNumberMetadata_OM.php
index 1174371a..4ece1a58 100644
--- a/src/data/PhoneNumberMetadata_OM.php
+++ b/src/data/PhoneNumberMetadata_OM.php
@@ -28,7 +28,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '1505\\d{4}|(?:7(?:[1289]\\d|6[7-9]|7[0-5])|9(?:0[1-9]|[1-9]\\d))\\d{5}',
+    'NationalNumberPattern' => '(?:1505|90[1-9]\\d)\\d{4}|(?:7[126-9]|9[1-9])\\d{6}',
     'ExampleNumber' => '92123456',
     'PossibleLength' =>
      [
diff --git a/src/data/PhoneNumberMetadata_SG.php b/src/data/PhoneNumberMetadata_SG.php
index ff289b89..c02f480e 100644
--- a/src/data/PhoneNumberMetadata_SG.php
+++ b/src/data/PhoneNumberMetadata_SG.php
@@ -28,7 +28,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '895[0-2]\\d{4}|(?:8(?:0[1-8]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}',
+    'NationalNumberPattern' => '8(?:09|95)[0-2]\\d{4}|(?:8(?:0[1-8]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}',
     'ExampleNumber' => '81234567',
     'PossibleLength' =>
      [
@@ -132,7 +132,7 @@
       'format' => '$1 $2',
       'leadingDigitsPatterns' =>
        [
-        0 => '[369]|8(?:0[1-8]|[1-9])',
+        0 => '[369]|8(?:0[1-9]|[1-9])',
       ],
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
@@ -183,7 +183,7 @@
       'format' => '$1 $2',
       'leadingDigitsPatterns' =>
        [
-        0 => '[369]|8(?:0[1-8]|[1-9])',
+        0 => '[369]|8(?:0[1-9]|[1-9])',
       ],
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/src/data/PhoneNumberMetadata_TO.php b/src/data/PhoneNumberMetadata_TO.php
index 8c50b393..7691e8ff 100644
--- a/src/data/PhoneNumberMetadata_TO.php
+++ b/src/data/PhoneNumberMetadata_TO.php
@@ -27,7 +27,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:55[4-6]|6(?:[09]\\d|3[02]|8[15-9])|(?:7\\d|8[46-9])\\d|999)\\d{4}',
+    'NationalNumberPattern' => '(?:5(?:4[0-5]|5[4-6])|6(?:[09]\\d|3[02]|8[15-9])|(?:7\\d|8[46-9])\\d|999)\\d{4}',
     'ExampleNumber' => '7715123',
     'PossibleLength' =>
      [
diff --git a/src/data/PhoneNumberMetadata_US.php b/src/data/PhoneNumberMetadata_US.php
index 0df6c13a..c4b84870 100644
--- a/src/data/PhoneNumberMetadata_US.php
+++ b/src/data/PhoneNumberMetadata_US.php
@@ -21,7 +21,7 @@
   ],
   'fixedLine' =>
    [
-    'NationalNumberPattern' => '(?: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-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
+    'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|7302[0-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-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
     'ExampleNumber' => '2015550123',
     'PossibleLengthLocalOnly' =>
      [
@@ -30,7 +30,7 @@
   ],
   'mobile' =>
    [
-    'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|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-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
+    'NationalNumberPattern' => '(?:5056(?:[0-35-9]\\d|4[468])|7302[0-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-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[01349]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}',
     'ExampleNumber' => '2015550123',
     'PossibleLengthLocalOnly' =>
      [