diff --git a/METADATA-VERSION.txt b/METADATA-VERSION.txt
index cc41bfe35..e6ad3a859 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.12.10
+v8.12.11
diff --git a/src/carrier/data/en/852.php b/src/carrier/data/en/852.php
index 9e6ec9bbf..329fc5105 100644
--- a/src/carrier/data/en/852.php
+++ b/src/carrier/data/en/852.php
@@ -29,6 +29,7 @@
   8524627 => 'SmarTone',
   8524628 => 'SmarTone',
   8524629 => 'SmarTone',
+  852463 => 'China Mobile',
   8524640 => 'China Mobile',
   8524641 => 'SmarTone',
   8524642 => 'SmarTone',
@@ -38,6 +39,16 @@
   8524647 => 'Sun Mobile',
   8524648 => 'Multibyte',
   8524649 => 'CITIC',
+  8524650 => 'China Unicom',
+  8524651 => 'China Unicom',
+  8524652 => 'China Unicom',
+  8524653 => 'China Unicom',
+  8524654 => 'HKT',
+  8524655 => 'HKT',
+  8524656 => 'HKT',
+  8524657 => 'HKT',
+  8524658 => 'HKT',
+  852466 => 'China Mobile',
   852510 => 'China Mobile',
   852511 => 'Sun Mobile',
   852512 => 'China Mobile',
@@ -181,6 +192,11 @@
   852625 => 'HKT',
   8526260 => '3',
   8526261 => 'Webbing',
+  8526263 => 'China Mobile',
+  8526264 => 'China Mobile',
+  8526265 => 'China Mobile',
+  8526266 => 'China Mobile',
+  8526267 => 'China Mobile',
   852627 => '3',
   852628 => 'HKT',
   852629 => 'HKT',
@@ -222,6 +238,7 @@
   852663 => 'China Unicom',
   852664 => 'China Mobile',
   852665 => 'HKT',
+  852666 => 'China Unicom',
   852667 => 'China Mobile',
   852668 => '3',
   852669 => 'HKT',
@@ -250,7 +267,8 @@
   852695 => 'China Mobile',
   852697 => 'HKT',
   852699 => 'China Mobile',
-  85270 => 'SmarTone',
+  852707 => 'SmarTone',
+  852708 => 'HKT',
   8528480 => 'Handy',
   8528481 => 'Sun Mobile',
   8528485 => 'SmarTone',
@@ -258,6 +276,7 @@
   8528487 => 'SmarTone',
   8528488 => 'SmarTone',
   8528489 => 'SmarTone',
+  852849 => 'China Mobile',
   852901 => 'SmarTone',
   852902 => 'HKT',
   852903 => 'HKT',
diff --git a/src/carrier/data/en/94.php b/src/carrier/data/en/94.php
index 96b5f8aab..f4d602116 100644
--- a/src/carrier/data/en/94.php
+++ b/src/carrier/data/en/94.php
@@ -11,10 +11,10 @@
  */
 
 return array (
-  94117 => 'Dialog',
   9470 => 'Mobitel',
   9471 => 'Mobitel',
   9472 => 'Etisalat',
+  9474 => 'Dialog',
   9475 => 'Airtel',
   9476 => 'Dialog',
   9477 => 'Dialog',
diff --git a/src/carrier/data/en/992.php b/src/carrier/data/en/992.php
index 0378b5b22..02ae06846 100644
--- a/src/carrier/data/en/992.php
+++ b/src/carrier/data/en/992.php
@@ -13,6 +13,7 @@
 return array (
   9920 => 'Megafon',
   9921 => 'Tcell',
+  9922 => 'O-Mobile',
   99240 => 'Tacom',
   99241 => 'Megafon',
   99250 => 'Tcell',
diff --git a/src/carrier/data/en/998.php b/src/carrier/data/en/998.php
index 9773f01a0..655f8e5e8 100644
--- a/src/carrier/data/en/998.php
+++ b/src/carrier/data/en/998.php
@@ -11,217 +11,218 @@
  */
 
 return array (
+  9983 => 'Uzbektelecom',
   9985 => 'Uzbektelecom',
-  99861220 => 'MTS',
-  99861221 => 'MTS',
-  9986129 => 'MTS',
-  9986135 => 'MTS',
-  9986150 => 'MTS',
-  9986161 => 'MTS',
-  998617 => 'MTS',
-  998621 => 'MTS',
-  9986221 => 'MTS',
-  99862221 => 'MTS',
-  9986229 => 'MTS',
-  998625 => 'MTS',
-  998627 => 'MTS',
-  998651 => 'MTS',
-  99865227 => 'MTS',
-  9986529 => 'MTS',
-  9986530 => 'MTS',
-  9986559 => 'MTS',
-  998657 => 'MTS',
-  99866215 => 'MTS',
-  99866216 => 'MTS',
-  99866217 => 'MTS',
-  99866218 => 'MTS',
-  99866219 => 'MTS',
-  99866220 => 'MTS',
-  99866223 => 'MTS',
-  99866226 => 'MTS',
-  99866227 => 'MTS',
-  99866238 => 'MTS',
-  99866241 => 'MTS',
-  99866252 => 'MTS',
-  99866260 => 'MTS',
-  9986637 => 'MTS',
-  9986639 => 'MTS',
-  99866456 => 'MTS',
-  99866483 => 'MTS',
-  9986670 => 'MTS',
-  99866710 => 'MTS',
-  99866711 => 'MTS',
-  99866717 => 'MTS',
-  99866730 => 'MTS',
-  99866737 => 'MTS',
-  99866740 => 'MTS',
-  99866744 => 'MTS',
-  99866747 => 'MTS',
-  99866750 => 'MTS',
-  99866755 => 'MTS',
-  99866757 => 'MTS',
-  99866767 => 'MTS',
-  9986677 => 'MTS',
-  99866780 => 'MTS',
-  99866781 => 'MTS',
-  99866787 => 'MTS',
-  99866788 => 'MTS',
-  99866797 => 'MTS',
-  99866799 => 'MTS',
-  9986690 => 'MTS',
-  9986691 => 'MTS',
-  9986692 => 'MTS',
-  9986693 => 'MTS',
-  99867224 => 'MTS',
-  99867232 => 'MTS',
-  99867233 => 'MTS',
-  99867237 => 'MTS',
-  99867245 => 'MTS',
-  99867246 => 'MTS',
-  99867247 => 'MTS',
-  99867248 => 'MTS',
-  99867249 => 'MTS',
-  99867271 => 'MTS',
-  99867275 => 'MTS',
-  99867276 => 'MTS',
-  99867277 => 'MTS',
-  99867278 => 'MTS',
-  998675 => 'MTS',
-  9986770 => 'MTS',
-  9986773 => 'MTS',
-  99867790 => 'MTS',
-  99867797 => 'MTS',
-  998679 => 'MTS',
-  9986921 => 'MTS',
-  9986923 => 'MTS',
-  9986925 => 'MTS',
-  9986927 => 'MTS',
-  998695 => 'MTS',
-  9986962 => 'MTS',
-  9986968 => 'MTS',
-  998697 => 'MTS',
-  99870 => 'MTS',
-  99872227 => 'MTS',
-  99872229 => 'MTS',
-  9987229 => 'MTS',
-  9987232 => 'MTS',
-  9987236 => 'MTS',
-  9987257 => 'MTS',
-  998727 => 'MTS',
-  99873210 => 'MTS',
-  99873211 => 'MTS',
-  99873212 => 'MTS',
-  99873213 => 'MTS',
-  99873214 => 'MTS',
-  99873215 => 'MTS',
-  99873216 => 'MTS',
-  99873221 => 'MTS',
-  99873234 => 'MTS',
-  99873236 => 'MTS',
-  99873239 => 'MTS',
-  99873271 => 'MTS',
-  99873275 => 'MTS',
-  99873279 => 'MTS',
-  9987333 => 'MTS',
-  9987350 => 'MTS',
-  99873555 => 'MTS',
-  99873557 => 'MTS',
-  99873559 => 'MTS',
-  9987359 => 'MTS',
-  998737 => 'MTS',
-  998739 => 'MTS',
-  99874229 => 'MTS',
-  99874250 => 'MTS',
-  99874252 => 'MTS',
-  99874255 => 'MTS',
-  99874257 => 'MTS',
-  99874260 => 'MTS',
-  99874261 => 'MTS',
-  99874262 => 'MTS',
-  99874263 => 'MTS',
-  99874264 => 'MTS',
-  99874265 => 'MTS',
-  99874266 => 'MTS',
-  99874267 => 'MTS',
-  99874271 => 'MTS',
-  99874272 => 'MTS',
-  99874273 => 'MTS',
-  99874274 => 'MTS',
-  99874275 => 'MTS',
-  99874277 => 'MTS',
-  998745 => 'MTS',
-  9987470 => 'MTS',
-  99874710 => 'MTS',
-  99874712 => 'MTS',
-  99874714 => 'MTS',
-  99874715 => 'MTS',
-  99874718 => 'MTS',
-  99874719 => 'MTS',
-  99874720 => 'MTS',
-  99874721 => 'MTS',
-  99874722 => 'MTS',
-  99874727 => 'MTS',
-  99874730 => 'MTS',
-  99874731 => 'MTS',
-  99874733 => 'MTS',
-  99874737 => 'MTS',
-  99874740 => 'MTS',
-  99874747 => 'MTS',
-  99874750 => 'MTS',
-  99874751 => 'MTS',
-  99874760 => 'MTS',
-  99874767 => 'MTS',
-  99874775 => 'MTS',
-  99874776 => 'MTS',
-  99874777 => 'MTS',
-  99874778 => 'MTS',
-  99874779 => 'MTS',
-  99874790 => 'MTS',
-  99874797 => 'MTS',
-  99874799 => 'MTS',
-  998749 => 'MTS',
-  998751 => 'MTS',
-  9987520 => 'MTS',
-  99875222 => 'MTS',
-  99875229 => 'MTS',
-  9987524 => 'MTS',
-  9987529 => 'MTS',
-  998753 => 'MTS',
-  99875526 => 'MTS',
-  99875527 => 'MTS',
-  99875528 => 'MTS',
-  99875529 => 'MTS',
-  998757 => 'MTS',
-  99876221 => 'MTS',
-  99876222 => 'MTS',
-  99876224 => 'MTS',
-  99876225 => 'MTS',
-  9987624 => 'MTS',
-  9987639 => 'MTS',
-  99876411 => 'MTS',
-  99876417 => 'MTS',
-  99876419 => 'MTS',
-  998765 => 'MTS',
-  998767 => 'MTS',
+  99861220 => 'MobiUZ',
+  99861221 => 'MobiUZ',
+  9986129 => 'MobiUZ',
+  9986135 => 'MobiUZ',
+  9986150 => 'MobiUZ',
+  9986161 => 'MobiUZ',
+  998617 => 'MobiUZ',
+  998621 => 'MobiUZ',
+  9986221 => 'MobiUZ',
+  99862221 => 'MobiUZ',
+  9986229 => 'MobiUZ',
+  998625 => 'MobiUZ',
+  998627 => 'MobiUZ',
+  998651 => 'MobiUZ',
+  99865227 => 'MobiUZ',
+  9986529 => 'MobiUZ',
+  9986530 => 'MobiUZ',
+  9986559 => 'MobiUZ',
+  998657 => 'MobiUZ',
+  99866215 => 'MobiUZ',
+  99866216 => 'MobiUZ',
+  99866217 => 'MobiUZ',
+  99866218 => 'MobiUZ',
+  99866219 => 'MobiUZ',
+  99866220 => 'MobiUZ',
+  99866223 => 'MobiUZ',
+  99866226 => 'MobiUZ',
+  99866227 => 'MobiUZ',
+  99866238 => 'MobiUZ',
+  99866241 => 'MobiUZ',
+  99866252 => 'MobiUZ',
+  99866260 => 'MobiUZ',
+  9986637 => 'MobiUZ',
+  9986639 => 'MobiUZ',
+  99866456 => 'MobiUZ',
+  99866483 => 'MobiUZ',
+  9986670 => 'MobiUZ',
+  99866710 => 'MobiUZ',
+  99866711 => 'MobiUZ',
+  99866717 => 'MobiUZ',
+  99866730 => 'MobiUZ',
+  99866737 => 'MobiUZ',
+  99866740 => 'MobiUZ',
+  99866744 => 'MobiUZ',
+  99866747 => 'MobiUZ',
+  99866750 => 'MobiUZ',
+  99866755 => 'MobiUZ',
+  99866757 => 'MobiUZ',
+  99866767 => 'MobiUZ',
+  9986677 => 'MobiUZ',
+  99866780 => 'MobiUZ',
+  99866781 => 'MobiUZ',
+  99866787 => 'MobiUZ',
+  99866788 => 'MobiUZ',
+  99866797 => 'MobiUZ',
+  99866799 => 'MobiUZ',
+  9986690 => 'MobiUZ',
+  9986691 => 'MobiUZ',
+  9986692 => 'MobiUZ',
+  9986693 => 'MobiUZ',
+  99867224 => 'MobiUZ',
+  99867232 => 'MobiUZ',
+  99867233 => 'MobiUZ',
+  99867237 => 'MobiUZ',
+  99867245 => 'MobiUZ',
+  99867246 => 'MobiUZ',
+  99867247 => 'MobiUZ',
+  99867248 => 'MobiUZ',
+  99867249 => 'MobiUZ',
+  99867271 => 'MobiUZ',
+  99867275 => 'MobiUZ',
+  99867276 => 'MobiUZ',
+  99867277 => 'MobiUZ',
+  99867278 => 'MobiUZ',
+  998675 => 'MobiUZ',
+  9986770 => 'MobiUZ',
+  9986773 => 'MobiUZ',
+  99867790 => 'MobiUZ',
+  99867797 => 'MobiUZ',
+  998679 => 'MobiUZ',
+  9986921 => 'MobiUZ',
+  9986923 => 'MobiUZ',
+  9986925 => 'MobiUZ',
+  9986927 => 'MobiUZ',
+  998695 => 'MobiUZ',
+  9986962 => 'MobiUZ',
+  9986968 => 'MobiUZ',
+  998697 => 'MobiUZ',
+  99870 => 'MobiUZ',
+  99872227 => 'MobiUZ',
+  99872229 => 'MobiUZ',
+  9987229 => 'MobiUZ',
+  9987232 => 'MobiUZ',
+  9987236 => 'MobiUZ',
+  9987257 => 'MobiUZ',
+  998727 => 'MobiUZ',
+  99873210 => 'MobiUZ',
+  99873211 => 'MobiUZ',
+  99873212 => 'MobiUZ',
+  99873213 => 'MobiUZ',
+  99873214 => 'MobiUZ',
+  99873215 => 'MobiUZ',
+  99873216 => 'MobiUZ',
+  99873221 => 'MobiUZ',
+  99873234 => 'MobiUZ',
+  99873236 => 'MobiUZ',
+  99873239 => 'MobiUZ',
+  99873271 => 'MobiUZ',
+  99873275 => 'MobiUZ',
+  99873279 => 'MobiUZ',
+  9987333 => 'MobiUZ',
+  9987350 => 'MobiUZ',
+  99873555 => 'MobiUZ',
+  99873557 => 'MobiUZ',
+  99873559 => 'MobiUZ',
+  9987359 => 'MobiUZ',
+  998737 => 'MobiUZ',
+  998739 => 'MobiUZ',
+  99874229 => 'MobiUZ',
+  99874250 => 'MobiUZ',
+  99874252 => 'MobiUZ',
+  99874255 => 'MobiUZ',
+  99874257 => 'MobiUZ',
+  99874260 => 'MobiUZ',
+  99874261 => 'MobiUZ',
+  99874262 => 'MobiUZ',
+  99874263 => 'MobiUZ',
+  99874264 => 'MobiUZ',
+  99874265 => 'MobiUZ',
+  99874266 => 'MobiUZ',
+  99874267 => 'MobiUZ',
+  99874271 => 'MobiUZ',
+  99874272 => 'MobiUZ',
+  99874273 => 'MobiUZ',
+  99874274 => 'MobiUZ',
+  99874275 => 'MobiUZ',
+  99874277 => 'MobiUZ',
+  998745 => 'MobiUZ',
+  9987470 => 'MobiUZ',
+  99874710 => 'MobiUZ',
+  99874712 => 'MobiUZ',
+  99874714 => 'MobiUZ',
+  99874715 => 'MobiUZ',
+  99874718 => 'MobiUZ',
+  99874719 => 'MobiUZ',
+  99874720 => 'MobiUZ',
+  99874721 => 'MobiUZ',
+  99874722 => 'MobiUZ',
+  99874727 => 'MobiUZ',
+  99874730 => 'MobiUZ',
+  99874731 => 'MobiUZ',
+  99874733 => 'MobiUZ',
+  99874737 => 'MobiUZ',
+  99874740 => 'MobiUZ',
+  99874747 => 'MobiUZ',
+  99874750 => 'MobiUZ',
+  99874751 => 'MobiUZ',
+  99874760 => 'MobiUZ',
+  99874767 => 'MobiUZ',
+  99874775 => 'MobiUZ',
+  99874776 => 'MobiUZ',
+  99874777 => 'MobiUZ',
+  99874778 => 'MobiUZ',
+  99874779 => 'MobiUZ',
+  99874790 => 'MobiUZ',
+  99874797 => 'MobiUZ',
+  99874799 => 'MobiUZ',
+  998749 => 'MobiUZ',
+  998751 => 'MobiUZ',
+  9987520 => 'MobiUZ',
+  99875222 => 'MobiUZ',
+  99875229 => 'MobiUZ',
+  9987524 => 'MobiUZ',
+  9987529 => 'MobiUZ',
+  998753 => 'MobiUZ',
+  99875526 => 'MobiUZ',
+  99875527 => 'MobiUZ',
+  99875528 => 'MobiUZ',
+  99875529 => 'MobiUZ',
+  998757 => 'MobiUZ',
+  99876221 => 'MobiUZ',
+  99876222 => 'MobiUZ',
+  99876224 => 'MobiUZ',
+  99876225 => 'MobiUZ',
+  9987624 => 'MobiUZ',
+  9987639 => 'MobiUZ',
+  99876411 => 'MobiUZ',
+  99876417 => 'MobiUZ',
+  99876419 => 'MobiUZ',
+  998765 => 'MobiUZ',
+  998767 => 'MobiUZ',
   99877 => 'Uzbektelecom',
-  99879221 => 'MTS',
-  99879222 => 'MTS',
-  99879228 => 'MTS',
-  998793 => 'MTS',
-  99879570 => 'MTS',
-  99879572 => 'MTS',
-  99879575 => 'MTS',
-  99879576 => 'MTS',
-  99879579 => 'MTS',
-  998797 => 'MTS',
-  9988 => 'MTS',
+  99879221 => 'MobiUZ',
+  99879222 => 'MobiUZ',
+  99879228 => 'MobiUZ',
+  998793 => 'MobiUZ',
+  99879570 => 'MobiUZ',
+  99879572 => 'MobiUZ',
+  99879575 => 'MobiUZ',
+  99879576 => 'MobiUZ',
+  99879579 => 'MobiUZ',
+  998797 => 'MobiUZ',
+  9988 => 'MobiUZ',
   99890 => 'Beeline',
   99891 => 'Beeline',
-  99892 => 'MTS',
+  99892 => 'MobiUZ',
   99893 => 'Ucell',
   99894 => 'Ucell',
   99895 => 'Uzbektelecom',
-  99897 => 'MTS',
+  99897 => 'MobiUZ',
   99898 => 'Perfectum',
   99899 => 'Uzbektelecom',
 );
diff --git a/src/carrier/data/zh/852.php b/src/carrier/data/zh/852.php
index a19cfd090..6ffb33ecb 100644
--- a/src/carrier/data/zh/852.php
+++ b/src/carrier/data/zh/852.php
@@ -29,6 +29,7 @@
   8524627 => '数码通',
   8524628 => '数码通',
   8524629 => '数码通',
+  852463 => '中国移动',
   8524640 => '中国移动',
   8524641 => '数码通',
   8524642 => '数码通',
@@ -37,6 +38,16 @@
   8524645 => '数码通',
   8524647 => '新移动通讯',
   8524649 => '中信国际电讯',
+  8524650 => '中国联通',
+  8524651 => '中国联通',
+  8524652 => '中国联通',
+  8524653 => '中国联通',
+  8524654 => '香港移动通讯',
+  8524655 => '香港移动通讯',
+  8524656 => '香港移动通讯',
+  8524657 => '香港移动通讯',
+  8524658 => '香港移动通讯',
+  852466 => '中国移动',
   852510 => '中国移动',
   852511 => '新移动通讯',
   852512 => '中国移动',
@@ -152,6 +163,11 @@
   852622 => '中国移动',
   852623 => '中国移动',
   852625 => '香港移动通讯',
+  8526263 => '中国移动',
+  8526264 => '中国移动',
+  8526265 => '中国移动',
+  8526266 => '中国移动',
+  8526267 => '中国移动',
   852628 => '香港移动通讯',
   852629 => '香港移动通讯',
   852630 => '香港移动通讯',
@@ -186,6 +202,7 @@
   852663 => '中国联通',
   852664 => '中国移动',
   852665 => '香港移动通讯',
+  852666 => '中国联通',
   852667 => '中国移动',
   852669 => '香港移动通讯',
   852670 => '中国移动',
@@ -211,13 +228,15 @@
   852695 => '中国移动',
   852697 => '香港移动通讯',
   852699 => '中国移动',
-  85270 => '数码通',
+  852707 => '数码通',
+  852708 => '香港移动通讯',
   8528481 => '新移动通讯',
   8528485 => '数码通',
   8528486 => '数码通',
   8528487 => '数码通',
   8528488 => '数码通',
   8528489 => '数码通',
+  852849 => '中国移动',
   852901 => '数码通',
   852902 => '香港移动通讯',
   852903 => '香港移动通讯',
diff --git a/src/data/PhoneNumberMetadata_CM.php b/src/data/PhoneNumberMetadata_CM.php
index 993749893..92657f142 100644
--- a/src/data/PhoneNumberMetadata_CM.php
+++ b/src/data/PhoneNumberMetadata_CM.php
@@ -176,5 +176,5 @@
   ),
   'mainCountryForCode' => false,
   'leadingZeroPossible' => false,
-  'mobileNumberPortableRegion' => false,
+  'mobileNumberPortableRegion' => true,
 );
diff --git a/src/data/PhoneNumberMetadata_HK.php b/src/data/PhoneNumberMetadata_HK.php
index ab530fb0c..e11b809ae 100644
--- a/src/data/PhoneNumberMetadata_HK.php
+++ b/src/data/PhoneNumberMetadata_HK.php
@@ -30,7 +30,7 @@
   ),
   'fixedLine' => 
   array (
-    'NationalNumberPattern' => '(?:384[0-5]|58(?:0[1-8]|1[2-9]))\\d{4}|(?:2(?:[13-9]\\d|2[013-9])|3(?:[1569][0-24-9]|4[0-246-9]|7[0-24-69]|89))\\d{5}',
+    'NationalNumberPattern' => '(?:2(?:[13-9]\\d|2[013-9])\\d|3(?:(?:[1569][0-24-9]|4[0-246-9]|7[0-24-69])\\d|8(?:4[0-6]|5[0-5]|9\\d))|58(?:0[1-8]|1[2-9]))\\d{4}',
     'ExampleNumber' => '21234567',
     'PossibleLength' => 
     array (
@@ -42,7 +42,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:46(?:[01][0-6]|4[0-57-9])|5730|626[01]|707[1-5]|848[015-9]|929[03-9])\\d{4}|(?:462|5(?:[1-59][0-46-9]|6[0-4689]|7[0-2469])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}',
+    'NationalNumberPattern' => '(?:46(?:[01][0-6]|4[0-57-9]|5[0-8]|6[0-4])|5730|6(?:26[013-7]|66[0-3])|70(?:7[1-5]|8[0-4])|848[015-9]|929[03-9])\\d{4}|(?:46[23]|5(?:[1-59][0-46-9]|6[0-4689]|7[0-2469])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|849|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}',
     'ExampleNumber' => '51234567',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_ID.php b/src/data/PhoneNumberMetadata_ID.php
index ce0db2a1b..61f67ba85 100644
--- a/src/data/PhoneNumberMetadata_ID.php
+++ b/src/data/PhoneNumberMetadata_ID.php
@@ -14,7 +14,7 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '(?:(?:007803|8\\d{4})\\d|[1-36])\\d{6}|[1-9]\\d{8,10}|[2-9]\\d{7}',
+    'NationalNumberPattern' => '(?:(?:00[1-9]|8\\d)\\d{4}|[1-36])\\d{6}|00\\d{10}|[1-9]\\d{8,10}|[2-9]\\d{7}',
     'PossibleLength' => 
     array (
       0 => 7,
@@ -66,7 +66,7 @@
   ),
   'tollFree' => 
   array (
-    'NationalNumberPattern' => '007803\\d{7}|(?:177\\d|800)\\d{5,7}',
+    'NationalNumberPattern' => '00[17]803\\d{7}|(?:177\\d|800)\\d{5,7}|001803\\d{6}',
     'ExampleNumber' => '8001234567',
     'PossibleLength' => 
     array (
@@ -74,7 +74,8 @@
       1 => 9,
       2 => 10,
       3 => 11,
-      4 => 13,
+      4 => 12,
+      5 => 13,
     ),
     'PossibleLengthLocalOnly' => 
     array (
@@ -159,11 +160,12 @@
   ),
   'noInternationalDialling' => 
   array (
-    'NationalNumberPattern' => '(?:007803\\d|8071)\\d{6}',
+    'NationalNumberPattern' => '001803\\d{6,7}|(?:007803\\d|8071)\\d{6}',
     'PossibleLength' => 
     array (
       0 => 10,
-      1 => 13,
+      1 => 12,
+      2 => 13,
     ),
     'PossibleLengthLocalOnly' => 
     array (
@@ -171,7 +173,7 @@
   ),
   'id' => 'ID',
   'countryCode' => 62,
-  'internationalPrefix' => '00[189]',
+  'internationalPrefix' => '00[89]',
   'nationalPrefix' => '0',
   'nationalPrefixForParsing' => '0',
   'sameMobileAndFixedLinePattern' => false,
@@ -286,6 +288,18 @@
       'nationalPrefixOptionalWhenFormatting' => false,
     ),
     9 => 
+    array (
+      'pattern' => '(\\d{3})(\\d{3})(\\d{3})(\\d{3})',
+      'format' => '$1 $2 $3 $4',
+      'leadingDigitsPatterns' => 
+      array (
+        0 => '001',
+      ),
+      'nationalPrefixFormattingRule' => '',
+      'domesticCarrierCodeFormattingRule' => '',
+      'nationalPrefixOptionalWhenFormatting' => false,
+    ),
+    10 => 
     array (
       'pattern' => '(\\d{2})(\\d{4})(\\d{3})(\\d{4})',
       'format' => '$1 $2 $3 $4',
diff --git a/src/data/PhoneNumberMetadata_LK.php b/src/data/PhoneNumberMetadata_LK.php
index 25079555c..fb471eb8f 100644
--- a/src/data/PhoneNumberMetadata_LK.php
+++ b/src/data/PhoneNumberMetadata_LK.php
@@ -38,7 +38,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '7[0-25-8]\\d{7}',
+    'NationalNumberPattern' => '7(?:[0-25-8]\\d|4[01])\\d{6}',
     'ExampleNumber' => '712345678',
     'PossibleLength' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_PA.php b/src/data/PhoneNumberMetadata_PA.php
index bbb95b872..3f18bc74b 100644
--- a/src/data/PhoneNumberMetadata_PA.php
+++ b/src/data/PhoneNumberMetadata_PA.php
@@ -14,7 +14,7 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '(?:6|8\\d\\d)\\d{7}|[1-57-9]\\d{6}',
+    'NationalNumberPattern' => '8\\d{9}|[68]\\d{7}|[1-57-9]\\d{6}',
     'PossibleLength' => 
     array (
       0 => 7,
@@ -52,12 +52,10 @@
   ),
   'tollFree' => 
   array (
-    'NationalNumberPattern' => '800\\d{4}(?:\\d{3})?',
+    'NationalNumberPattern' => '800\\d{4}(?:\\d(?:\\d{2})?)?',
     'ExampleNumber' => '8001234',
     'PossibleLength' => 
     array (
-      0 => 7,
-      1 => 10,
     ),
     'PossibleLengthLocalOnly' => 
     array (
@@ -169,7 +167,7 @@
       'format' => '$1-$2',
       'leadingDigitsPatterns' => 
       array (
-        0 => '6',
+        0 => '[68]',
       ),
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/src/data/PhoneNumberMetadata_PY.php b/src/data/PhoneNumberMetadata_PY.php
index ba7a8c08b..81d700e42 100644
--- a/src/data/PhoneNumberMetadata_PY.php
+++ b/src/data/PhoneNumberMetadata_PY.php
@@ -14,14 +14,15 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '9\\d{10}|(?:[2-46-9]\\d|5[0-8])\\d{7}|[2-9]\\d{5,7}',
+    'NationalNumberPattern' => '59\\d{4,6}|9\\d{5,10}|(?:[2-46-8]\\d|5[0-8])\\d{4,7}',
     'PossibleLength' => 
     array (
       0 => 6,
       1 => 7,
       2 => 8,
       3 => 9,
-      4 => 11,
+      4 => 10,
+      5 => 11,
     ),
     'PossibleLengthLocalOnly' => 
     array (
@@ -58,11 +59,13 @@
   ),
   'tollFree' => 
   array (
-    'NationalNumberPattern' => '9800\\d{7}',
+    'NationalNumberPattern' => '9800\\d{5,7}',
     'ExampleNumber' => '98000123456',
     'PossibleLength' => 
     array (
-      0 => 11,
+      0 => 9,
+      1 => 10,
+      2 => 11,
     ),
     'PossibleLengthLocalOnly' => 
     array (
diff --git a/src/data/PhoneNumberMetadata_TJ.php b/src/data/PhoneNumberMetadata_TJ.php
index 95d73d755..836ba8cd3 100644
--- a/src/data/PhoneNumberMetadata_TJ.php
+++ b/src/data/PhoneNumberMetadata_TJ.php
@@ -14,7 +14,7 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '(?:00|11|[3-57-9]\\d)\\d{7}',
+    'NationalNumberPattern' => '(?:[02]0|11|[3-57-9]\\d)\\d{7}',
     'PossibleLength' => 
     array (
       0 => 9,
@@ -44,7 +44,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '41[18]\\d{6}|(?:[04]0|11|5[05]|7[07]|88|9\\d)\\d{7}',
+    'NationalNumberPattern' => '41[18]\\d{6}|(?:[024]0|11|5[05]|7[07]|88|9\\d)\\d{7}',
     'ExampleNumber' => '917123456',
     'PossibleLength' => 
     array (
@@ -196,7 +196,7 @@
       'format' => '$1 $2 $3',
       'leadingDigitsPatterns' => 
       array (
-        0 => '[0457-9]|11',
+        0 => '[02457-9]|11',
       ),
       'nationalPrefixFormattingRule' => '',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/src/data/PhoneNumberMetadata_UZ.php b/src/data/PhoneNumberMetadata_UZ.php
index 2c40e706f..1d1d0047a 100644
--- a/src/data/PhoneNumberMetadata_UZ.php
+++ b/src/data/PhoneNumberMetadata_UZ.php
@@ -14,7 +14,7 @@
 return array (
   'generalDesc' => 
   array (
-    'NationalNumberPattern' => '55501\\d{4}|(?:[679]\\d|88)\\d{7}',
+    'NationalNumberPattern' => '55501\\d{4}|(?:33|[679]\\d|88)\\d{7}',
     'PossibleLength' => 
     array (
       0 => 9,
@@ -36,7 +36,7 @@
   ),
   'mobile' => 
   array (
-    'NationalNumberPattern' => '(?:55501|6(?:1(?:2(?:2[01]|98)|35[0-4]|50\\d|61[23]|7(?:[01][017]|4\\d|55|9[5-9]))|2(?:(?:11|7\\d)\\d|2(?:[12]1|9[01379])|5(?:[126]\\d|3[0-4]))|5(?:19[01]|2(?:27|9[26])|(?:30|59|7\\d)\\d)|6(?:2(?:1[5-9]|2[0367]|38|41|52|60)|(?:3[79]|9[0-3])\\d|4(?:56|83)|7(?:[07]\\d|1[017]|3[07]|4[047]|5[057]|67|8[0178]|9[79]))|7(?:2(?:24|3[237]|4[5-9]|7[15-8])|5(?:7[12]|8[0589])|7(?:0\\d|[39][07])|9(?:0\\d|7[079]))|9(?:2(?:1[1267]|3[01]|5\\d|7[0-4])|(?:5[67]|7\\d)\\d|6(?:2[0-26]|8\\d)))|7(?:[07]\\d{3}|1(?:13[01]|6(?:0[47]|1[67]|66)|71[3-69]|98\\d)|2(?:2(?:2[79]|95)|3(?:2[5-9]|6[0-6])|57\\d|7(?:0\\d|1[17]|2[27]|3[37]|44|5[057]|66|88))|3(?:2(?:1[0-6]|21|3[469]|7[159])|(?:33|9[4-6])\\d|5(?:0[0-4]|5[579]|9\\d)|7(?:[0-3579]\\d|4[0467]|6[67]|8[078]))|4(?:2(?:29|5[0257]|6[0-7]|7[1-57])|5(?:1[0-4]|8\\d|9[5-9])|7(?:0\\d|1[024589]|2[0-27]|3[0137]|[46][07]|5[01]|7[5-9]|9[079])|9(?:7[015-9]|[89]\\d))|5(?:112|2(?:0\\d|2[29]|[49]4)|3[1568]\\d|52[6-9]|7(?:0[01578]|1[017]|[23]7|4[047]|[5-7]\\d|8[78]|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(?:2[0-4]|7\\d)|57[02569]|7(?:2[05-9]|3[37]|4\\d|60|7[2579]|87|9[07])))|(?:88|9[0-57-9])\\d{3})\\d{4}',
+    'NationalNumberPattern' => '(?:(?:33|88|9[0-57-9])\\d{3}|55501|6(?:1(?:2(?:2[01]|98)|35[0-4]|50\\d|61[23]|7(?:[01][017]|4\\d|55|9[5-9]))|2(?:(?:11|7\\d)\\d|2(?:[12]1|9[01379])|5(?:[126]\\d|3[0-4]))|5(?:19[01]|2(?:27|9[26])|(?:30|59|7\\d)\\d)|6(?:2(?:1[5-9]|2[0367]|38|41|52|60)|(?:3[79]|9[0-3])\\d|4(?:56|83)|7(?:[07]\\d|1[017]|3[07]|4[047]|5[057]|67|8[0178]|9[79]))|7(?:2(?:24|3[237]|4[5-9]|7[15-8])|5(?:7[12]|8[0589])|7(?:0\\d|[39][07])|9(?:0\\d|7[079]))|9(?:2(?:1[1267]|3[01]|5\\d|7[0-4])|(?:5[67]|7\\d)\\d|6(?:2[0-26]|8\\d)))|7(?:[07]\\d{3}|1(?:13[01]|6(?:0[47]|1[67]|66)|71[3-69]|98\\d)|2(?:2(?:2[79]|95)|3(?:2[5-9]|6[0-6])|57\\d|7(?:0\\d|1[17]|2[27]|3[37]|44|5[057]|66|88))|3(?:2(?:1[0-6]|21|3[469]|7[159])|(?:33|9[4-6])\\d|5(?:0[0-4]|5[579]|9\\d)|7(?:[0-3579]\\d|4[0467]|6[67]|8[078]))|4(?:2(?:29|5[0257]|6[0-7]|7[1-57])|5(?:1[0-4]|8\\d|9[5-9])|7(?:0\\d|1[024589]|2[0-27]|3[0137]|[46][07]|5[01]|7[5-9]|9[079])|9(?:7[015-9]|[89]\\d))|5(?:112|2(?:0\\d|2[29]|[49]4)|3[1568]\\d|52[6-9]|7(?:0[01578]|1[017]|[23]7|4[047]|[5-7]\\d|8[78]|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(?:2[0-4]|7\\d)|57[02569]|7(?:2[05-9]|3[37]|4\\d|60|7[2579]|87|9[07]))))\\d{4}',
     'ExampleNumber' => '912345678',
     'PossibleLength' => 
     array (
@@ -150,7 +150,7 @@
       'format' => '$1 $2 $3 $4',
       'leadingDigitsPatterns' => 
       array (
-        0 => '[5-9]',
+        0 => '[35-9]',
       ),
       'nationalPrefixFormattingRule' => '8 $1',
       'domesticCarrierCodeFormattingRule' => '',
diff --git a/src/timezone/data/map_data.php b/src/timezone/data/map_data.php
index d26dad9df..78533be4a 100644
--- a/src/timezone/data/map_data.php
+++ b/src/timezone/data/map_data.php
@@ -2975,6 +2975,8 @@
   61891712 => 'Australia/Adelaide&Australia/Perth&Indian/Christmas',
   61891959 => 'Australia/Adelaide&Australia/Perth&Indian/Cocos',
   62 => 'Asia/Jakarta&Asia/Jayapura&Asia/Makassar',
+  62007 => 'Asia/Jakarta&Asia/Makassar',
+  621 => 'Asia/Jakarta&Asia/Makassar',
   622 => 'Asia/Jakarta',
   6231 => 'Asia/Jakarta',
   6232 => 'Asia/Jakarta',
@@ -2982,12 +2984,8 @@
   6234 => 'Asia/Jakarta',
   6235 => 'Asia/Jakarta',
   6236 => 'Asia/Makassar',
-  62370 => 'Asia/Makassar',
-  62371 => 'Asia/Makassar',
-  62372 => 'Asia/Makassar',
-  62373 => 'Asia/Makassar',
-  62374 => 'Asia/Makassar',
-  62376 => 'Asia/Makassar',
+  6237 => 'Asia/Makassar',
+  62379 => 'Asia/Jakarta&Asia/Makassar',
   6238 => 'Asia/Makassar',
   624 => 'Asia/Makassar',
   62403 => 'Asia/Jayapura&Asia/Makassar',
@@ -3012,27 +3010,21 @@
   6256 => 'Asia/Jakarta',
   626 => 'Asia/Jakarta',
   627 => 'Asia/Jakarta',
-  6281 => 'Asia/Jakarta',
+  628 => 'Asia/Jakarta',
+  6280 => 'Asia/Jakarta&Asia/Makassar',
   62811 => 'Asia/Jakarta&Asia/Makassar',
   62818 => 'Asia/Jakarta&Asia/Makassar',
   62819 => 'Asia/Jakarta&Asia/Makassar',
-  6282 => 'Asia/Jakarta',
   62824 => 'Asia/Jakarta&Asia/Makassar',
   62829 => 'Asia/Jakarta&Asia/Makassar',
-  6283 => 'Asia/Jakarta',
   62831 => 'Asia/Jakarta&Asia/Makassar',
   62833 => 'Asia/Jakarta&Asia/Makassar',
   62834 => 'Asia/Jakarta&Asia/Makassar',
   62839 => 'Asia/Jakarta&Asia/Makassar',
-  6285 => 'Asia/Jakarta',
   62853 => 'Asia/Jakarta&Asia/Makassar',
-  6286 => 'Asia/Jakarta',
   62868 => 'Asia/Jakarta&Asia/Makassar',
-  6287 => 'Asia/Jakarta',
   62876 => 'Asia/Jakarta&Asia/Makassar',
-  6288 => 'Asia/Jakarta',
   62887 => 'Asia/Jakarta&Asia/Makassar',
-  6289 => 'Asia/Jakarta',
   6290 => 'Asia/Jayapura',
   6291 => 'Asia/Jayapura',
   62915 => 'Asia/Jakarta&Asia/Jayapura',