diff --git a/README.md b/README.md
index 98ab35734c72..52ad5198ca4d 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,7 @@ The self-host zip includes all third party libraries whereas downloading the cod
 ## Third Party Modules
 * [Event Scheduler](https://github.com/cytech/Scheduler-InvoiceNinja)
 * [Manufacturer Module](https://github.com/dicarlosystems/manufacturer-invoiceninja)
+* [Point of Sale](https://github.com/dicarlosystems/pointofsale-invoiceninja)
 
 > Feel free to email us for help if you're working on a module, we're happy to provide developer support.
 
diff --git a/app/Constants.php b/app/Constants.php
index 0184370b87a7..dcc24a44b586 100644
--- a/app/Constants.php
+++ b/app/Constants.php
@@ -204,7 +204,7 @@ if (! defined('APP_NAME')) {
     define('MAX_NUM_CLIENTS', 100);
     define('MAX_NUM_CLIENTS_PRO', 40000);
     define('MAX_NUM_CLIENTS_LEGACY', 500);
-    define('MAX_INVOICE_AMOUNT', 1000000000);
+    define('MAX_INVOICE_AMOUNT', 10000000000);
     define('LEGACY_CUTOFF', 57800);
     define('ERROR_DELAY', 3);
 
diff --git a/app/Ninja/PaymentDrivers/PayPalExpressPaymentDriver.php b/app/Ninja/PaymentDrivers/PayPalExpressPaymentDriver.php
index 927fc09d3599..ce10e40659bd 100644
--- a/app/Ninja/PaymentDrivers/PayPalExpressPaymentDriver.php
+++ b/app/Ninja/PaymentDrivers/PayPalExpressPaymentDriver.php
@@ -55,7 +55,7 @@ class PayPalExpressPaymentDriver extends BasePaymentDriver
         }
 
         $client->shipping_address1 = isset($data['SHIPTOSTREET']) ? trim($data['SHIPTOSTREET']) : '';
-        $client->shipping_address2 = '';
+        $client->shipping_address2 = isset($data['SHIPTOSTREET2']) ? trim($data['SHIPTOSTREET2']) : '';
         $client->shipping_city = isset($data['SHIPTOCITY']) ? trim($data['SHIPTOCITY']) : '';
         $client->shipping_state = isset($data['SHIPTOSTATE']) ? trim($data['SHIPTOSTATE']) : '';
         $client->shipping_postal_code = isset($data['SHIPTOZIP']) ? trim($data['SHIPTOZIP']) : '';
diff --git a/app/Ninja/Transformers/InvoiceTransformer.php b/app/Ninja/Transformers/InvoiceTransformer.php
index 4793429269ab..34e646721271 100644
--- a/app/Ninja/Transformers/InvoiceTransformer.php
+++ b/app/Ninja/Transformers/InvoiceTransformer.php
@@ -121,7 +121,8 @@ class InvoiceTransformer extends EntityTransformer
             'partial' => (float) ($invoice->partial ?: 0.0),
             'partial_due_date' => $invoice->partial_due_date ?: '',
             'has_tasks' => (bool) $invoice->has_tasks,
-            'auto_bill' => (int) $invoice->auto_bill,
+            'auto_bill' => (bool) $invoice->auto_bill,
+            'auto_bill_id' => (int) $invoice->auto_bill,
             'custom_value1' => (float) $invoice->custom_value1,
             'custom_value2' => (float) $invoice->custom_value2,
             'custom_taxes1' => (bool) $invoice->custom_taxes1,
diff --git a/database/seeds/CountriesSeeder.php b/database/seeds/CountriesSeeder.php
index 7e7cf5bf924a..dd53bf1f5a27 100644
--- a/database/seeds/CountriesSeeder.php
+++ b/database/seeds/CountriesSeeder.php
@@ -62,6 +62,10 @@ class CountriesSeeder extends Seeder
             'CH' => [
                 'swap_postal_code' => true,
             ],
+            'CN' => [ // China
+                'thousand_separator' => ',',
+                'decimal_separator' => '.',
+            ],
             'CZ' => [ // Czech Republic
                 'swap_currency_symbol' => true,
             ],